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 f2ec1a125bdd493d064bab253c1b6739833f4ac4..5d9e665ba0f3f0515b3a1fe53af4402c972b97d0 100644 (file)
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -26,9 +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
 {
@@ -37,10 +40,17 @@ namespace ARDOUR
        class Crossfade;
 }
 
+namespace ArdourCanvas {
+       class Rectangle;
+       class Line;
+       class Polygon;
+       class WaveView;
+}
+
 class CrossfadeEditor : public ArdourDialog
 {
   public:
-       CrossfadeEditor (ARDOUR::Session&, boost::shared_ptr<ARDOUR::Crossfade>, double miny, double maxy);
+       CrossfadeEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Crossfade>, double miny, double maxy);
        ~CrossfadeEditor ();
 
        void apply ();
@@ -79,15 +89,14 @@ class CrossfadeEditor : public ArdourDialog
 
   private:
        boost::shared_ptr<ARDOUR::Crossfade> xfade;
-       ARDOUR::Session& session;
 
        Gtk::VBox vpacker;
 
        struct Point {
            ~Point();
 
-           ArdourCanvas::SimpleRect* box;
-           ArdourCanvas::Line* curve;
+           ArdourCanvas::Rectangle* box;
+           ArdourCanvas::PolyLine* curve;
            double x;
            double y;
 
@@ -102,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 */
@@ -182,10 +191,11 @@ class CrossfadeEditor : public ArdourDialog
 
        void set (const ARDOUR::AutomationList& alist, WhichFade);
 
-       sigc::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::shared_ptr<ARDOUR::AudioRegion> r, WhichFade);
+       void peaks_ready (boost::weak_ptr<ARDOUR::AudioRegion> r, WhichFade);
 
        void _apply_to (boost::shared_ptr<ARDOUR::Crossfade> xf);
        void setup (boost::shared_ptr<ARDOUR::Crossfade>);
@@ -211,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 ();
 };