X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.h;h=39ca8bf1c3e9ef31980a34b62df25d15a213f8fa;hb=f7f9d6fdc40248b190ec9c6e1a886261d55777ae;hp=b4931c94c0b3f3ff5579d54262bccffaa566be6e;hpb=868f557f2612903f72614a2b3a317c7a528188d1;p=ardour.git

diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index b4931c94c0..39ca8bf1c3 100644
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -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__
@@ -28,26 +27,26 @@
 
 #include "time_axis_view_item.h"
 
-class AudioTimeAxisView;
+class RouteTimeAxisView;
 class AudioRegionView;
 
 struct CrossfadeView : public TimeAxisViewItem
 {
     CrossfadeView (ArdourCanvas::Group*, 
-		   AudioTimeAxisView&,
-		   ARDOUR::Crossfade&,
+		   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);
+    void set_y_position_and_height (double, double);
 
     bool valid() const { return _valid; }
     bool visible() const { return _visible; }
@@ -69,6 +68,8 @@ struct CrossfadeView : public TimeAxisViewItem
     bool _visible;
 
     double spu;
+    double _y_position;
+    double _height;
 
     ArdourCanvas::Item *overlap_rect;
     ArdourCanvas::Line *fade_in;
@@ -78,6 +79,7 @@ struct CrossfadeView : public TimeAxisViewItem
     void crossfade_changed (ARDOUR::Change);
     void active_changed ();
     void redraw_curves ();
+	void color_handler ();
 };
 
 #endif /* __gtk_ardour_crossfade_view_h__ */