(1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state...

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

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 5cafe9c81deb789cf26c22e99108eaf6f67630ca..9409e9f1439b14b0fb2c5e73c9947f82cf0da8fa 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -17,11 +17,9 @@
     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 "pbd/convert.h"
 #include "midi++/events.h"
 #include "evoral/midi_util.h"
 
@@ -41,6 +39,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 +110,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 +231,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 +319,7 @@ MidiTrack::set_state_part_two ()
                _freeze_record.processor_info.clear ();
 
                if ((prop = fnode->property (X_("playlist"))) != 0) {
-                       boost::shared_ptr<Playlist> pl = _session.playlist_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 {
@@ -560,7 +556,7 @@ MidiTrack::bounce_range (nframes_t /*start*/, nframes_t /*end*/, InterThreadInfo
 }
 
 void
-MidiTrack::freeze (InterThreadInfo& /*itt*/)
+MidiTrack::freeze_me (InterThreadInfo& /*itt*/)
 {
 }
 
@@ -625,9 +621,8 @@ MidiTrack::MidiControl::set_value(float val)
        }
 
        assert(val <= _list->parameter().max());
-       size_t size = 3;
-
        if ( ! automation_playback()) {
+               size_t size = 3;
                uint8_t ev[3] = { _list->parameter().channel(), int(val), 0 };
                switch(_list->parameter().type()) {
                case MidiCCAutomation: