X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_group.cc;h=8dc91edb3b46ee7af4db96c42c42626ddc36b802;hb=2deba158635501e8f61363ab691882255ce5031c;hp=93211f02e9bba81f762c58f0c144683e55dfb139;hpb=000802d23f3ccf0eccb8681716cce228106b753c;p=ardour.git diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 93211f02e9..8dc91edb3b 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2009 Paul Davis + Copyright (C) 2002-2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,6 +30,7 @@ #include "ardour/session.h" #include "ardour/auditioner.h" +#include "gui_thread.h" #include "port_group.h" #include "port_matrix.h" #include "time_axis_view.h" @@ -45,47 +46,81 @@ using namespace ARDOUR; * @param n Name. */ PortGroup::PortGroup (std::string const & n) - : name (n), _visible (true) + : name (n) { - + +} + +PortGroup::~PortGroup() +{ + for (BundleList::iterator i = _bundles.begin(); i != _bundles.end(); ++i) { + delete *i; + } + _bundles.clear (); } /** Add a bundle to a group. * @param b Bundle. + * @param allow_dups true to allow the group to contain more than one bundle with the same port, otherwise false. */ void -PortGroup::add_bundle (boost::shared_ptr b) +PortGroup::add_bundle (boost::shared_ptr b, bool allow_dups) { - assert (b.get()); - - BundleRecord r; - r.bundle = b; - r.has_colour = false; - r.changed_connection = b->Changed.connect (sigc::mem_fun (*this, &PortGroup::bundle_changed)); - - _bundles.push_back (r); + add_bundle_internal (b, boost::shared_ptr (), false, Gdk::Color (), allow_dups); +} - Changed (); +/** Add a bundle to a group. + * @param b Bundle. + * @param io IO whose ports are in the bundle. + */ +void +PortGroup::add_bundle (boost::shared_ptr b, boost::shared_ptr io) +{ + add_bundle_internal (b, io, false, Gdk::Color (), false); } /** Add a bundle to a group. * @param b Bundle. - * @param c Colour to represent the group with. + * @param c Colour to represent the bundle with. */ void -PortGroup::add_bundle (boost::shared_ptr b, Gdk::Color c) +PortGroup::add_bundle (boost::shared_ptr b, boost::shared_ptr io, Gdk::Color c) +{ + add_bundle_internal (b, io, true, c, false); +} + +PortGroup::BundleRecord::BundleRecord (boost::shared_ptr b, boost::shared_ptr iop, Gdk::Color c, bool has_c) + : bundle (b) + , io (iop) + , colour (c) + , has_colour (has_c) +{ +} + +void +PortGroup::add_bundle_internal (boost::shared_ptr b, boost::shared_ptr io, bool has_colour, Gdk::Color colour, bool allow_dups) { assert (b.get()); - BundleRecord r; - r.bundle = b; - r.colour = c; - r.has_colour = true; - r.changed_connection = b->Changed.connect (sigc::mem_fun (*this, &PortGroup::bundle_changed)); + if (!allow_dups) { + + /* don't add this bundle if we already have one with the same ports */ + + BundleList::iterator i = _bundles.begin (); + while (i != _bundles.end() && b->has_same_ports ((*i)->bundle) == false) { + ++i; + } + + if (i != _bundles.end ()) { + return; + } + } - _bundles.push_back (r); + 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()); + _bundles.push_back (br); - Changed (); + Changed (); } void @@ -94,7 +129,7 @@ PortGroup::remove_bundle (boost::shared_ptr b) assert (b.get()); BundleList::iterator i = _bundles.begin (); - while (i != _bundles.end() && i->bundle != b) { + while (i != _bundles.end() && (*i)->bundle != b) { ++i; } @@ -102,9 +137,9 @@ PortGroup::remove_bundle (boost::shared_ptr b) return; } - i->changed_connection.disconnect (); + delete *i; _bundles.erase (i); - + Changed (); } @@ -119,7 +154,7 @@ void PortGroup::clear () { for (BundleList::iterator i = _bundles.begin(); i != _bundles.end(); ++i) { - i->changed_connection.disconnect (); + delete *i; } _bundles.clear (); @@ -130,7 +165,7 @@ bool PortGroup::has_port (std::string const& p) const { for (BundleList::const_iterator i = _bundles.begin(); i != _bundles.end(); ++i) { - if (i->bundle->offers_port_alone (p)) { + if ((*i)->bundle->offers_port_alone (p)) { return true; } } @@ -142,7 +177,7 @@ boost::shared_ptr PortGroup::only_bundle () { assert (_bundles.size() == 1); - return _bundles.front().bundle; + return _bundles.front()->bundle; } @@ -151,18 +186,88 @@ PortGroup::total_channels () const { uint32_t n = 0; for (BundleList::const_iterator i = _bundles.begin(); i != _bundles.end(); ++i) { - n += i->bundle->nchannels (); + n += (*i)->bundle->nchannels (); } return n; } +boost::shared_ptr +PortGroup::io_from_bundle (boost::shared_ptr b) const +{ + BundleList::const_iterator i = _bundles.begin (); + while (i != _bundles.end() && (*i)->bundle != b) { + ++i; + } + + if (i == _bundles.end()) { + return boost::shared_ptr (); + } + + return (*i)->io; +} + +/** Remove bundles whose channels are already represented by other, larger bundles */ +void +PortGroup::remove_duplicates () +{ + BundleList::iterator i = _bundles.begin(); + while (i != _bundles.end()) { + + BundleList::iterator tmp = i; + ++tmp; + + bool remove = false; + + for (BundleList::iterator j = _bundles.begin(); j != _bundles.end(); ++j) { + + if ((*j)->bundle->nchannels() > (*i)->bundle->nchannels()) { + /* this bundle is larger */ + + uint32_t k = 0; + while (k < (*i)->bundle->nchannels()) { + /* see if this channel on *i has an equivalent on *j */ + uint32_t l = 0; + while (l < (*j)->bundle->nchannels() && (*i)->bundle->channel_ports (k) != (*j)->bundle->channel_ports (l)) { + ++l; + } + + if (l == (*j)->bundle->nchannels()) { + /* it does not */ + break; + } + + ++k; + } + + if (k == (*i)->bundle->nchannels ()) { + /* all channels on *i are represented by the larger bundle *j, so remove *i */ + remove = true; + break; + } + } + } + + if (remove) { + _bundles.erase (i); + } + + i = tmp; + } +} + + /** PortGroupList constructor. */ PortGroupList::PortGroupList () - : _type (DataType::AUDIO), _signals_suspended (false), _pending_change (false) + : _type (DataType::AUDIO), _signals_suspended (false), _pending_change (false), _pending_bundle_change ((Bundle::Change) 0) { - + +} + +PortGroupList::~PortGroupList() +{ + /* XXX need to clean up bundles, but ownership shared with PortGroups */ } void @@ -173,7 +278,9 @@ PortGroupList::set_type (DataType t) } void -PortGroupList::maybe_add_processor_to_bundle (boost::weak_ptr wp, boost::shared_ptr rb, bool inputs, set >& used_io) +PortGroupList::maybe_add_processor_to_list ( + boost::weak_ptr wp, list >* route_bundles, bool inputs, set >& used_io + ) { boost::shared_ptr p (wp.lock()); @@ -182,13 +289,13 @@ PortGroupList::maybe_add_processor_to_bundle (boost::weak_ptr wp, boo } boost::shared_ptr iop = boost::dynamic_pointer_cast (p); - + if (iop) { boost::shared_ptr io = inputs ? iop->input() : iop->output(); - + if (io && used_io.find (io) == used_io.end()) { - rb->add_processor_bundle (io->bundle ()); + route_bundles->push_back (io->bundle ()); used_io.insert (io); } } @@ -197,10 +304,14 @@ PortGroupList::maybe_add_processor_to_bundle (boost::weak_ptr wp, boo /** Gather bundles from around the system and put them in this PortGroupList */ void -PortGroupList::gather (ARDOUR::Session& session, bool inputs) +PortGroupList::gather (ARDOUR::Session* session, bool inputs, bool allow_dups) { clear (); + if (session == 0) { + return; + } + boost::shared_ptr bus (new PortGroup (_("Bus"))); boost::shared_ptr track (new PortGroup (_("Track"))); boost::shared_ptr system (new PortGroup (_("System"))); @@ -211,22 +322,25 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) the route's input/output and processor bundles together so that they are presented as one bundle in the matrix. */ - boost::shared_ptr routes = session.get_routes (); + boost::shared_ptr routes = session->get_routes (); for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) { - /* keep track of IOs that we have taken bundles from, so that maybe_add_processor... below - can avoid taking the same IO from both Route::output() and the main_outs Delivery */ - + list > route_bundles; + + /* 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 */ + set > used_io; boost::shared_ptr io = inputs ? (*i)->input() : (*i)->output(); used_io.insert (io); - - boost::shared_ptr rb (new RouteBundle (io->bundle())); - (*i)->foreach_processor (bind (mem_fun (*this, &PortGroupList::maybe_add_processor_to_bundle), rb, inputs, used_io)); + route_bundles.push_back (io->bundle ()); + + (*i)->foreach_processor (boost::bind (&PortGroupList::maybe_add_processor_to_list, this, _1, &route_bundles, inputs, used_io)); - /* Work out which group to put this bundle in */ + /* Work out which group to put these bundles in */ boost::shared_ptr g; if (_type == DataType::AUDIO) { @@ -234,7 +348,7 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) g = track; } else if (!boost::dynamic_pointer_cast(*i)) { g = bus; - } + } } else if (_type == DataType::MIDI) { @@ -244,38 +358,44 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) } /* No MIDI busses yet */ - } - + } + if (g) { - TimeAxisView* tv = PublicEditor::instance().axis_view_from_route (i->get()); - if (tv) { - g->add_bundle (rb, tv->color ()); - } else { - g->add_bundle (rb); + TimeAxisView* tv = PublicEditor::instance().axis_view_from_route (*i); + for (list >::iterator i = route_bundles.begin(); i != route_bundles.end(); ++i) { + if (tv) { + g->add_bundle (*i, io, tv->color ()); + } else { + g->add_bundle (*i, io); + } } } } - /* Bundles owned by the session. We only add the mono ones and the User ones - otherwise there is duplication of the same ports within the matrix */ - - boost::shared_ptr b = session.bundles (); - for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { - if ((*i)->ports_are_inputs() == inputs && (*i)->type() == _type) { + /* Bundles owned by the session; add user bundles first, then normal ones, so + that UserBundles that offer the same ports as a normal bundle get priority + */ - if ((*i)->nchannels() == 1 || boost::dynamic_pointer_cast (*i)) { - system->add_bundle (*i); - } - + boost::shared_ptr b = session->bundles (); + + for (BundleList::iterator i = b->begin(); i != b->end(); ++i) { + if (boost::dynamic_pointer_cast (*i) && (*i)->ports_are_inputs() == inputs && (*i)->type() == _type) { + 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 && (*i)->type() == _type) { + system->add_bundle (*i, allow_dups); + } + } + /* Ardour stuff */ - if (!inputs) { - ardour->add_bundle (session.the_auditioner()->output()->bundle()); - ardour->add_bundle (session.click_io()->bundle()); + if (!inputs && _type == DataType::AUDIO) { + ardour->add_bundle (session->the_auditioner()->output()->bundle()); + ardour->add_bundle (session->click_io()->bundle()); } /* Now find all other ports that we haven't thought of yet */ @@ -283,22 +403,26 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) std::vector extra_system; std::vector extra_other; - const char **ports = session.engine().get_ports ("", _type.to_jack_type(), inputs ? + const char **ports = session->engine().get_ports ("", _type.to_jack_type(), inputs ? JackPortIsInput : JackPortIsOutput); if (ports) { int n = 0; string client_matching_string; - client_matching_string = session.engine().client_name(); + client_matching_string = session->engine().client_name(); client_matching_string += ':'; while (ports[n]) { - + std::string const p = ports[n]; - if (!system->has_port(p) && !bus->has_port(p) && !track->has_port(p) && !ardour->has_port(p) && !other->has_port(p)) { - + if (!system->has_port(p) && + !bus->has_port(p) && + !track->has_port(p) && + !ardour->has_port(p) && + !other->has_port(p)) { + if (port_has_prefix (p, "system:") || port_has_prefix (p, "alsa_pcm") || port_has_prefix (p, "ardour:")) { @@ -307,7 +431,7 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) extra_other.push_back (p); } } - + ++n; } @@ -315,18 +439,23 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) } if (!extra_system.empty()) { - system->add_bundle (make_bundle_from_ports (extra_system, inputs)); + boost::shared_ptr b = make_bundle_from_ports (extra_system, inputs); + system->add_bundle (b); } if (!extra_other.empty()) { other->add_bundle (make_bundle_from_ports (extra_other, inputs)); } - add_group (system); - add_group (bus); - add_group (track); - add_group (ardour); - add_group (other); + if (!allow_dups) { + system->remove_duplicates (); + } + + add_group_if_not_empty (other); + add_group_if_not_empty (bus); + add_group_if_not_empty (track); + add_group_if_not_empty (ardour); + add_group_if_not_empty (system); emit_changed (); } @@ -381,7 +510,7 @@ PortGroupList::common_prefix_before (std::vector const & p, std::st return fp; } - + std::string PortGroupList::common_prefix (std::vector const & p) const @@ -404,13 +533,7 @@ void PortGroupList::clear () { _groups.clear (); - - for (std::vector::iterator i = _bundle_changed_connections.begin(); i != _bundle_changed_connections.end(); ++i) { - i->disconnect (); - } - - _bundle_changed_connections.clear (); - + _bundle_changed_connections.drop_connections (); emit_changed (); } @@ -419,41 +542,41 @@ PortGroup::BundleList const & PortGroupList::bundles () const { _bundles.clear (); - + for (PortGroupList::List::const_iterator i = begin (); i != end (); ++i) { - if ((*i)->visible()) { - std::copy ((*i)->bundles().begin(), (*i)->bundles().end(), std::back_inserter (_bundles)); - } + std::copy ((*i)->bundles().begin(), (*i)->bundles().end(), std::back_inserter (_bundles)); } - + return _bundles; } uint32_t -PortGroupList::total_visible_channels () const +PortGroupList::total_channels () const { uint32_t n = 0; - + for (PortGroupList::List::const_iterator i = begin(); i != end(); ++i) { - if ((*i)->visible()) { - n += (*i)->total_channels (); - } + n += (*i)->total_channels (); } return n; } +void +PortGroupList::add_group_if_not_empty (boost::shared_ptr g) +{ + if (!g->bundles().empty ()) { + add_group (g); + } +} void PortGroupList::add_group (boost::shared_ptr g) { _groups.push_back (g); - - g->Changed.connect (sigc::mem_fun (*this, &PortGroupList::emit_changed)); - - _bundle_changed_connections.push_back ( - g->BundleChanged.connect (sigc::hide (sigc::mem_fun (*this, &PortGroupList::emit_changed))) - ); + + 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()); emit_changed (); } @@ -477,7 +600,16 @@ PortGroupList::emit_changed () Changed (); } } - + +void +PortGroupList::emit_bundle_changed (Bundle::Change c) +{ + if (_signals_suspended) { + _pending_bundle_change = c; + } else { + BundleChanged (c); + } +} void PortGroupList::suspend_signals () { @@ -492,46 +624,37 @@ PortGroupList::resume_signals () _pending_change = false; } - _signals_suspended = false; -} + if (_pending_bundle_change != 0) { + BundleChanged (_pending_bundle_change); + _pending_bundle_change = (ARDOUR::Bundle::Change) 0; + } -RouteBundle::RouteBundle (boost::shared_ptr r) - : _route (r) -{ - _route->Changed.connect (sigc::hide (sigc::mem_fun (*this, &RouteBundle::reread_component_bundles))); - reread_component_bundles (); + _signals_suspended = false; } -void -RouteBundle::reread_component_bundles () +boost::shared_ptr +PortGroupList::io_from_bundle (boost::shared_ptr b) const { - suspend_signals (); - - remove_channels (); - - set_name (_route->name()); - - for (uint32_t i = 0; i < _route->nchannels(); ++i) { - add_channel (_route->channel_name (i)); - PortList const & pl = _route->channel_ports (i); - for (uint32_t j = 0; j < pl.size(); ++j) { - add_port_to_channel (i, pl[j]); + List::const_iterator i = _groups.begin (); + while (i != _groups.end()) { + boost::shared_ptr io = (*i)->io_from_bundle (b); + if (io) { + return io; } - } - - for (std::vector >::iterator i = _processor.begin(); i != _processor.end(); ++i) { - add_channels_from_bundle (*i); + ++i; } - resume_signals (); + return boost::shared_ptr (); } -void -RouteBundle::add_processor_bundle (boost::shared_ptr p) +bool +PortGroupList::empty () const { - p->Changed.connect (sigc::hide (sigc::mem_fun (*this, &RouteBundle::reread_component_bundles))); - _processor.push_back (p); - - reread_component_bundles (); + List::const_iterator i = _groups.begin (); + while (i != _groups.end() && (*i)->total_channels() == 0) { + ++i; + } + + return (i == _groups.end()); } - +