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

further improvements to port grouping for the port matrix

Browse source 
Don't show LTC etc. ports in the MIDI matrix; Don't show Scene ports for Ardour or Mixbus, since we don't use them; code renaming
This commit is contained in:
Paul Davis 2015-12-03 12:43:54 -05:00
parent 34b1c0db94
commit 4f427c5f97
2 changed files with 54 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

86
gtk2_ardour/port_group.cc
View file

@ -30,9 +30,10 @@
#include "ardour/io_processor.h" #include "ardour/io_processor.h"
#include "ardour/midi_port.h" #include "ardour/midi_port.h"
#include "ardour/midiport_manager.h" #include "ardour/midiport_manager.h"
#include "ardour/port.h"
#include "ardour/profile.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/user_bundle.h" #include "ardour/user_bundle.h"
#include "ardour/port.h"
#include "control_protocol/control_protocol.h" #include "control_protocol/control_protocol.h"
@ -337,7 +338,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
boost::shared_ptr<PortGroup> bus (new PortGroup (string_compose (_("%1 Busses"), PROGRAM_NAME))); boost::shared_ptr<PortGroup> bus (new PortGroup (string_compose (_("%1 Busses"), PROGRAM_NAME)));
boost::shared_ptr<PortGroup> track (new PortGroup (string_compose (_("%1 Tracks"), PROGRAM_NAME))); boost::shared_ptr<PortGroup> track (new PortGroup (string_compose (_("%1 Tracks"), PROGRAM_NAME)));
boost::shared_ptr<PortGroup> system (new PortGroup (_("Hardware"))); boost::shared_ptr<PortGroup> system (new PortGroup (_("Hardware")));
boost::shared_ptr<PortGroup> ardour (new PortGroup (string_compose (_("%1 Misc"), PROGRAM_NAME))); boost::shared_ptr<PortGroup> program (new PortGroup (string_compose (_("%1 Misc"), PROGRAM_NAME)));
boost::shared_ptr<PortGroup> other (new PortGroup (_("Other"))); boost::shared_ptr<PortGroup> other (new PortGroup (_("Other")));
/* Find the IOs which have bundles for routes and their processors. We store /* Find the IOs which have bundles for routes and their processors. We store
@ -420,25 +421,27 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
} }
} }
/* Ardour stuff */ /* miscellany */
if (!inputs) { if (type == DataType::AUDIO || type == DataType::NIL) {
ardour->add_bundle (session->the_auditioner()->output()->bundle()); if (!inputs) {
ardour->add_bundle (session->click_io()->bundle()); program->add_bundle (session->the_auditioner()->output()->bundle());
/* Note: the LTC ports do not have the usual ":audio_out 1" postfix, so program->add_bundle (session->click_io()->bundle());
* ardour->add_bundle (session->ltc_output_io()->bundle()); /* Note: the LTC ports do not have the usual ":audio_out 1" postfix, so
* won't work * program->add_bundle (session->ltc_output_io()->bundle());
*/ * won't work
boost::shared_ptr<Bundle> ltc (new Bundle (_("LTC Out"), inputs)); */
ltc->add_channel (_("LTC Out"), DataType::AUDIO, session->engine().make_port_name_non_relative (session->ltc_output_port()->name())); boost::shared_ptr<Bundle> ltc (new Bundle (_("LTC Out"), inputs));
ardour->add_bundle (ltc); ltc->add_channel (_("LTC Out"), DataType::AUDIO, session->engine().make_port_name_non_relative (session->ltc_output_port()->name()));
} else { program->add_bundle (ltc);
boost::shared_ptr<Bundle> ltc (new Bundle (_("LTC In"), inputs)); } else {
ltc->add_channel (_("LTC In"), DataType::AUDIO, session->engine().make_port_name_non_relative (session->ltc_input_port()->name())); boost::shared_ptr<Bundle> ltc (new Bundle (_("LTC In"), inputs));
ardour->add_bundle (ltc); ltc->add_channel (_("LTC In"), DataType::AUDIO, session->engine().make_port_name_non_relative (session->ltc_input_port()->name()));
program->add_bundle (ltc);
}
} }
/* Ardour's control surfaces */ /* our control surfaces */
ControlProtocolManager& m = ControlProtocolManager::instance (); ControlProtocolManager& m = ControlProtocolManager::instance ();
for (list<ControlProtocolInfo*>::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) { for (list<ControlProtocolInfo*>::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) {
@ -446,13 +449,13 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
list<boost::shared_ptr<Bundle> > b = (*i)->protocol->bundles (); list<boost::shared_ptr<Bundle> > b = (*i)->protocol->bundles ();
for (list<boost::shared_ptr<Bundle> >::iterator j = b.begin(); j != b.end(); ++j) { for (list<boost::shared_ptr<Bundle> >::iterator j = b.begin(); j != b.end(); ++j) {
if ((*j)->ports_are_inputs() == inputs) { if ((*j)->ports_are_inputs() == inputs) {
ardour->add_bundle (*j); program->add_bundle (*j);
} }
} }
} }
} }
/* Ardour's sync ports */ /* our sync ports */
if ((type == DataType::MIDI || type == DataType::NIL)) { if ((type == DataType::MIDI || type == DataType::NIL)) {
boost::shared_ptr<Bundle> sync (new Bundle (_("Sync"), inputs)); boost::shared_ptr<Bundle> sync (new Bundle (_("Sync"), inputs));
@ -486,13 +489,13 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
); );
} }
ardour->add_bundle (sync); program->add_bundle (sync);
} }
/* Now find all other ports that we haven't thought of yet */ /* Now find all other ports that we haven't thought of yet */
std::vector<std::string> extra_system[DataType::num_types]; std::vector<std::string> extra_system[DataType::num_types];
std::vector<std::string> extra_ardour[DataType::num_types]; std::vector<std::string> extra_program[DataType::num_types];
std::vector<std::string> extra_other[DataType::num_types]; std::vector<std::string> extra_other[DataType::num_types];
string lpn (PROGRAM_NAME); string lpn (PROGRAM_NAME);
@ -510,7 +513,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
if (!system->has_port(p) && if (!system->has_port(p) &&
!bus->has_port(p) && !bus->has_port(p) &&
!track->has_port(p) && !track->has_port(p) &&
!ardour->has_port(p) && !program->has_port(p) &&
!other->has_port(p)) { !other->has_port(p)) {
/* special hack: ignore MIDI ports labelled Midi-Through. these /* special hack: ignore MIDI ports labelled Midi-Through. these
@ -536,7 +539,11 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
continue; continue;
} }
/* can't use the audio engine for this as we are looking at non-Ardour ports */ /* can't use the audio engine for this as we
* are looking at ports not owned by the
* application, and the audio engine/port
* manager doesn't seem them.
*/
PortEngine::PortHandle ph = AudioEngine::instance()->port_engine().get_port_by_name (p); PortEngine::PortHandle ph = AudioEngine::instance()->port_engine().get_port_by_name (p);
if (ph) { if (ph) {
@ -547,7 +554,14 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
port_has_prefix (p, N_("alsa_midi:"))) { port_has_prefix (p, N_("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)) {
extra_ardour[t].push_back (p); /* Hide scene ports from non-Tracks Live builds */
if (!ARDOUR::Profile->get_trx()) {
if (p.find (_("Scene ")) != string::npos) {
++s;
continue;
}
}
extra_program[t].push_back (p);
} else { } else {
extra_other[t].push_back (p); extra_other[t].push_back (p);
} }
@ -567,9 +581,11 @@ 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_ardour[*i].empty()) { if (!extra_program[*i].empty()) {
boost::shared_ptr<Bundle> b = make_bundle_from_ports (extra_ardour[*i], *i, inputs); /* remove program name prefix from port name and use rest as bundle name */
ardour->add_bundle (b); 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);
program->add_bundle (b);
} }
} }
@ -603,20 +619,24 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
add_group_if_not_empty (bus); add_group_if_not_empty (bus);
} }
add_group_if_not_empty (track); add_group_if_not_empty (track);
add_group_if_not_empty (ardour); add_group_if_not_empty (program);
add_group_if_not_empty (system); add_group_if_not_empty (system);
emit_changed (); emit_changed ();
} }
boost::shared_ptr<Bundle> boost::shared_ptr<Bundle>
PortGroupList::make_bundle_from_ports (std::vector<std::string> const & p, ARDOUR::DataType type, bool inputs) const PortGroupList::make_bundle_from_ports (std::vector<std::string> const & p, ARDOUR::DataType type, bool inputs, std::string const& bundle_name) const
{ {
boost::shared_ptr<Bundle> b (new Bundle ("", inputs)); boost::shared_ptr<Bundle> b (new Bundle ("", inputs));
std::string const pre = common_prefix (p); std::string const pre = common_prefix (p);
if (!pre.empty()) {
b->set_name (pre.substr (0, pre.length() - 1)); if (!bundle_name.empty()) {
b->set_name (bundle_name);
} else {
if (!pre.empty()) {
b->set_name (pre.substr (0, pre.length() - 1));
}
} }
for (uint32_t j = 0; j < p.size(); ++j) { for (uint32_t j = 0; j < p.size(); ++j) {

2
gtk2_ardour/port_group.h
View file

@ -142,7 +142,7 @@ class PortGroupList : public sigc::trackable
std::string common_prefix_before (std::vector<std::string> const &, std::string const &) const; std::string common_prefix_before (std::vector<std::string> const &, std::string const &) const;
void emit_changed (); void emit_changed ();
void emit_bundle_changed (ARDOUR::Bundle::Change); void emit_bundle_changed (ARDOUR::Bundle::Change);
boost::shared_ptr<ARDOUR::Bundle> make_bundle_from_ports (std::vector<std::string> const &, ARDOUR::DataType, bool) const; boost::shared_ptr<ARDOUR::Bundle> make_bundle_from_ports (std::vector<std::string> const &, ARDOUR::DataType, bool, std::string const& bundle_name = std::string()) const;
void maybe_add_processor_to_list ( void maybe_add_processor_to_list (
boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::IO> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > & boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::IO> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &
); );