fix initial AFL/PFL state after session-load

[ardour.git] / libs / ardour / route_group.cc

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index ef7645e63f2ea68042f96ed412eec6255bbeb1f0..032c85f6cea105540259f46f7a06375a30dc8836 100644 (file)
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -21,17 +21,14 @@
 
 #include <algorithm>
 
-
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
 #include "pbd/strsplit.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 +46,6 @@ namespace ARDOUR {
                PropertyDescriptor<bool> solo;
                PropertyDescriptor<bool> recenable;
                PropertyDescriptor<bool> select;
-               PropertyDescriptor<bool> edit;
                PropertyDescriptor<bool> route_active;
                PropertyDescriptor<bool> color;
                PropertyDescriptor<bool> monitoring;
@@ -75,8 +71,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 +79,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 +106,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 +136,7 @@ RouteGroup::add (boost::shared_ptr<Route> r)
        if (r->route_group()) {
                r->route_group()->remove (r);
        }
-       
+
        routes->push_back (r);
 
        r->set_route_group (this);
@@ -198,7 +190,7 @@ RouteGroup::get_min_factor (gain_t factor)
 
                factor = 0.0000003f / g - 1.0f;
        }
-       
+
        return factor;
 }
 
@@ -289,7 +281,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 +288,6 @@ RouteGroup::set_state_2X (const XMLNode& node, int /*version*/)
                _mute = false;
                _solo = false;
                _recenable = false;
-               _edit = true;
                _route_active = false;
                _color = false;
        }
@@ -355,16 +345,6 @@ RouteGroup::set_select (bool yn)
        send_change (PropertyChange (Properties::select));
 }
 
-void
-RouteGroup::set_edit (bool yn)
-{
-       if (is_edit() == yn) {
-               return;
-       }
-       _edit = yn;
-       send_change (PropertyChange (Properties::edit));
-}
-
 void
 RouteGroup::set_route_active (bool yn)
 {
@@ -396,7 +376,7 @@ RouteGroup::set_color (bool yn)
 }
 
 void
-RouteGroup::set_monitoring (bool yn) 
+RouteGroup::set_monitoring (bool yn)
 {
        if (is_monitoring() == yn) {
                return;
@@ -505,7 +485,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);
                }
        }
 }
@@ -526,6 +506,12 @@ RouteGroup::destroy_subgroup ()
        subgroup_bus.reset ();
 }
 
+bool
+RouteGroup::has_subgroup() const
+{
+       return subgroup_bus != 0;
+}
+
 bool
 RouteGroup::enabled_property (PBD::PropertyID prop)
 {