diff options
| author | Hans Fugal <hans@fugal.net> | 2006-08-04 02:18:45 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-08-04 02:18:45 +0000 |
| commit | 79986643c0c904f6574bb5323e2233a43a9e622e (patch) | |
| tree | 859323dbb096ac1658359881e7d11415b6588caa /libs/ardour/session_midi.cc | |
| parent | b0b723445816bc968a6a183c6619fccc61e82859 (diff) | |
r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600
Trunk merge conflicts resolved
git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_midi.cc')
| -rw-r--r-- | libs/ardour/session_midi.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 60bd95464f..821f894eeb 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -109,13 +109,6 @@ Session::set_midi_control (bool yn) set_dirty(); poke_midi_thread (); - if (_midi_port) { - Glib::RWLock::ReaderLock guard (route_lock); - for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) { - (*i)->reset_midi_control (_midi_port, midi_control); - } - } - ControlChanged (MidiControl); /* EMIT SIGNAL */ } @@ -783,12 +776,12 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled) if (mmc_control) { RouteList::iterator i; - Glib::RWLock::ReaderLock guard (route_lock); + boost::shared_ptr<RouteList> r = routes.reader(); - for (i = routes.begin(); i != routes.end(); ++i) { + for (i = r->begin(); i != r->end(); ++i) { AudioTrack *at; - if ((at = dynamic_cast<AudioTrack*>(*i)) != 0) { + if ((at = dynamic_cast<AudioTrack*>((*i).get())) != 0) { if (trk == at->remote_control_id()) { at->set_record_enable (enabled, &mmc); break; |