ardour/livetrax
13
0
Fork 0
Code

various tweaks to port matrix display logic to try to avoid a few wierd things

Browse Source
This commit is contained in:
Paul Davis 2016-07-08 17:10:08 -04:00
parent 581fe8a237
commit d2e59c308e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/port_group.cc
View File

@ -473,9 +473,6 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
sync->add_channel ( sync->add_channel (
_("MTC in"), DataType::MIDI, ae->make_port_name_non_relative (session->mtc_input_port()->name()) _("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 ( sync->add_channel (
_("MIDI clock in"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_input_port()->name()) _("MIDI clock in"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_input_port()->name())
); );
@ -486,9 +483,6 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
sync->add_channel ( sync->add_channel (
_("MTC out"), DataType::MIDI, ae->make_port_name_non_relative (session->mtc_output_port()->name()) _("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 ( sync->add_channel (
_("MIDI clock out"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_output_port()->name()) _("MIDI clock out"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_output_port()->name())
); );
@ -540,7 +534,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
connections. connections.
*/ */
if (p.find ("Midi-Through") != string::npos) { if (p.find ("Midi-Through") != string::npos || p.find ("Midi Through") != string::npos) {
++s; ++s;
continue; continue;
} }
@ -574,6 +568,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
port_has_prefix (p, X_("alsa_midi:"))) { port_has_prefix (p, X_("alsa_midi:"))) {
extra_system[t].push_back (p); extra_system[t].push_back (p);
} else if (port_has_prefix (p, lpnc)) { } else if (port_has_prefix (p, lpnc)) {
/* we own this port (named after the program) */
/* Hide scene ports from non-Tracks Live builds */ /* Hide scene ports from non-Tracks Live builds */
if (!ARDOUR::Profile->get_trx()) { if (!ARDOUR::Profile->get_trx()) {
if (p.find (_("Scene ")) != string::npos) { if (p.find (_("Scene ")) != string::npos) {
@ -581,6 +578,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
continue; continue;
} }
} }
extra_program[t].push_back (p); extra_program[t].push_back (p);
} else { } else {
extra_other[t].push_back (p); 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) { for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
if (!extra_program[*i].empty()) { if (!extra_program[*i].empty()) {
/* remove program name prefix from port name and use rest as bundle name */ /* used program name 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, lpn);
boost::shared_ptr<Bundle> b = make_bundle_from_ports (extra_program[*i], *i, inputs, bundle_name);
program->add_bundle (b); program->add_bundle (b);
} }
} }