Heavy-duty abstraction work to split type-specific classes into

[ardour.git] / gtk2_ardour / crossfade_view.h

diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index ef137bef78058df475ac1080ec2de846ed09ea33..adbd74b42027da577d37d5857ace317eac45fbb9 100644 (file)
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -22,20 +22,19 @@
 #define __gtk_ardour_crossfade_view_h__
 
 #include <vector>
-#include <gtkmm.h>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include <sigc++/signal.h>
 #include <ardour/crossfade.h>
 
 #include "time_axis_view_item.h"
 
-class AudioTimeAxisView;
+class RouteTimeAxisView;
 class AudioRegionView;
 
 struct CrossfadeView : public TimeAxisViewItem
 {
-    CrossfadeView (Gnome::Canvas::Group*, 
-                  AudioTimeAxisView&,
+    CrossfadeView (ArdourCanvas::Group*, 
+                  RouteTimeAxisView&,
                   ARDOUR::Crossfade&,
                   double initial_samples_per_unit, 
                   Gdk::Color& basic_color,
@@ -47,7 +46,6 @@ struct CrossfadeView : public TimeAxisViewItem
     AudioRegionView& left_view;    // and these too
     AudioRegionView& right_view;
 
-    std::string get_item_name();
     void set_height (double);
 
     bool valid() const { return _valid; }
@@ -71,10 +69,10 @@ struct CrossfadeView : public TimeAxisViewItem
 
     double spu;
 
-    Gnome::Canvas::Item *overlap_rect;
-    Gnome::Canvas::Line *fade_in;
-    Gnome::Canvas::Line *fade_out;
-    Gnome::Canvas::Item *active_button;
+    ArdourCanvas::Item *overlap_rect;
+    ArdourCanvas::Line *fade_in;
+    ArdourCanvas::Line *fade_out;
+    ArdourCanvas::Item *active_button;
 
     void crossfade_changed (ARDOUR::Change);
     void active_changed ();