correct CANVAS_STRING_VARIABLE macro in UIConfiguration constructor

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 49001f57f6808d590619b75e10f82ac43d335548..e0d60baf344d29c267a5a3324ac13ec686e5d66e 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -26,8 +26,6 @@
 
 #include "ardour/location.h"
 #include "enums.h"
-#include "simplerect.h"
-#include "canvas.h"
 
 namespace Gdk {
        class Color;
@@ -42,8 +40,13 @@ namespace ARDOUR {
        struct PeakData;
 }
 
+namespace ArdourCanvas {
+       class Rectangle;
+       class Group;
+}
+
 struct RecBoxInfo {
-       ArdourCanvas::SimpleRect*  rectangle;
+       ArdourCanvas::Rectangle*   rectangle;
        framepos_t                 start;
        ARDOUR::framecnt_t         length;
 };
@@ -70,9 +73,8 @@ public:
        int set_position (gdouble x, gdouble y);
        virtual int set_height (double);
 
-       virtual int set_samples_per_unit (gdouble spp);
-       gdouble     get_samples_per_unit () { return _samples_per_unit; }
-       virtual void horizontal_position_changed () {}
+       virtual int set_samples_per_pixel (double);
+       gdouble     get_samples_per_pixel () const { return _samples_per_pixel; }
 
         virtual void enter_internal_edit_mode ();
         virtual void leave_internal_edit_mode ();
@@ -80,7 +82,6 @@ public:
        void set_layer_display (LayerDisplay);
        LayerDisplay layer_display () const { return _layer_display; }
 
-       ArdourCanvas::Group* background_group() { return _background_group; }
        ArdourCanvas::Group* canvas_item() { return _canvas_group; }
 
        enum ColorTarget {
@@ -88,8 +89,9 @@ public:
                StreamBaseColor
        };
 
-       Gdk::Color get_region_color () const { return region_color; }
-       void       apply_color (Gdk::Color, ColorTarget t);
+       uint32_t get_region_color () const { return region_color; }
+       void     apply_color (uint32_t, ColorTarget t);
+       void     apply_color (Gdk::Color const &, ColorTarget t);
 
        uint32_t     num_selected_regionviews () const;
 
@@ -126,7 +128,7 @@ public:
        sigc::signal<void> ContentsHeightChanged;
 
 protected:
-       StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0);
+       StreamView (RouteTimeAxisView&, ArdourCanvas::Group* canvas_group = 0);
 
        void         transport_changed();
        void         transport_looped();
@@ -149,16 +151,13 @@ protected:
        virtual void color_handler () = 0;
 
        RouteTimeAxisView&        _trackview;
-       bool                      owns_background_group;
-       bool                      owns_canvas_group;
-       ArdourCanvas::Group*      _background_group;
        ArdourCanvas::Group*      _canvas_group;
-       ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
+       ArdourCanvas::Rectangle*   canvas_rect; /* frame around the whole thing */
 
        typedef std::list<RegionView* > RegionViewList;
        RegionViewList  region_views;
 
-       double _samples_per_unit;
+       double _samples_per_pixel;
 
        sigc::connection       screen_update_connection;
        std::vector<RecBoxInfo>     rec_rects;
@@ -166,8 +165,8 @@ protected:
        bool                   rec_updating;
        bool                   rec_active;
 
-       Gdk::Color region_color;      ///< Contained region color
-       uint32_t   stream_base_color; ///< Background color
+       uint32_t region_color;      ///< Contained region color
+       uint32_t stream_base_color; ///< Background color
 
        PBD::ScopedConnectionList playlist_connections;
        PBD::ScopedConnection playlist_switched_connection;