Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstre...

[ardour.git] / gtk2_ardour / route_time_axis.h

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index ac3429cb823c1db5c107e66b80c88a4a12e90ee2..e24de4126f06f2ca09e98cfab24d5d82c074dc9e 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -48,7 +48,6 @@
 namespace ARDOUR {
        class Session;
        class Region;
-       class Diskstream;
        class RouteGroup;
        class IOProcessor;
        class Processor;
@@ -150,7 +149,7 @@ public:
        void reset_meter ();
        void clear_meter ();
        void io_changed (ARDOUR::IOChange, void *);
-       void meter_changed (void *);
+       void meter_changed ();
        void effective_gain_display () { gm.effective_gain_display(); }
 
        static void setup_slider_pix ();
@@ -183,7 +182,6 @@ protected:
        };
 
 
-       void diskstream_changed ();
        void update_diskstream_display ();
 
        gint edit_click  (GdkEventButton *);
@@ -218,7 +216,7 @@ protected:
        void reset_processor_automation_curves ();
 
        void take_name_changed (void *src);
-       void route_name_changed ();
+       void route_property_changed (const PBD::PropertyChange&);
        void name_entry_changed ();
 
        void update_rec_display ();
@@ -291,10 +289,9 @@ protected:
        Gtk::Menu*          mode_menu;
        Gtk::Menu*          color_mode_menu;
 
-       virtual Gtk::Menu* build_mode_menu() { return 0; }
        virtual Gtk::Menu* build_color_mode_menu() { return 0; }
 
-       void use_playlist (boost::weak_ptr<ARDOUR::Playlist>);
+       void use_playlist (Gtk::RadioMenuItem *item, boost::weak_ptr<ARDOUR::Playlist> wpl);
 
        ArdourCanvas::SimpleRect* timestretch_rect;
 
@@ -325,6 +322,8 @@ protected:
        UnderlayList _underlay_streams;
        typedef std::list<RouteTimeAxisView*> UnderlayMirrorList;
        UnderlayMirrorList _underlay_mirrors;
+
+       bool _ignore_track_mode_change; ///< true to ignore track mode change signals
 };
 
 #endif /* __ardour_route_time_axis_h__ */