change Session::convert_to_frames_at() to Session::convert_to_frames() to reflect...

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

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index 3e9ffe16d68c3803bf534979c384fe801ef6c9bd..629216da39e5763b4fa2ed122c4fe1386169a16d 100644 (file)
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -17,7 +17,6 @@
 
 */
 
-#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
 #include <algorithm>
@@ -92,7 +91,7 @@ RouteGroup::RouteGroup (Session& s, const string &n)
        , routes (new RouteList)
        , ROUTE_GROUP_DEFAULT_PROPERTIES
 {
-       _xml_node_name = X_("RegionGroup");
+       _xml_node_name = X_("RouteGroup");
 
        add_property (_relative);
        add_property (_active);
@@ -135,7 +134,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;
 }
 
@@ -158,7 +157,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;
        }
 
@@ -235,6 +234,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) {
@@ -258,7 +259,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;
@@ -332,30 +333,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;
@@ -372,7 +373,6 @@ RouteGroup::set_hidden (bool yn, void *src)
                }
        }
        _session.set_dirty ();
-       FlagsChanged (src); /* EMIT SIGNAL */
 }
 
 void
@@ -442,25 +442,10 @@ RouteGroup::destroy_subgroup ()
 bool
 RouteGroup::enabled_property (PBD::PropertyID prop)
 {
-       if (Properties::relative.property_id == prop) {
-               return is_relative();
-       } else if (Properties::active.property_id == prop) {
-               return is_active();
-       } else if (Properties::hidden.property_id == prop) {
-               return is_hidden();
-       } else if (Properties::gain.property_id == prop) {
-               return is_gain();
-       } else if (Properties::mute.property_id == prop) {
-               return is_mute();
-       } else if (Properties::solo.property_id == prop) {
-               return is_solo();
-       } else if (Properties::recenable.property_id == prop) {
-               return is_recenable();
-       } else if (Properties::select.property_id == prop) {
-               return is_select();
-       } else if (Properties::edit.property_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 ();
 }