diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-08 17:10:08 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-27 14:59:30 -0500 |
| commit | d2e59c308e9c123e32b1d9920631c392b7277977 (patch) | |
| tree | 4cce31490048d1fce0e4c93e875f8774b4afaf57 /gtk2_ardour/port_group.cc | |
| parent | 581fe8a23727e1b59a4fd120bfd326f42862b037 (diff) | |
various tweaks to port matrix display logic to try to avoid a few wierd things
Diffstat (limited to 'gtk2_ardour/port_group.cc')
| -rw-r--r-- | gtk2_ardour/port_group.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 093e307f9c..808ddc4ee0 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -474,9 +474,6 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp _("MTC in"), DataType::MIDI, ae->make_port_name_non_relative (session->mtc_input_port()->name()) ); sync->add_channel ( - _("MIDI control in"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_input_port()->name()) - ); - sync->add_channel ( _("MIDI clock in"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_input_port()->name()) ); sync->add_channel ( @@ -487,9 +484,6 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp _("MTC out"), DataType::MIDI, ae->make_port_name_non_relative (session->mtc_output_port()->name()) ); sync->add_channel ( - _("MIDI control out"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_output_port()->name()) - ); - sync->add_channel ( _("MIDI clock out"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_output_port()->name()) ); sync->add_channel ( @@ -540,7 +534,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp connections. */ - if (p.find ("Midi-Through") != string::npos) { + if (p.find ("Midi-Through") != string::npos || p.find ("Midi Through") != string::npos) { ++s; continue; } @@ -574,6 +568,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp port_has_prefix (p, X_("alsa_midi:"))) { extra_system[t].push_back (p); } else if (port_has_prefix (p, lpnc)) { + + /* we own this port (named after the program) */ + /* Hide scene ports from non-Tracks Live builds */ if (!ARDOUR::Profile->get_trx()) { if (p.find (_("Scene ")) != string::npos) { @@ -581,6 +578,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp continue; } } + extra_program[t].push_back (p); } else { extra_other[t].push_back (p); @@ -602,9 +600,8 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { if (!extra_program[*i].empty()) { - /* remove program name prefix from port name and use rest as bundle name */ - std::string bundle_name = extra_program[*i].front().substr (lpnc.length()); - boost::shared_ptr<Bundle> b = make_bundle_from_ports (extra_program[*i], *i, inputs, bundle_name); + /* used program name as bundle name */ + boost::shared_ptr<Bundle> b = make_bundle_from_ports (extra_program[*i], *i, inputs, lpn); program->add_bundle (b); } } |