add GUI for midi-device settings (and properly indent the code)

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 869772ed206f5736bdd072f56592c8d7a80b691a..e0d60baf344d29c267a5a3324ac13ec686e5d66e 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -75,7 +75,6 @@ public:
 
        virtual int set_samples_per_pixel (double);
        gdouble     get_samples_per_pixel () const { return _samples_per_pixel; }
-       virtual void horizontal_position_changed () {}
 
         virtual void enter_internal_edit_mode ();
         virtual void leave_internal_edit_mode ();
@@ -83,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 {
@@ -91,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;
 
@@ -129,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();
@@ -152,11 +151,8 @@ 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::Rectangle*  canvas_rect; /* frame around the whole thing */
+       ArdourCanvas::Rectangle*   canvas_rect; /* frame around the whole thing */
 
        typedef std::list<RegionView* > RegionViewList;
        RegionViewList  region_views;
@@ -169,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;