Merged with trunk R1612.

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

diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 19374b4f658580340362de25e0d38128ab2b74ac..55448df45bc8f6c39ff8eaae10a9419c7045b8df 100644 (file)
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -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$
 */
 
 #ifndef __ardour_route_group_h__
@@ -35,6 +34,7 @@ using std::list;
 namespace ARDOUR {
 
 class Route;
+class Track;
 class AudioTrack;
 class Session;
 
@@ -43,7 +43,7 @@ class RouteGroup : public Stateful, public sigc::trackable {
     enum Flag {
            Relative = 0x1,
            Active = 0x2,
-           Hidden = 0x4,
+           Hidden = 0x4
     };
 
     RouteGroup (Session& s, const string &n, Flag f = Flag(0));
@@ -90,7 +90,7 @@ class RouteGroup : public Stateful, public sigc::trackable {
 
     /* to use these, #include <ardour/route_group_specialized.h> */
 
-    template<class T> void apply (void (AudioTrack::*func)(T, void *), T val, void *src);
+    template<class T> void apply (void (Track::*func)(T, void *), T val, void *src);
 
     /* fills at_set with all members of the group that are AudioTracks */
 
@@ -114,7 +114,7 @@ class RouteGroup : public Stateful, public sigc::trackable {
     Session& _session;
     list<Route *> routes;
     string _name;
-    uint32_t _flags;
+    Flag _flags;
 
     void remove_when_going_away (Route*);
 };