X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.cc;h=925bebc307d09de27b63df03beb72544d5b39f2c;hb=82be348d429b97f3e223b3a5b1c6807d23fcdaa0;hp=1382826b905a9b1dc54136de57e11313bfff0b51;hpb=66760a574a1fc0ccc8a798c2900a717c134838ea;p=ardour.git diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 1382826b90..925bebc307 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -19,16 +19,20 @@ #include #include +#include + +#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/user_bundle.h" +#include "ardour/port.h" +#include "control_protocol/control_protocol.h" #include "gui_thread.h" #include "port_group.h" @@ -103,24 +107,24 @@ PortGroup::add_bundle_internal (boost::shared_ptr b, boost::shared_ptrhas_same_ports ((*i)->bundle) == false) { ++i; } - + if (i != _bundles.end ()) { return; } } BundleRecord* br = new BundleRecord (b, io, colour, has_colour); - b->Changed.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 (); + Changed (); } void @@ -204,7 +208,8 @@ PortGroup::io_from_bundle (boost::shared_ptr b) const return boost::shared_ptr (); } - return (*i)->io; + boost::shared_ptr io ((*i)->io.lock ()); + return io; } /** Remove bundles whose channels are already represented by other, larger bundles */ @@ -247,11 +252,11 @@ PortGroup::remove_duplicates () } } } - + if (remove) { _bundles.erase (i); } - + i = tmp; } } @@ -265,7 +270,7 @@ PortGroupList::PortGroupList () } -PortGroupList::~PortGroupList() +PortGroupList::~PortGroupList() { /* XXX need to clean up bundles, but ownership shared with PortGroups */ } @@ -299,23 +304,27 @@ struct RouteIOs { route = r; ios.push_back (i); } - + boost::shared_ptr route; + /* it's ok to use a shared_ptr here as RouteIOs structs are only used during ::gather () */ std::list > ios; }; 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 (); @@ -323,10 +332,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp return; } - boost::shared_ptr bus (new PortGroup (_("Bus"))); - boost::shared_ptr track (new PortGroup (_("Track"))); - boost::shared_ptr system (new PortGroup (_("System"))); - boost::shared_ptr ardour (new PortGroup (_("Ardour"))); + boost::shared_ptr bus (new PortGroup (string_compose (_("%1 Busses"), PROGRAM_NAME))); + boost::shared_ptr track (new PortGroup (string_compose (_("%1 Tracks"), PROGRAM_NAME))); + boost::shared_ptr system (new PortGroup (_("Hardware"))); + boost::shared_ptr ardour (new PortGroup (string_compose (_("%1 Misc"), PROGRAM_NAME))); boost::shared_ptr other (new PortGroup (_("Other"))); /* Find the IOs which have bundles for routes and their processors. We store @@ -339,9 +348,16 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) { + /* we never show the monitor bus inputs */ + + if (inputs && (*i)->is_monitor()) { + continue; + } + /* keep track of IOs that we have taken bundles from, so that we can avoid taking the same IO from both - Route::output() and the main_outs Delivery */ + Route::output() and the main_outs Delivery + */ set > used_io; boost::shared_ptr io = inputs ? (*i)->input() : (*i)->output(); @@ -360,7 +376,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp Note that if the RouteIO's bundles are multi-type, we may make new Bundles with only the ports of one type. */ - + for (list::iterator i = route_ios.begin(); i != route_ios.end(); ++i) { TimeAxisView* tv = PublicEditor::instance().axis_view_from_route (i->route); @@ -373,13 +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 (b) { - if (tv) { - g->add_bundle (b, *j, tv->color ()); - } else { - g->add_bundle (b, *j); - } + if (tv) { + g->add_bundle ((*j)->bundle(), *j, tv->color ()); + } else { + g->add_bundle ((*j)->bundle(), *j); } } } @@ -392,34 +405,88 @@ 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); - if (b) { - 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); - if (b) { - 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); - if (b) { - 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 */ + + ControlProtocolManager& m = ControlProtocolManager::instance (); + for (list::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) { + if ((*i)->protocol) { + list > b = (*i)->protocol->bundles (); + for (list >::iterator j = b.begin(); j != b.end(); ++j) { + if ((*j)->ports_are_inputs() == inputs) { + ardour->add_bundle (*j); + } + } } + } - b = bundle_for_type (session->click_io()->bundle(), type); - if (b) { - ardour->add_bundle (b); + /* Ardour's sync ports */ + + MIDI::Manager* midi_manager = MIDI::Manager::instance (); + if (midi_manager && (type == DataType::MIDI || type == DataType::NIL)) { + 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()) + ); + sync->add_channel ( + _("MIDI control in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_input_port()->name()) + ); + sync->add_channel ( + _("MIDI clock in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_clock_input_port()->name()) + ); + sync->add_channel ( + _("MMC in"), DataType::MIDI, ae.make_port_name_non_relative (mmc->input_port()->name()) + ); + } else { + sync->add_channel ( + _("MTC out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->mtc_output_port()->name()) + ); + sync->add_channel ( + _("MIDI control out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_output_port()->name()) + ); + sync->add_channel ( + _("MIDI clock out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_clock_output_port()->name()) + ); + sync->add_channel ( + _("MMC out"), DataType::MIDI, ae.make_port_name_non_relative (mmc->output_port()->name()) + ); } + + ardour->add_bundle (sync); } /* Now find all other ports that we haven't thought of yet */ @@ -427,13 +494,18 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp std::vector extra_system[DataType::num_types]; std::vector extra_other[DataType::num_types]; + string lpn (PROGRAM_NAME); + boost::to_lower (lpn); + string lpnc = lpn; + lpnc += ':'; + const char ** ports = 0; if (type == DataType::NIL) { ports = session->engine().get_ports ("", "", inputs ? JackPortIsInput : JackPortIsOutput); } else { ports = session->engine().get_ports ("", type.to_jack_type(), inputs ? JackPortIsInput : JackPortIsOutput); } - + if (ports) { int n = 0; @@ -447,13 +519,26 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp !track->has_port(p) && !ardour->has_port(p) && !other->has_port(p)) { - + /* special hack: ignore MIDI ports labelled Midi-Through. these are basically useless and mess things up for default connections. */ - if (p.find ("MIDI-Through") != string::npos) { + if (p.find ("Midi-Through") != string::npos) { + ++n; + continue; + } + + /* special hack: ignore our monitor inputs (which show up here because + we excluded them earlier. + */ + + string lp = p; + boost::to_lower (lp); + + if ((lp.find (N_(":monitor")) != string::npos) && + (lp.find (lpn) != string::npos)) { ++n; continue; } @@ -464,7 +549,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp if (jp) { DataType t (jack_port_type (jp)); if (t != DataType::NIL) { - if (port_has_prefix (p, "system:") || port_has_prefix (p, "alsa_pcm") || port_has_prefix (p, "ardour:")) { + if (port_has_prefix (p, N_("system:")) || + port_has_prefix (p, N_("alsa_pcm")) || + port_has_prefix (p, lpnc)) { extra_system[t].push_back (p); } else { extra_other[t].push_back (p); @@ -482,20 +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); - if (bt) { - 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); - if (bt) { - other->add_bundle (bt); - } + other->add_bundle (b); } } @@ -504,7 +585,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } add_group_if_not_empty (other); - add_group_if_not_empty (bus); + if (type != DataType::MIDI) { + add_group_if_not_empty (bus); + } add_group_if_not_empty (track); add_group_if_not_empty (ardour); add_group_if_not_empty (system); @@ -628,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 (); } @@ -702,38 +785,6 @@ PortGroupList::io_from_bundle (boost::shared_ptr b) const bool PortGroupList::empty () const { - List::const_iterator i = _groups.begin (); - while (i != _groups.end() && (*i)->total_channels() == ChanCount::ZERO) { - ++i; - } - - return (i == _groups.end()); + 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; - 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; -}