X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.cc;h=925bebc307d09de27b63df03beb72544d5b39f2c;hb=f7a27e17dbfe26c06702755f88336724b92ff617;hp=8383d803a3e9a519892bcbd20b7d2e979abcaf5f;hpb=44bfe88366f7448d7357f14277eee35f5bc7019f;p=ardour.git diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 8383d803a3..925bebc307 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -24,16 +24,14 @@ #include "midi++/manager.h" #include "midi++/mmc.h" -#include "ardour/audio_track.h" #include "ardour/audioengine.h" +#include "ardour/auditioner.h" #include "ardour/bundle.h" -#include "ardour/user_bundle.h" +#include "ardour/control_protocol_manager.h" #include "ardour/io_processor.h" -#include "ardour/midi_track.h" -#include "ardour/port.h" #include "ardour/session.h" -#include "ardour/auditioner.h" -#include "ardour/control_protocol_manager.h" +#include "ardour/user_bundle.h" +#include "ardour/port.h" #include "control_protocol/control_protocol.h" #include "gui_thread.h" @@ -123,7 +121,7 @@ PortGroup::add_bundle_internal (boost::shared_ptr b, boost::shared_ptrChanged.connect (br->changed_connection, invalidator (*this), ui_bind (&PortGroup::bundle_changed, this, _1), gui_context()); + b->Changed.connect (br->changed_connection, invalidator (*this), boost::bind (&PortGroup::bundle_changed, this, _1), gui_context()); _bundles.push_back (br); Changed (); @@ -315,15 +313,18 @@ struct RouteIOs { class RouteIOsComparator { public: bool operator() (RouteIOs const & a, RouteIOs const & b) { - return a.route->order_key (X_("editor")) < b.route->order_key (X_("editor")); + return a.route->order_key (EditorSort) < b.route->order_key (EditorSort); } }; /** Gather ports from around the system and put them in this PortGroupList. * @param type Type of ports to collect, or NIL for all types. + * @param use_session_bundles true to use the session's non-user bundles. Doing this will mean that + * hardware ports will be gathered into stereo pairs, as the session sets up bundles for these pairs. + * Not using the session bundles will mean that all hardware IO will be presented separately. */ void -PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inputs, bool allow_dups) +PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inputs, bool allow_dups, bool use_session_bundles) { clear (); @@ -388,11 +389,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } for (list >::iterator j = i->ios.begin(); j != i->ios.end(); ++j) { - boost::shared_ptr b = bundle_for_type ((*j)->bundle(), type); if (tv) { - g->add_bundle (b, *j, tv->color ()); + g->add_bundle ((*j)->bundle(), *j, tv->color ()); } else { - g->add_bundle (b, *j); + g->add_bundle ((*j)->bundle(), *j); } } } @@ -405,26 +405,35 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { if (boost::dynamic_pointer_cast (*i) && (*i)->ports_are_inputs() == inputs) { - boost::shared_ptr b = bundle_for_type (*i, type); - system->add_bundle (b, allow_dups); + system->add_bundle (*i, allow_dups); } } - for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if (boost::dynamic_pointer_cast (*i) == 0 && (*i)->ports_are_inputs() == inputs) { - boost::shared_ptr b = bundle_for_type (*i, type); - system->add_bundle (b, allow_dups); + /* Only look for non-user bundles if instructed to do so */ + if (use_session_bundles) { + for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { + if (boost::dynamic_pointer_cast (*i) == 0 && (*i)->ports_are_inputs() == inputs) { + system->add_bundle (*i, allow_dups); + } } } /* Ardour stuff */ if (!inputs) { - boost::shared_ptr b = bundle_for_type (session->the_auditioner()->output()->bundle(), type); - ardour->add_bundle (b); - - b = bundle_for_type (session->click_io()->bundle(), type); - ardour->add_bundle (b); + ardour->add_bundle (session->the_auditioner()->output()->bundle()); + ardour->add_bundle (session->click_io()->bundle()); + /* Note: the LTC ports do not have the usual ":audio_out 1" postfix, so + * ardour->add_bundle (session->ltc_output_io()->bundle()); + * won't work + */ + boost::shared_ptr 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())); + ardour->add_bundle (ltc); + } else { + boost::shared_ptr ltc (new Bundle (_("LTC In"), inputs)); + ltc->add_channel (_("LTC In"), DataType::AUDIO, session->engine().make_port_name_non_relative (session->ltc_input_port()->name())); + ardour->add_bundle (ltc); } /* Ardour's surfaces */ @@ -448,6 +457,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp boost::shared_ptr sync (new Bundle (_("Sync"), inputs)); MIDI::MachineControl* mmc = midi_manager->mmc (); AudioEngine& ae = session->engine (); + if (inputs) { sync->add_channel ( _("MTC in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->mtc_input_port()->name()) @@ -559,16 +569,14 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { if (!extra_system[*i].empty()) { boost::shared_ptr b = make_bundle_from_ports (extra_system[*i], *i, inputs); - boost::shared_ptr bt = bundle_for_type (b, type); - system->add_bundle (bt); + system->add_bundle (b); } } for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { if (!extra_other[*i].empty()) { boost::shared_ptr b = make_bundle_from_ports (extra_other[*i], *i, inputs); - boost::shared_ptr bt = bundle_for_type (b, type); - other->add_bundle (bt); + other->add_bundle (b); } } @@ -703,7 +711,7 @@ PortGroupList::add_group (boost::shared_ptr g) _groups.push_back (g); g->Changed.connect (_changed_connections, invalidator (*this), boost::bind (&PortGroupList::emit_changed, this), gui_context()); - g->BundleChanged.connect (_bundle_changed_connections, invalidator (*this), ui_bind (&PortGroupList::emit_bundle_changed, this, _1), gui_context()); + g->BundleChanged.connect (_bundle_changed_connections, invalidator (*this), boost::bind (&PortGroupList::emit_bundle_changed, this, _1), gui_context()); emit_changed (); } @@ -780,30 +788,3 @@ PortGroupList::empty () const return _groups.empty (); } -/** Take a bundle, and either return it, if it contains only ports of type \a t, - * or return a new bundle with those ports from \a b which are of type \a t. - * Note that t == NIL is taken to mean "all types". - */ -boost::shared_ptr -PortGroupList::bundle_for_type (boost::shared_ptr b, DataType t) const -{ - /* We are asked for a bundle with all types, so that's easy */ - if (t == DataType::NIL) { - return b; - } - - if (b->nchannels().get(t) == b->nchannels().n_total()) { - /* All channels on b are of the correct type, so just return b */ - return b; - } - - /* We must build a new bundle */ - boost::shared_ptr n (new ARDOUR::Bundle (b->name(), b->ports_are_inputs())); - for (uint32_t i = 0; i < b->nchannels().n_total(); ++i) { - if (b->channel_type(i) == t) { - n->add_channel (b->channel_name (i), t, b->channel_ports (i)); - } - } - - return n; -}