ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Retain MIDI monitor connection -- #8816

Browse Source 
A physical input port must remain connected to ardour's
physical_midi_input_monitor_enable port, otherwise reading
its input can cause crashes.

Previously a MIDI input port was disconnected from all other
targets when "MIDI input follows selection" was enabled.
This commit is contained in:
Robin Gareus 2021-10-31 16:37:37 +01:00
parent 89fc526574
commit 84b75f6627
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/session.h
View File

@ -2271,6 +2271,7 @@ private:
void midi_track_presentation_info_changed (PBD::PropertyChange const &, boost::weak_ptr<MidiTrack>);
void rewire_selected_midi (boost::shared_ptr<MidiTrack>);
void rewire_midi_selection_ports ();
void disconnect_port_for_rewire (std::string const& port) const;
boost::weak_ptr<MidiTrack> current_midi_target;
StripableList _soloSelection; //the items that are soloe'd during a solo-selection operation; need to unsolo after the roll

58
libs/ardour/session_midi.cc
View File

@ -722,6 +722,36 @@ Session::midi_track_presentation_info_changed (PropertyChange const& what_change
}
}
void
Session::disconnect_port_for_rewire (std::string const& port) const
{
MidiPortFlags mpf = AudioEngine::instance()->midi_port_metadata (port);
/* if a port is marked for control data, do not
* disconnect it from everything since it may also be
* used via a control surface or some other
* functionality.
*/
bool keep_ctrl = mpf & MidiPortControl;
vector<string> port_connections;
AudioEngine::instance()->get_connections (port, port_connections);
for (vector<string>::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
/* test if (*i) is a control-surface input port */
if (keep_ctrl && AudioEngine::instance()->port_is_control_only (*i)) {
continue;
}
/* retain connection to "physical_midi_input_monitor_enable" */
if (AudioEngine::instance()->port_is_physical_input_monitor_enable (*i)) {
continue;
}
AudioEngine::instance()->disconnect (port, *i);
}
}
void
Session::rewire_selected_midi (boost::shared_ptr<MidiTrack> new_midi_target)
{
@ -739,31 +769,9 @@ Session::rewire_selected_midi (boost::shared_ptr<MidiTrack> new_midi_target)
AudioEngine::instance()->get_midi_selection_ports (msp);
if (!msp.empty()) {
for (vector<string>::const_iterator p = msp.begin(); p != msp.end(); ++p) {
MidiPortFlags mpf = AudioEngine::instance()->midi_port_metadata (*p);
/* if a port is marked for control data, do not
* disconnect it from everything since it may also be
* used via a control surface or some other
* functionality.
*/
if (0 == (mpf & MidiPortControl)) {
/* disconnect the port from everything */
AudioEngine::instance()->disconnect (*p);
} else {
/* only disconnect from non-control ports */
vector<string> port_connections;
AudioEngine::instance()->get_connections (*p, port_connections);
for (vector<string>::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
/* test if (*i) is a control-surface input port */
if (AudioEngine::instance()->port_is_control_only (*i)) {
continue;
}
AudioEngine::instance()->disconnect (*p, *i);
}
}
/* disconnect port */
disconnect_port_for_rewire (*p);
/* connect it to the new target */
new_midi_target->input()->connect (new_midi_target->input()->nth(0), (*p), this);
}
@ -795,7 +803,7 @@ Session::rewire_midi_selection_ports ()
target->input()->disconnect (this);
for (vector<string>::const_iterator p = msp.begin(); p != msp.end(); ++p) {
AudioEngine::instance()->disconnect (*p);
disconnect_port_for_rewire (*p);
target->input()->connect (target->input()->nth (0), (*p), this);
}
}