a few more Location related lua bindings

[ardour.git] / gtk2_ardour / crossfade_edit.h

diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 7334002abd8a677b7ad3681676e28d414bfd9088..5d9e665ba0f3f0515b3a1fe53af4402c972b97d0 100644 (file)
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -26,11 +26,12 @@
 #include <gtkmm/button.h>
 #include <gtkmm/radiobutton.h>
 
+#include "canvas/canvas.h"
+
 #include "evoral/Curve.hpp"
 #include "ardour/session_handle.h"
 
 #include "ardour_dialog.h"
-#include "canvas.h"
 
 namespace ARDOUR
 {
@@ -39,6 +40,13 @@ namespace ARDOUR
        class Crossfade;
 }
 
+namespace ArdourCanvas {
+       class Rectangle;
+       class Line;
+       class Polygon;
+       class WaveView;
+}
+
 class CrossfadeEditor : public ArdourDialog
 {
   public:
@@ -87,8 +95,8 @@ class CrossfadeEditor : public ArdourDialog
        struct Point {
            ~Point();
 
-           ArdourCanvas::SimpleRect* box;
-           ArdourCanvas::Line* curve;
+           ArdourCanvas::Rectangle* box;
+           ArdourCanvas::PolyLine* curve;
            double x;
            double y;
 
@@ -103,11 +111,11 @@ class CrossfadeEditor : public ArdourDialog
            }
        };
 
-       ArdourCanvas::SimpleRect*   toplevel;
-       ArdourCanvas::Canvas* canvas;
+       ArdourCanvas::Rectangle*   toplevel;
+       ArdourCanvas::GtkCanvas* canvas;
 
        struct Half {
-           ArdourCanvas::Line*     line;
+           ArdourCanvas::PolyLine* line;
            ArdourCanvas::Polygon*  shading;
            std::list<Point*>       points;
            ARDOUR::AutomationList  normative_curve; /* 0 - 1.0, linear */
@@ -183,7 +191,8 @@ class CrossfadeEditor : public ArdourDialog
 
        void set (const ARDOUR::AutomationList& alist, WhichFade);
 
-       boost::signals2::scoped_connection peaks_ready_connection;
+       PBD::ScopedConnection* _peaks_ready_connection;
+       PBD::ScopedConnection state_connection;
 
        void make_waves (boost::shared_ptr<ARDOUR::AudioRegion>, WhichFade);
        void peaks_ready (boost::weak_ptr<ARDOUR::AudioRegion> r, WhichFade);
@@ -212,7 +221,7 @@ class CrossfadeEditor : public ArdourDialog
        void audition_right_dry ();
        void audition_right ();
 
-       void xfade_changed (ARDOUR::Change);
+       void xfade_changed (const PBD::PropertyChange&);
 
        void dump ();
 };