X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Froute_group.cc;h=23b745892e9037cb32df91184f954bdae4dda1fc;hb=6bcdf4f0f106d0b83ed7f221f546c132585e19e7;hp=5b998d22f765de7d093efcf65ada5a308f1a1d7c;hpb=ce7a5e1c9fa3edf2d9cc66875505e402a0aaa6f6;p=ardour.git diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index 5b998d22f7..23b745892e 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -17,21 +17,18 @@ */ -#define __STDC_FORMAT_MACROS #include #include - #include "pbd/error.h" #include "pbd/enumwriter.h" #include "pbd/strsplit.h" #include "ardour/amp.h" -#include "ardour/route_group.h" #include "ardour/audio_track.h" -#include "ardour/audio_diskstream.h" -#include "ardour/configuration.h" +#include "ardour/route.h" +#include "ardour/route_group.h" #include "ardour/session.h" #include "i18n.h" @@ -40,9 +37,6 @@ using namespace ARDOUR; using namespace PBD; using namespace std; -PropertyChange RouteGroup::FlagsChange = new_change (); -PropertyChange RouteGroup::PropertiesChange = new_change (); - namespace ARDOUR { namespace Properties { PropertyDescriptor relative; @@ -52,40 +46,57 @@ namespace ARDOUR { PropertyDescriptor solo; PropertyDescriptor recenable; PropertyDescriptor select; - PropertyDescriptor edit; - } + PropertyDescriptor route_active; + PropertyDescriptor color; + PropertyDescriptor monitoring; + } } void RouteGroup::make_property_quarks () { - Properties::relative.id = g_quark_from_static_string (X_("relative")); - Properties::active.id = g_quark_from_static_string (X_("active")); - Properties::hidden.id = g_quark_from_static_string (X_("hidden")); - Properties::gain.id = g_quark_from_static_string (X_("gain")); - Properties::mute.id = g_quark_from_static_string (X_("mute")); - Properties::solo.id = g_quark_from_static_string (X_("solo")); - Properties::recenable.id = g_quark_from_static_string (X_("recenable")); - Properties::select.id = g_quark_from_static_string (X_("select")); - Properties::edit.id = g_quark_from_static_string (X_("edit")); + Properties::relative.property_id = g_quark_from_static_string (X_("relative")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for relative = %1\n", Properties::relative.property_id)); + Properties::active.property_id = g_quark_from_static_string (X_("active")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for active = %1\n", Properties::active.property_id)); + Properties::hidden.property_id = g_quark_from_static_string (X_("hidden")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for hidden = %1\n", Properties::hidden.property_id)); + Properties::gain.property_id = g_quark_from_static_string (X_("gain")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for gain = %1\n", Properties::gain.property_id)); + Properties::mute.property_id = g_quark_from_static_string (X_("mute")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for mute = %1\n", Properties::mute.property_id)); + Properties::solo.property_id = g_quark_from_static_string (X_("solo")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for solo = %1\n", Properties::solo.property_id)); + Properties::recenable.property_id = g_quark_from_static_string (X_("recenable")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for recenable = %1\n", Properties::recenable.property_id)); + Properties::select.property_id = g_quark_from_static_string (X_("select")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for select = %1\n", Properties::select.property_id)); + Properties::route_active.property_id = g_quark_from_static_string (X_("route-active")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for route-active = %1\n", Properties::route_active.property_id)); + Properties::color.property_id = g_quark_from_static_string (X_("color")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for color = %1\n", Properties::color.property_id)); + Properties::monitoring.property_id = g_quark_from_static_string (X_("monitoring")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for monitoring = %1\n", Properties::monitoring.property_id)); } -#define ROUTE_GROUP_DEFAULT_PROPERTIES _relative (Properties::relative, FlagsChange, false) \ - , _active (Properties::active, FlagsChange, false) \ - , _hidden (Properties::hidden, FlagsChange, false) \ - , _gain (Properties::gain, PropertiesChange, false) \ - , _mute (Properties::mute, PropertiesChange, false) \ - , _solo (Properties::solo, PropertiesChange , false) \ - , _recenable (Properties::recenable, PropertiesChange, false) \ - , _select (Properties::select, PropertiesChange, false) \ - , _edit (Properties::edit, PropertiesChange , false) +#define ROUTE_GROUP_DEFAULT_PROPERTIES _relative (Properties::relative, false) \ + , _active (Properties::active, false) \ + , _hidden (Properties::hidden, false) \ + , _gain (Properties::gain, false) \ + , _mute (Properties::mute, false) \ + , _solo (Properties::solo, false) \ + , _recenable (Properties::recenable, false) \ + , _select (Properties::select, false) \ + , _route_active (Properties::route_active, false) \ + , _color (Properties::color, false) \ + , _monitoring (Properties::monitoring, false) RouteGroup::RouteGroup (Session& s, const string &n) : SessionObject (s, n) , routes (new RouteList) , ROUTE_GROUP_DEFAULT_PROPERTIES { - _xml_node_name = X_("RegionGroup"); + _xml_node_name = X_("RouteGroup"); add_property (_relative); add_property (_active); @@ -95,7 +106,9 @@ RouteGroup::RouteGroup (Session& s, const string &n) add_property (_solo); add_property (_recenable); add_property (_select); - add_property (_edit); + add_property (_route_active); + add_property (_color); + add_property (_monitoring); } RouteGroup::~RouteGroup () @@ -104,8 +117,8 @@ RouteGroup::~RouteGroup () RouteList::iterator tmp = i; ++tmp; - (*i)->leave_route_group (); - + (*i)->set_route_group (0); + i = tmp; } } @@ -119,16 +132,18 @@ RouteGroup::add (boost::shared_ptr r) if (find (routes->begin(), routes->end(), r) != routes->end()) { return 0; } - - r->leave_route_group (); + if (r->route_group()) { + r->route_group()->remove (r); + } + routes->push_back (r); - r->join_route_group (this); + r->set_route_group (this); r->DropReferences.connect_same_thread (*this, boost::bind (&RouteGroup::remove_when_going_away, this, boost::weak_ptr (r))); - + _session.set_dirty (); - changed (); /* EMIT SIGNAL */ + RouteAdded (this, boost::weak_ptr (r)); /* EMIT SIGNAL */ return 0; } @@ -148,10 +163,10 @@ RouteGroup::remove (boost::shared_ptr r) RouteList::iterator i; if ((i = find (routes->begin(), routes->end(), r)) != routes->end()) { - r->leave_route_group (); + r->set_route_group (0); routes->erase (i); _session.set_dirty (); - changed (); /* EMIT SIGNAL */ + RouteRemoved (this, boost::weak_ptr (r)); /* EMIT SIGNAL */ return 0; } @@ -160,57 +175,62 @@ RouteGroup::remove (boost::shared_ptr r) gain_t -RouteGroup::get_min_factor(gain_t factor) +RouteGroup::get_min_factor (gain_t factor) { - gain_t g; - - for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) { - g = (*i)->amp()->gain(); + for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { + gain_t const g = (*i)->amp()->gain(); - if ( (g+g*factor) >= 0.0f) + if ((g + g * factor) >= 0.0f) { continue; + } - if ( g <= 0.0000003f ) + if (g <= 0.0000003f) { return 0.0f; + } - factor = 0.0000003f/g - 1.0f; + factor = 0.0000003f / g - 1.0f; } + return factor; } gain_t -RouteGroup::get_max_factor(gain_t factor) +RouteGroup::get_max_factor (gain_t factor) { - gain_t g; - for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) { - g = (*i)->amp()->gain(); + gain_t const g = (*i)->amp()->gain(); // if the current factor woulnd't raise this route above maximum - if ( (g+g*factor) <= 1.99526231f) + if ((g + g * factor) <= 1.99526231f) { continue; + } // if route gain is already at peak, return 0.0f factor - if (g>=1.99526231f) + if (g >= 1.99526231f) { return 0.0f; + } // factor is calculated so that it would raise current route to max - factor = 1.99526231f/g - 1.0f; + factor = 1.99526231f / g - 1.0f; } return factor; } XMLNode& -RouteGroup::get_state (void) +RouteGroup::get_state () { XMLNode *node = new XMLNode ("RouteGroup"); - + + char buf[64]; + id().print (buf, sizeof (buf)); + node->add_property ("id", buf); + add_properties (*node); if (!routes->empty()) { stringstream str; - + for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { str << (*i)->id () << ' '; } @@ -230,18 +250,21 @@ RouteGroup::set_state (const XMLNode& node, int version) const XMLProperty *prop; + set_id (node); + set_values (node); + if ((prop = node.property ("routes")) != 0) { stringstream str (prop->value()); vector ids; split (str.str(), ids, ' '); - + for (vector::iterator i = ids.begin(); i != ids.end(); ++i) { PBD::ID id (*i); boost::shared_ptr r = _session.route_by_id (id); - + if (r) { add (r); - } + } } } @@ -251,20 +274,22 @@ RouteGroup::set_state (const XMLNode& node, int version) int RouteGroup::set_state_2X (const XMLNode& node, int /*version*/) { - set_properties (node); + set_values (node); if (node.name() == "MixGroup") { _gain = true; _mute = true; _solo = true; _recenable = true; - _edit = false; + _route_active = true; + _color = false; } else if (node.name() == "EditGroup") { _gain = false; _mute = false; _solo = false; _recenable = false; - _edit = true; + _route_active = false; + _color = false; } return 0; @@ -277,6 +302,7 @@ RouteGroup::set_gain (bool yn) return; } _gain = yn; + send_change (PropertyChange (Properties::gain)); } void @@ -286,6 +312,7 @@ RouteGroup::set_mute (bool yn) return; } _mute = yn; + send_change (PropertyChange (Properties::mute)); } void @@ -295,6 +322,7 @@ RouteGroup::set_solo (bool yn) return; } _solo = yn; + send_change (PropertyChange (Properties::solo)); } void @@ -304,6 +332,7 @@ RouteGroup::set_recenable (bool yn) return; } _recenable = yn; + send_change (PropertyChange (Properties::recenable)); } void @@ -313,46 +342,82 @@ RouteGroup::set_select (bool yn) return; } _select = yn; + send_change (PropertyChange (Properties::select)); +} + +void +RouteGroup::set_route_active (bool yn) +{ + if (is_route_active() == yn) { + return; + } + _route_active = yn; + send_change (PropertyChange (Properties::route_active)); +} + +void +RouteGroup::set_color (bool yn) +{ + if (is_color() == yn) { + return; + } + _color = yn; + + send_change (PropertyChange (Properties::color)); + + /* This is a bit of a hack, but this might change + our route's effective color, so emit gui_changed + for our routes. + */ + + for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { + (*i)->gui_changed (X_("color"), this); + } } void -RouteGroup::set_edit (bool yn) +RouteGroup::set_monitoring (bool yn) { - if (is_edit() == yn) { + if (is_monitoring() == yn) { return; } - _edit = yn; + + _monitoring = yn; + send_change (PropertyChange (Properties::monitoring)); + + _session.set_dirty (); } void -RouteGroup::set_active (bool yn, void *src) +RouteGroup::set_active (bool yn, void* /*src*/) { if (is_active() == yn) { return; } + _active = yn; + send_change (PropertyChange (Properties::active)); _session.set_dirty (); - FlagsChanged (src); /* EMIT SIGNAL */ } void -RouteGroup::set_relative (bool yn, void *src) - +RouteGroup::set_relative (bool yn, void* /*src*/) { if (is_relative() == yn) { return; } _relative = yn; + send_change (PropertyChange (Properties::relative)); _session.set_dirty (); - FlagsChanged (src); /* EMIT SIGNAL */ } void -RouteGroup::set_hidden (bool yn, void *src) +RouteGroup::set_hidden (bool yn, void* /*src*/) { if (is_hidden() == yn) { return; } + if (yn) { _hidden = true; if (Config->get_hiding_groups_deactivates_groups()) { @@ -364,8 +429,10 @@ RouteGroup::set_hidden (bool yn, void *src) _active = true; } } + + send_change (Properties::hidden); + _session.set_dirty (); - FlagsChanged (src); /* EMIT SIGNAL */ } void @@ -380,7 +447,7 @@ RouteGroup::audio_track_group (set >& ats) } void -RouteGroup::make_subgroup () +RouteGroup::make_subgroup (bool aux, Placement placement) { RouteList rl; uint32_t nin = 0; @@ -400,7 +467,7 @@ RouteGroup::make_subgroup () try { /* use master bus etc. to determine default nouts */ - rl = _session.new_audio_route (false, nin, 2, 0, 1); + rl = _session.new_audio_route (nin, 2, 0, 1); } catch (...) { return; } @@ -408,11 +475,18 @@ RouteGroup::make_subgroup () subgroup_bus = rl.front(); subgroup_bus->set_name (_name); - boost::shared_ptr bundle = subgroup_bus->input()->bundle (); + if (aux) { - for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { - (*i)->output()->disconnect (this); - (*i)->output()->connect_ports_to_bundle (bundle, this); + _session.add_internal_sends (subgroup_bus, placement, routes); + + } else { + + boost::shared_ptr bundle = subgroup_bus->input()->bundle (); + + for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { + (*i)->output()->disconnect (this); + (*i)->output()->connect_ports_to_bundle (bundle, false, this); + } } } @@ -422,7 +496,7 @@ RouteGroup::destroy_subgroup () if (!subgroup_bus) { return; } - + for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { (*i)->output()->disconnect (this); /* XXX find a new bundle to connect to */ @@ -432,28 +506,19 @@ RouteGroup::destroy_subgroup () subgroup_bus.reset (); } +bool +RouteGroup::has_subgroup() const +{ + return subgroup_bus != 0; +} + bool RouteGroup::enabled_property (PBD::PropertyID prop) { - if (Properties::relative.id == prop) { - return is_relative(); - } else if (Properties::active.id == prop) { - return is_active(); - } else if (Properties::hidden.id == prop) { - return is_hidden(); - } else if (Properties::gain.id == prop) { - return is_gain(); - } else if (Properties::mute.id == prop) { - return is_mute(); - } else if (Properties::solo.id == prop) { - return is_solo(); - } else if (Properties::recenable.id == prop) { - return is_recenable(); - } else if (Properties::select.id == prop) { - return is_select(); - } else if (Properties::edit.id == prop) { - return is_edit(); - } - - return false; + OwnedPropertyList::iterator i = _properties->find (prop); + if (i == _properties->end()) { + return false; + } + + return dynamic_cast* > (i->second)->val (); }