Allow Lua bindings up to 10 args

[ardour.git] / libs / ardour / midi_playlist.cc

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index c0badf7a0ddc839cf345fbacab51214cc87e0293..67764d66aeefa5880d5c1a6f6ccd6c7336ba1925 100644 (file)
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -24,6 +24,7 @@
 #include <utility>
 
 #include "evoral/EventList.hpp"
+#include "evoral/Control.hpp"
 
 #include "ardour/beats_frames_converter.h"
 #include "ardour/debug.h"
@@ -35,7 +36,7 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -47,7 +48,7 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
        , _read_end(0)
 {
 #ifndef NDEBUG
-       const XMLProperty* prop = node.property("type");
+       XMLProperty const * prop = node.property("type");
        assert(prop && DataType(prop->value()) == DataType::MIDI);
 #endif
 
@@ -91,7 +92,7 @@ MidiPlaylist::~MidiPlaylist ()
 
 template<typename Time>
 struct EventsSortByTimeAndType {
-    bool operator() (Evoral::Event<Time>* a, Evoral::Event<Time>* b) {
+    bool operator() (const Evoral::Event<Time>* a, const Evoral::Event<Time>* b) {
            if (a->time() == b->time()) {
                    if (parameter_is_midi ((AutomationType)a->event_type()) &&
                        parameter_is_midi ((AutomationType)b->event_type())) {
@@ -109,6 +110,7 @@ framecnt_t
 MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst,
                     framepos_t                     start,
                     framecnt_t                     dur,
+                    Evoral::Range<framepos_t>*     loop_range,
                     unsigned                       chan_n,
                     MidiChannelFilter*             filter)
 {
@@ -189,7 +191,11 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst,
                }
 
                /* Read from region into target. */
-               mr->read_at (tgt, start, dur, chan_n, _note_mode, &tracker->tracker, filter);
+               DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("read from %1 at %2 for %3 LR %4 .. %5\n",
+                                                                   mr->name(), start, dur, 
+                                                                   (loop_range ? loop_range->from : -1),
+                                                                   (loop_range ? loop_range->to : -1)));
+               mr->read_at (tgt, start, dur, loop_range, tracker->cursor, chan_n, _note_mode, &tracker->tracker, filter);
                DEBUG_TRACE (DEBUG::MidiPlaylistIO,
                             string_compose ("\tPost-read: %1 active notes\n", tracker->tracker.on()));
 
@@ -201,7 +207,8 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst,
                                     string_compose ("\t%1 ended, resolve notes and delete (%2) tracker\n",
                                                     mr->name(), ((new_tracker) ? "new" : "old")));
 
-                       tracker->tracker.resolve_notes (tgt, (*i)->last_frame());
+                       tracker->tracker.resolve_notes (tgt, loop_range ? loop_range->squish ((*i)->last_frame()) : (*i)->last_frame());
+                       tracker->cursor.invalidate (false);
                        if (!new_tracker) {
                                _note_trackers.erase (t);
                        }
@@ -255,7 +262,7 @@ MidiPlaylist::region_edited(boost::shared_ptr<Region>         region,
        /* Queue any necessary edit compensation events. */
        t->second->fixer.prepare(
                _session.tempo_map(), cmd, mr->position() - mr->start(),
-               _read_end, mr->midi_source()->model()->active_notes());
+               _read_end, t->second->cursor.active_notes);
 }
 
 void
@@ -286,6 +293,15 @@ MidiPlaylist::remove_dependents (boost::shared_ptr<Region> region)
        _note_trackers.erase(region.get());
 }
 
+void
+MidiPlaylist::region_going_away (boost::weak_ptr<Region> region)
+{
+       boost::shared_ptr<Region> r = region.lock();
+       if (r) {
+               remove_dependents(r);
+       }
+}
+
 int
 MidiPlaylist::set_state (const XMLNode& node, int version)
 {
@@ -351,8 +367,12 @@ MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
 
                        i = tmp;
                }
-       }
 
+               NoteTrackers::iterator t = _note_trackers.find(region.get());
+               if (t != _note_trackers.end()) {
+                       _note_trackers.erase(t);
+               }
+       }
 
        if (changed) {
                /* overload this, it normally means "removed", not destroyed */
@@ -377,7 +397,9 @@ MidiPlaylist::contained_automation()
 
                for (Automatable::Controls::iterator c = mr->model()->controls().begin();
                                c != mr->model()->controls().end(); ++c) {
-                       ret.insert(c->first);
+                       if (c->second->list()->size() > 0) {
+                               ret.insert(c->first);
+                       }
                }
        }