X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.h;h=db1d33fdf81163e653698942b26cf7c23ac473c6;hb=8bdf5cf1d0caa0c6e96c43d19dae756094eb4e2b;hp=3825a50acfa0d5e06855705c89499d74d61fc982;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index 3825a50acf..db1d33fdf8 100644
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,53 +15,51 @@
     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 <ardour/crossfade.h>
+#include <libgnomecanvasmm.h>
+#include "pbd/signals.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&,
-		   double initial_samples_per_unit, 
-		   GdkColor& basic_color,
+    CrossfadeView (ArdourCanvas::Group*,
+		   RouteTimeAxisView&,
+		   boost::shared_ptr<ARDOUR::Crossfade>,
+		   double initial_samples_per_unit,
+		   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 PBD::Signal1<void,CrossfadeView*> CatchDeletion;
 
     AudioRegionView& upper_regionview () const;
 
     void fake_hide ();
     void hide ();
     void show ();
-    
+
   protected:
     void reset_width_dependent_items (double pixel_width);
 
@@ -69,16 +67,15 @@ struct CrossfadeView : public TimeAxisViewItem
     bool _valid;
     bool _visible;
 
-    double spu;
-
-    GtkCanvasItem *overlap_rect;
-    GtkCanvasItem *fade_in;
-    GtkCanvasItem *fade_out;
-    GtkCanvasItem *active_button;
+    ArdourCanvas::Line *fade_in;
+    ArdourCanvas::Line *fade_out;
+    ArdourCanvas::Item *active_button;
 
-    void crossfade_changed (ARDOUR::Change);
+    void crossfade_changed (const PBD::PropertyChange&);
+    void crossfade_fades_changed ();
     void active_changed ();
     void redraw_curves ();
+    void color_handler ();
 };
 
 #endif /* __gtk_ardour_crossfade_view_h__ */