Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite...

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

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index 225224e6842afafc8bb81a5c6b1ade31199672f9..f22deb5dbfd2c6b6420b7ae54f5339884c7856f2 100644 (file)
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #define __STDC_FORMAT_MACROS
@@ -26,20 +25,37 @@
 #include <sigc++/bind.h>
 
 #include <pbd/error.h>
+#include <pbd/enumwriter.h>
 
 #include <ardour/route_group.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_track.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/configuration.h>
 
 using namespace ARDOUR;
 using namespace sigc;
+using namespace std;
+
+RouteGroup::RouteGroup (Session& s, const string &n, Flag f)
+       : _session (s), _name (n), _flags (f) 
+{
+}
+
+void
+RouteGroup::set_name (string str)
+{
+       _name = str;
+       _session.set_dirty ();
+       FlagsChanged (0); /* EMIT SIGNAL */
+}
 
 int
 RouteGroup::add (Route *r)
 {
        routes.push_back (r);
        r->GoingAway.connect (sigc::bind (mem_fun (*this, &RouteGroup::remove_when_going_away), r));
-        changed (); /* EMIT SIGNAL */
+       _session.set_dirty ();
+       changed (); /* EMIT SIGNAL */
        return 0;
 }
 
@@ -56,7 +72,8 @@ RouteGroup::remove (Route *r)
 
        if ((i = find (routes.begin(), routes.end(), r)) != routes.end()) {
                routes.erase (i);
-                changed (); /* EMIT SIGNAL */
+               _session.set_dirty ();
+               changed (); /* EMIT SIGNAL */
                return 0;
        }
        return -1;
@@ -108,11 +125,9 @@ RouteGroup::get_max_factor(gain_t factor)
 XMLNode&
 RouteGroup::get_state (void)
 {
-       char buf[32];
        XMLNode *node = new XMLNode ("RouteGroup");
        node->add_property ("name", _name);
-       snprintf (buf, sizeof (buf), "%" PRIu32, (uint32_t) _flags);
-       node->add_property ("flags", buf);
+       node->add_property ("flags", enum_2_string (_flags));
        return *node;
 }
 
@@ -126,7 +141,7 @@ RouteGroup::set_state (const XMLNode& node)
        }
 
        if ((prop = node.property ("flags")) != 0) {
-               _flags = atoi (prop->value().c_str());
+               _flags = Flag (string_2_enum (prop->value(), _flags));
        }
 
        return 0;
@@ -134,17 +149,17 @@ RouteGroup::set_state (const XMLNode& node)
 
 void
 RouteGroup::set_active (bool yn, void *src)
-
 {
        if (is_active() == yn) {
                return;
        }
        if (yn) {
-               _flags |= Active;
+               _flags = Flag (_flags | Active);
        } else {
-               _flags &= ~Active;
+               _flags = Flag (_flags & ~Active);
        }
-        FlagsChanged (src); /* EMIT SIGNAL */
+       _session.set_dirty ();
+       FlagsChanged (src); /* EMIT SIGNAL */
 }
 
 void
@@ -155,11 +170,12 @@ RouteGroup::set_relative (bool yn, void *src)
                return;
        }
        if (yn) {
-               _flags |= Relative;
+               _flags = Flag (_flags | Relative);
        } else {
-               _flags &= ~Relative;
+               _flags = Flag (_flags & ~Relative);
        }
-        FlagsChanged (src); /* EMIT SIGNAL */
+       _session.set_dirty ();
+       FlagsChanged (src); /* EMIT SIGNAL */
 }
 
 void
@@ -170,15 +186,28 @@ RouteGroup::set_hidden (bool yn, void *src)
                return;
        }
        if (yn) {
-               _flags |= Hidden;
-               if (Config->does_hiding_groups_deactivates_groups()) {
-                       _flags &= ~Active;
+               _flags = Flag (_flags | Hidden);
+               if (Config->get_hiding_groups_deactivates_groups()) {
+                       _flags = Flag (_flags & ~Active);
                }
        } else {
-               _flags &= ~Hidden;
-               if (Config->does_hiding_groups_deactivates_groups()) {
-                       _flags |= Active;
+               _flags = Flag (_flags & ~Hidden);
+               if (Config->get_hiding_groups_deactivates_groups()) {
+                       _flags = Flag (_flags | Active);
                }
        }
-        FlagsChanged (src); /* EMIT SIGNAL */
+       _session.set_dirty ();
+       FlagsChanged (src); /* EMIT SIGNAL */
 }
+
+void
+RouteGroup::audio_track_group (set<AudioTrack*>& ats) 
+{      
+       for (list<Route*>::iterator i = routes.begin(); i != routes.end(); ++i) {
+               AudioTrack* at = dynamic_cast<AudioTrack*>(*i);
+               if (at) {
+                       ats.insert (at);
+               }
+       }
+}
+