region list patch #2 from chris g, slightly reworked by me; sv_se po changes, possibl...

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 15e354bdab07629fb7d1802cd1198be8176cb510..3b1b4cb12b81271c06fe50e5f5db34d21405fcf8 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -26,7 +26,6 @@
 #include "enums.h"
 #include "simplerect.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace Gdk {
        class Color;
@@ -60,7 +59,8 @@ class StreamView : public sigc::trackable
 public:
        virtual ~StreamView ();
 
-       RouteTimeAxisView& trackview() { return _trackview; }
+       RouteTimeAxisView&       trackview()       { return _trackview; }
+       const RouteTimeAxisView& trackview() const { return _trackview; }
 
        void attach ();
 
@@ -74,7 +74,7 @@ public:
 
        void set_layer_display (LayerDisplay);
 
-       ArdourCanvas::Item* canvas_item() { return canvas_group; }
+       ArdourCanvas::Group* canvas_item() { return canvas_group; }
 
        enum ColorTarget {
                RegionColor,
@@ -93,11 +93,14 @@ public:
 
        void add_region_view (boost::shared_ptr<ARDOUR::Region>);
        void region_layered (RegionView*);
+       virtual void update_contents_height ();
+       
+       virtual void redisplay_diskstream () = 0;
        
        sigc::signal<void,RegionView*> RegionViewAdded;
 
 protected:
-       StreamView (RouteTimeAxisView&);
+       StreamView (RouteTimeAxisView&, ArdourCanvas::Group* group = NULL);
        
 //private: (FIXME?)
 
@@ -109,13 +112,12 @@ protected:
        void         update_rec_box ();
        //virtual void update_rec_regions () = 0;
        
-       virtual RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0;
+       virtual RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool recording = false) = 0;
        virtual void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
        //void         remove_rec_region (boost::shared_ptr<ARDOUR::Region>); (unused)
 
        void         display_diskstream (boost::shared_ptr<ARDOUR::Diskstream>);
        virtual void undisplay_diskstream ();
-       virtual void redisplay_diskstream () = 0;
        void         diskstream_changed ();
        
        virtual void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
@@ -124,9 +126,8 @@ protected:
        
        virtual void color_handler () = 0;
 
-       virtual void update_contents_y_position_and_height ();
-
        RouteTimeAxisView&        _trackview;
+       bool                      owns_canvas_group;
        ArdourCanvas::Group*      canvas_group;
        ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */