Be more tolerant to missing values or errors in io_config()

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

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 398234e2babce6fac513fcfcee177f5e26c6a4fe..e3274c77b193c44d52f9c911e6d720616673eeea 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
 
@@ -106,7 +107,11 @@ struct EventsSortByTimeAndType {
 };
 
 framecnt_t
-MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst, framepos_t start, framecnt_t dur, unsigned chan_n)
+MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst,
+                    framepos_t                     start,
+                    framecnt_t                     dur,
+                    unsigned                       chan_n,
+                    MidiChannelFilter*             filter)
 {
        typedef pair<MidiStateTracker*,framepos_t> TrackerInfo;
 
@@ -185,7 +190,7 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst, framepos_t start, framec
                }
 
                /* Read from region into target. */
-               mr->read_at (tgt, start, dur, chan_n, _note_mode, &tracker->tracker);
+               mr->read_at (tgt, start, dur, chan_n, _note_mode, &tracker->tracker, filter);
                DEBUG_TRACE (DEBUG::MidiPlaylistIO,
                             string_compose ("\tPost-read: %1 active notes\n", tracker->tracker.on()));
 
@@ -373,7 +378,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);
+                       }
                }
        }