smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 20:26:30 +01:00
Code Issues Projects Releases Wiki Activity

slight improvements in logic for midi-input-follows-selection

Browse source
This commit is contained in:
Paul Davis 2016-10-19 23:17:39 -04:00
parent 72c8ab0103
commit 8ac97d55c9
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/session_midi.cc
View file

@ -761,7 +761,7 @@ Session::rewire_selected_midi (boost::shared_ptr<MidiTrack> new_midi_target)
if (!msp.empty()) { if (!msp.empty()) {
if (old_midi_target) { if (old_midi_target) {
for (PortManager::MidiSelectionPorts::const_iterator p = msp.begin(); p != msp.end(); ++p) { for (PortManager::MidiSelectionPorts::const_iterator p = msp.begin(); p != msp.end(); ++p) {
old_midi_target->input()->disconnect (old_midi_target->input()->nth (0), (*p), this); AudioEngine::instance()->disconnect (*p);
} }
} }
@ -776,17 +776,13 @@ Session::rewire_selected_midi (boost::shared_ptr<MidiTrack> new_midi_target)
void void
Session::rewire_midi_selection_ports () Session::rewire_midi_selection_ports ()
{ {
cerr << "RMSP\n";
if (!Config->get_midi_input_follows_selection()) { if (!Config->get_midi_input_follows_selection()) {
cerr << "nope\n";
return; return;
} }
boost::shared_ptr<MidiTrack> target = current_midi_target.lock(); boost::shared_ptr<MidiTrack> target = current_midi_target.lock();
if (!target) { if (!target) {
cerr << "no target\n";
return; return;
} }
@ -794,7 +790,6 @@ Session::rewire_midi_selection_ports ()
AudioEngine::instance()->get_midi_selection_ports (msp); AudioEngine::instance()->get_midi_selection_ports (msp);
if (msp.empty()) { if (msp.empty()) {
cerr << "no MSP\n";
return; return;
} }
@ -803,6 +798,8 @@ Session::rewire_midi_selection_ports ()
target->input()->disconnect (this); target->input()->disconnect (this);
for (PortManager::MidiSelectionPorts::const_iterator p = msp.begin(); p != msp.end(); ++p) { for (PortManager::MidiSelectionPorts::const_iterator p = msp.begin(); p != msp.end(); ++p) {
cerr << "\tdisconnect " << *p << endl;
AudioEngine::instance()->disconnect (*p);
cerr << "\tconnect to " << *p << endl; cerr << "\tconnect to " << *p << endl;
target->input()->connect (target->input()->nth (0), (*p), this); target->input()->connect (target->input()->nth (0), (*p), this);
} }