provide access to Send + Plugins from MIDI binding maps

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

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 2aac811e651bef4095caf6c5e2288593905d2c17..2fe0616973064941b233fbe13ed0984919aebe17 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -17,9 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "pbd/error.h"
-#include <sigc++/retype.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/bind.h>
 
 #include "pbd/enumwriter.h"
 #include "midi++/events.h"
@@ -41,6 +38,7 @@
 #include "ardour/processor.h"
 #include "ardour/route_group_specialized.h"
 #include "ardour/session.h"
+#include "ardour/session_playlists.h"
 #include "ardour/utils.h"
 
 #include "i18n.h"
@@ -111,9 +109,6 @@ MidiTrack::set_diskstream (boost::shared_ptr<MidiDiskstream> ds)
        _diskstream->set_record_enabled (false);
        //_diskstream->monitor_input (false);
 
-       ic_connection.disconnect();
-       ic_connection = _input->changed.connect (mem_fun (*_diskstream, &MidiDiskstream::handle_input_change));
-
        DiskstreamChanged (); /* EMIT SIGNAL */
 
        return 0;
@@ -235,7 +230,7 @@ MidiTrack::_set_state (const XMLNode& node, int version, bool call_base)
        pending_state = const_cast<XMLNode*> (&node);
 
        if (_session.state_of_the_state() & Session::Loading) {
-               _session.StateReady.connect (mem_fun (*this, &MidiTrack::set_state_part_two));
+               _session.StateReady.connect_same_thread (*this, boost::bind (&MidiTrack::set_state_part_two, this));
        } else {
                set_state_part_two ();
        }
@@ -323,7 +318,7 @@ MidiTrack::set_state_part_two ()
                _freeze_record.processor_info.clear ();
 
                if ((prop = fnode->property (X_("playlist"))) != 0) {
-                       boost::shared_ptr<Playlist> pl = _session.playlists.by_name (prop->value());
+                       boost::shared_ptr<Playlist> pl = _session.playlists->by_name (prop->value());
                        if (pl) {
                                _freeze_record.playlist = boost::dynamic_pointer_cast<MidiPlaylist> (pl);
                        } else {