projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths...
[ardour.git] / libs / ardour / route_group.cc
diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index 5b998d22f765de7d093efcf65ada5a308f1a1d7c..9dbdad33d46fefb27d762c21a74b85ba7ee64240 100644 (file)
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -28,6 +28,7 @@
 #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"
@@ -40,9 +41,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<bool> relative;
@@ -59,33 +57,42 @@ namespace ARDOUR {
 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::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));
 }
 
-#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) \
+       , _edit (Properties::edit, 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);
@@ -128,7 +135,7 @@ RouteGroup::add (boost::shared_ptr<Route> r)
        r->DropReferences.connect_same_thread (*this, boost::bind (&RouteGroup::remove_when_going_away, this, boost::weak_ptr<Route> (r)));
        
        _session.set_dirty ();
-       changed (); /* EMIT SIGNAL */
+       MembershipChanged (); /* EMIT SIGNAL */
        return 0;
 }
 
@@ -151,7 +158,7 @@ RouteGroup::remove (boost::shared_ptr<Route> r)
                r->leave_route_group ();
                routes->erase (i);
                _session.set_dirty ();
-               changed (); /* EMIT SIGNAL */
+               MembershipChanged (); /* EMIT SIGNAL */
                return 0;
        }
 
@@ -164,7 +171,7 @@ RouteGroup::get_min_factor(gain_t factor)
 {
        gain_t g;
 
-       for (RouteList::iterator i = routes->begin(); i != routes->end(); i++) {
+       for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
                g = (*i)->amp()->gain();
 
                if ( (g+g*factor) >= 0.0f)
@@ -228,6 +235,8 @@ RouteGroup::set_state (const XMLNode& node, int version)
                return set_state_2X (node, version);
        }
 
+       set_values (node);
+
        const XMLProperty *prop;
 
        if ((prop = node.property ("routes")) != 0) {
@@ -251,7 +260,7 @@ 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;
@@ -325,30 +334,30 @@ RouteGroup::set_edit (bool yn)
 }
 
 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;
        _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;
@@ -365,7 +374,6 @@ RouteGroup::set_hidden (bool yn, void *src)
                }
        }
        _session.set_dirty ();
-       FlagsChanged (src); /* EMIT SIGNAL */
 }
 
 void
@@ -435,25 +443,10 @@ RouteGroup::destroy_subgroup ()
 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();
+       OwnedPropertyList::iterator i = _properties->find (prop);
+       if (i == _properties->end()) {
+               return false;
        }
 
-       return false;
+       return dynamic_cast<const PropertyTemplate<bool>* > (i->second)->val ();
 }
Unnamed repository; edit this file 'description' to name the repository.