X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.h;h=af33cb7296dd76222da9cca6767efee1984449d2;hb=25eb9f406960aa8e36ccd90e2cd4397f372bd0fa;hp=a82387393fcc13368456ec031268c6f6b632e548;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

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