X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.h;h=f593560f29b14c244d2199dfb62a319a6c7628d9;hb=c2652437da8786e1a1803486fddf131f20af98d3;hp=610fa92e0e2e84775a4aef8f462ccc7a2a70af8a;hpb=fa701b8c065251d242342b86a54d91826d2290a0;p=ardour.git

diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index 610fa92e0e..f593560f29 100644
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -21,7 +21,6 @@
 #define __gtk_ardour_crossfade_view_h__
 
 #include <vector>
-#include <libgnomecanvasmm.h>
 #include "pbd/signals.h"
 #include "ardour/crossfade.h"
 
@@ -30,55 +29,58 @@
 class RouteTimeAxisView;
 class AudioRegionView;
 
-struct CrossfadeView : public TimeAxisViewItem
-{
-    CrossfadeView (ArdourCanvas::Group*,
-		   RouteTimeAxisView&,
-		   boost::shared_ptr<ARDOUR::Crossfade>,
-		   double initial_samples_per_unit,
-		   Gdk::Color& basic_color,
-		   AudioRegionView& leftview,
-		   AudioRegionView& rightview);
-    ~CrossfadeView ();
+namespace ArdourCanvas {
+	class PolyLine;
+}
 
-    boost::shared_ptr<ARDOUR::Crossfade> crossfade;  // ok, let 'em have it
+class CrossfadeView : public TimeAxisViewItem
+{
+public:
+	CrossfadeView (ArdourCanvas::Container*,
+	               RouteTimeAxisView&,
+	               boost::shared_ptr<ARDOUR::Crossfade>,
+	               double initial_samples_per_pixel,
+	               Gdk::Color& basic_color,
+	               AudioRegionView& leftview,
+	               AudioRegionView& rightview);
 
-    AudioRegionView& left_view;    // and these too
-    AudioRegionView& right_view;
+	~CrossfadeView ();
 
-    void set_height (double);
+	boost::shared_ptr<ARDOUR::Crossfade> crossfade;  // ok, let 'em have it
 
-    bool valid() const { return _valid; }
-    bool visible() const { return _visible; }
-    void set_valid (bool yn);
+	AudioRegionView& left_view;    // and these too
+	AudioRegionView& right_view;
 
-    static PBD::Signal1<void,CrossfadeView*> CatchDeletion;
+	void set_heights (double, double);
 
-    AudioRegionView& upper_regionview () const;
+	bool valid() const { return _valid; }
+	bool visible() const { return _visible; }
+	void set_valid (bool yn);
 
-    void fake_hide ();
-    void hide ();
-    void show ();
+	static PBD::Signal1<void,CrossfadeView*> CatchDeletion;
 
-  protected:
-    void reset_width_dependent_items (double pixel_width);
+	void fake_hide ();
+	void hide ();
+	void show ();
+	void horizontal_position_changed ();
 
-  private:
-    bool _valid;
-    bool _visible;
+protected:
+	void reset_width_dependent_items (double pixel_width);
 
-    double spu;
-    double _height;
+private:
+	bool _valid;
+	bool _visible;
+	bool _all_in_view;
+	double _child_height;
 
-    ArdourCanvas::Item *overlap_rect;
-    ArdourCanvas::Line *fade_in;
-    ArdourCanvas::Line *fade_out;
-    ArdourCanvas::Item *active_button;
+	ArdourCanvas::PolyLine *fade_in;
+	ArdourCanvas::PolyLine *fade_out;
 
-    void crossfade_changed (const PBD::PropertyChange&);
-    void active_changed ();
-    void redraw_curves ();
-    void color_handler ();
+	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__ */