Merged with trunk R1612.

[ardour.git] / gtk2_ardour / crossfade_view.h

diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index 3825a50acfa0d5e06855705c89499d74d61fc982..556d8c80c59ac7b793391fc824d69e8cb638a95a 100644 (file)
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -15,46 +15,44 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_crossfade_view_h__
 #define __gtk_ardour_crossfade_view_h__
 
 #include <vector>
-#include <gtk--.h>
-#include <gtk-canvas.h>
-#include <sigc++/signal_system.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 (GtkCanvasGroup*, 
-                  AudioTimeAxisView&,
-                  ARDOUR::Crossfade&,
+    CrossfadeView (ArdourCanvas::Group*, 
+                  RouteTimeAxisView&,
+                  boost::shared_ptr<ARDOUR::Crossfade>,
                   double initial_samples_per_unit, 
-                  GdkColor& basic_color,
+                  Gdk::Color& basic_color,
                   AudioRegionView& leftview,
                   AudioRegionView& rightview);
     ~CrossfadeView ();
 
-    ARDOUR::Crossfade& crossfade;  // ok, let 'em have it
+    boost::shared_ptr<ARDOUR::Crossfade> crossfade;  // ok, let 'em have it
+
     AudioRegionView& left_view;    // and these too
     AudioRegionView& right_view;
 
-    std::string get_item_name();
     void set_height (double);
 
     bool valid() const { return _valid; }
     bool visible() const { return _visible; }
     void set_valid (bool yn);
 
-    static SigC::Signal1<void,CrossfadeView*> GoingAway;
+    static sigc::signal<void,CrossfadeView*> GoingAway;
 
     AudioRegionView& upper_regionview () const;
 
@@ -71,10 +69,10 @@ struct CrossfadeView : public TimeAxisViewItem
 
     double spu;
 
-    GtkCanvasItem *overlap_rect;
-    GtkCanvasItem *fade_in;
-    GtkCanvasItem *fade_out;
-    GtkCanvasItem *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 ();