X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.h;h=db1d33fdf81163e653698942b26cf7c23ac473c6;hb=3600f60a030de8bd5cca3fa983f3e926a084a1c0;hp=adbd74b42027da577d37d5857ace317eac45fbb9;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git

diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index adbd74b420..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,7 +15,6 @@
     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__
@@ -23,8 +22,8 @@
 
 #include <vector>
 #include <libgnomecanvasmm.h>
-#include <sigc++/signal.h>
-#include <ardour/crossfade.h>
+#include "pbd/signals.h"
+#include "ardour/crossfade.h"
 
 #include "time_axis_view_item.h"
 
@@ -33,16 +32,17 @@ class AudioRegionView;
 
 struct CrossfadeView : public TimeAxisViewItem
 {
-    CrossfadeView (ArdourCanvas::Group*, 
+    CrossfadeView (ArdourCanvas::Group*,
 		   RouteTimeAxisView&,
-		   ARDOUR::Crossfade&,
-		   double initial_samples_per_unit, 
+		   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;
 
@@ -52,14 +52,14 @@ struct CrossfadeView : public TimeAxisViewItem
     bool visible() const { return _visible; }
     void set_valid (bool yn);
 
-    static sigc::signal<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);
 
@@ -67,16 +67,15 @@ struct CrossfadeView : public TimeAxisViewItem
     bool _valid;
     bool _visible;
 
-    double spu;
-
-    ArdourCanvas::Item *overlap_rect;
     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__ */