convert property_foo().set_value(bar) to property_foo() = bar

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 9eb26cb5a4e2cacab78bb95d390cba620716fefc..3e376d34d7ac5b64ab9fe506b9e275701fb737fa 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -26,10 +26,11 @@
 #include <cmath>
 
 #include <gtkmm.h>
-#include <gtk-canvas.h>
 
 #include <ardour/location.h>
 #include "enums.h"
+#include "simplerect.h"
+#include "canvas.h"
 
 namespace ARDOUR {
        class Route;
@@ -41,7 +42,7 @@ namespace ARDOUR {
 }
 
 struct RecBoxInfo {
-       GtkCanvasItem* rectangle;
+        ArdourCanvas::SimpleRect* rectangle;
        jack_nframes_t start;
        jack_nframes_t length;
 };
@@ -78,7 +79,7 @@ class StreamView : public sigc::trackable
        void set_show_waveforms (bool yn);
        void set_show_waveforms_recording (bool yn) { use_rec_regions = yn; }
 
-       GtkCanvasItem* canvas_item() { return canvas_group; }
+       ArdourCanvas::Item* canvas_item() { return canvas_group; }
 
        sigc::signal<void,AudioRegionView*> AudioRegionViewAdded;
 
@@ -87,11 +88,11 @@ class StreamView : public sigc::trackable
                StreamBaseColor
        };
 
-       void apply_color (GdkColor&, ColorTarget t);
+       void apply_color (Gdk::Color&, ColorTarget t);
        void set_selected_regionviews (AudioRegionSelection&);
        void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
        void get_inverted_selectables (Selection&, list<Selectable* >& results);
-       GdkColor get_region_color () const { return region_color; }
+       Gdk::Color get_region_color () const { return region_color; }
 
        void foreach_regionview (sigc::slot<void,AudioRegionView*> slot);
        void foreach_crossfadeview (void (CrossfadeView::*pmf)(void));
@@ -110,8 +111,8 @@ class StreamView : public sigc::trackable
   private:
        AudioTimeAxisView& _trackview;
 
-       GtkCanvasItem* canvas_group;
-       GtkCanvasItem* canvas_rect; /* frame around the whole thing */
+       ArdourCanvas::Group* canvas_group;
+       ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
 
        typedef list<AudioRegionView* > AudioRegionViewList;
        AudioRegionViewList region_views;
@@ -161,7 +162,7 @@ class StreamView : public sigc::trackable
 
        /* XXX why are these different? */
        
-       GdkColor region_color;
+       Gdk::Color region_color;
        uint32_t stream_base_color;
 
        vector<sigc::connection> playlist_connections;