X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Froute_group.cc;h=9ad5aa91e6cfc16fd7caa47b0ad91446707b42c7;hb=3a43e31d07434276a8c79561b1625b329ce6f2d5;hp=d8acefbeeddaa09b3d71ff69433114d6607bc550;hpb=09211cf0495a1d66691cc96291f698f117083b25;p=ardour.git diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index d8acefbeed..9ad5aa91e6 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -21,17 +21,15 @@ #include - #include "pbd/error.h" #include "pbd/enumwriter.h" #include "pbd/strsplit.h" +#include "pbd/debug.h" #include "ardour/amp.h" -#include "ardour/debug.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" @@ -49,7 +47,6 @@ namespace ARDOUR { PropertyDescriptor solo; PropertyDescriptor recenable; PropertyDescriptor select; - PropertyDescriptor edit; PropertyDescriptor route_active; PropertyDescriptor color; PropertyDescriptor monitoring; @@ -75,8 +72,6 @@ RouteGroup::make_property_quarks () 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::edit.property_id = g_quark_from_static_string (X_("edit")); - DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for edit = %1\n", Properties::edit.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")); @@ -85,18 +80,17 @@ RouteGroup::make_property_quarks () DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for monitoring = %1\n", Properties::monitoring.property_id)); } -#define ROUTE_GROUP_DEFAULT_PROPERTIES _relative (Properties::relative, false) \ - , _active (Properties::active, false) \ +#define ROUTE_GROUP_DEFAULT_PROPERTIES _relative (Properties::relative, true) \ + , _active (Properties::active, true) \ , _hidden (Properties::hidden, false) \ - , _gain (Properties::gain, false) \ - , _mute (Properties::mute, false) \ - , _solo (Properties::solo, false) \ - , _recenable (Properties::recenable, false) \ - , _select (Properties::select, false) \ - , _edit (Properties::edit, false) \ - , _route_active (Properties::route_active, false) \ - , _color (Properties::color, false) \ - , _monitoring (Properties::monitoring, false) + , _gain (Properties::gain, true) \ + , _mute (Properties::mute, true) \ + , _solo (Properties::solo, true) \ + , _recenable (Properties::recenable, true) \ + , _select (Properties::select, true) \ + , _route_active (Properties::route_active, true) \ + , _color (Properties::color, true) \ + , _monitoring (Properties::monitoring, true) RouteGroup::RouteGroup (Session& s, const string &n) : SessionObject (s, n) @@ -113,7 +107,6 @@ 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); @@ -144,7 +137,7 @@ RouteGroup::add (boost::shared_ptr r) if (r->route_group()) { r->route_group()->remove (r); } - + routes->push_back (r); r->set_route_group (this); @@ -186,7 +179,7 @@ gain_t RouteGroup::get_min_factor (gain_t factor) { for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { - gain_t const g = (*i)->amp()->gain(); + gain_t const g = (*i)->gain_control()->get_value(); if ((g + g * factor) >= 0.0f) { continue; @@ -198,7 +191,7 @@ RouteGroup::get_min_factor (gain_t factor) factor = 0.0000003f / g - 1.0f; } - + return factor; } @@ -206,7 +199,7 @@ gain_t RouteGroup::get_max_factor (gain_t factor) { for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) { - gain_t const g = (*i)->amp()->gain(); + gain_t const g = (*i)->gain_control()->get_value(); // if the current factor woulnd't raise this route above maximum if ((g + g * factor) <= 1.99526231f) { @@ -289,7 +282,6 @@ RouteGroup::set_state_2X (const XMLNode& node, int /*version*/) _mute = true; _solo = true; _recenable = true; - _edit = false; _route_active = true; _color = false; } else if (node.name() == "EditGroup") { @@ -297,7 +289,6 @@ RouteGroup::set_state_2X (const XMLNode& node, int /*version*/) _mute = false; _solo = false; _recenable = false; - _edit = true; _route_active = false; _color = false; } @@ -312,6 +303,7 @@ RouteGroup::set_gain (bool yn) return; } _gain = yn; + send_change (PropertyChange (Properties::gain)); } void @@ -321,6 +313,7 @@ RouteGroup::set_mute (bool yn) return; } _mute = yn; + send_change (PropertyChange (Properties::mute)); } void @@ -330,6 +323,7 @@ RouteGroup::set_solo (bool yn) return; } _solo = yn; + send_change (PropertyChange (Properties::solo)); } void @@ -339,6 +333,7 @@ RouteGroup::set_recenable (bool yn) return; } _recenable = yn; + send_change (PropertyChange (Properties::recenable)); } void @@ -348,15 +343,7 @@ RouteGroup::set_select (bool yn) return; } _select = yn; -} - -void -RouteGroup::set_edit (bool yn) -{ - if (is_edit() == yn) { - return; - } - _edit = yn; + send_change (PropertyChange (Properties::select)); } void @@ -366,6 +353,7 @@ RouteGroup::set_route_active (bool yn) return; } _route_active = yn; + send_change (PropertyChange (Properties::route_active)); } void @@ -376,6 +364,8 @@ RouteGroup::set_color (bool yn) } _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. @@ -387,7 +377,7 @@ RouteGroup::set_color (bool yn) } void -RouteGroup::set_monitoring (bool yn) +RouteGroup::set_monitoring (bool yn) { if (is_monitoring() == yn) { return; @@ -408,7 +398,6 @@ RouteGroup::set_active (bool yn, void* /*src*/) _active = yn; send_change (PropertyChange (Properties::active)); - _session.set_dirty (); } @@ -419,6 +408,7 @@ RouteGroup::set_relative (bool yn, void* /*src*/) return; } _relative = yn; + send_change (PropertyChange (Properties::relative)); _session.set_dirty (); } @@ -467,18 +457,26 @@ RouteGroup::make_subgroup (bool aux, Placement placement) for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i)->output()->n_ports().n_midi() != 0) { - PBD::info << _("You cannot subgroup MIDI tracks at this time") << endmsg; + PBD::warning << _("You cannot subgroup MIDI tracks at this time") << endmsg; return; } } for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { + if (!aux && nin != 0 && nin != (*i)->output()->n_ports().n_audio()) { + PBD::warning << _("You cannot subgroup tracks with different number of outputs at this time.") << endmsg; + return; + } nin = max (nin, (*i)->output()->n_ports().n_audio()); } try { - /* use master bus etc. to determine default nouts */ - rl = _session.new_audio_route (nin, 2, 0, 1); + /* use master bus etc. to determine default nouts. + * + * (since tracks can't have fewer outs than ins, + * "nin" currently defines the number of outpus if nin > 2) + */ + rl = _session.new_audio_route (nin, 2 /*XXX*/, 0, 1); } catch (...) { return; } @@ -496,7 +494,7 @@ RouteGroup::make_subgroup (bool aux, Placement placement) for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { (*i)->output()->disconnect (this); - (*i)->output()->connect_ports_to_bundle (bundle, this); + (*i)->output()->connect_ports_to_bundle (bundle, false, this); } } } @@ -517,6 +515,12 @@ RouteGroup::destroy_subgroup () subgroup_bus.reset (); } +bool +RouteGroup::has_subgroup() const +{ + return subgroup_bus != 0; +} + bool RouteGroup::enabled_property (PBD::PropertyID prop) {