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 e0e992668765771602dafff4c7ee2b6373ad5166..5d9e665ba0f3f0515b3a1fe53af4402c972b97d0 100644 (file)
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,9 +26,12 @@
 #include <gtkmm/button.h>
 #include <gtkmm/radiobutton.h>
 
-#include <ardour/curve.h>
+#include "canvas/canvas.h"
+
+#include "evoral/Curve.hpp"
+#include "ardour/session_handle.h"
+
 #include "ardour_dialog.h"
-#include "canvas.h"
 
 namespace ARDOUR
 {
@@ -37,92 +40,102 @@ 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 ();
-       
+
        static const double canvas_border;
-       
+
        /* these are public so that a caller/subclass can make them do the right thing.
         */
-       
+
        Gtk::Button* cancel_button;
        Gtk::Button* ok_button;
-       
+
        struct PresetPoint {
            double x;
            double y;
-           
-           PresetPoint (double a, double b) 
+
+           PresetPoint (double a, double b)
                    : x (a), y (b) {}
        };
-       
-       struct Preset : public list<PresetPoint> {
+
+       struct Preset : public std::list<PresetPoint> {
+           const char* name;
            const char* image_name;
-           
-           Preset (const char* x) : image_name (x) {}
+
+           Preset (const char* n, const char* x) : name (n), image_name (x) {}
        };
-       
-       typedef list<Preset*> Presets;
-       
+
+       typedef std::list<Preset*> Presets;
+
        static Presets* fade_in_presets;
        static Presets* fade_out_presets;
-       
+
+  protected:
+       bool on_key_press_event (GdkEventKey*);
+       bool on_key_release_event (GdkEventKey*);
+
   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;
-           
+
            static const int32_t size;
-           
+
            void move_to (double x, double y, double xfract, double yfract);
        };
-       
-       struct PointSorter 
-       {
+
+       struct PointSorter {
            bool operator() (const CrossfadeEditor::Point* a, const CrossfadeEditor::Point *b) {
                    return a->x < b->x;
            }
        };
-       
-       ArdourCanvas::SimpleRect*   toplevel;
-       ArdourCanvas::Canvas* canvas;
-       
+
+       ArdourCanvas::Rectangle*   toplevel;
+       ArdourCanvas::GtkCanvas* canvas;
+
        struct Half {
-           ArdourCanvas::Line*     line;
+           ArdourCanvas::PolyLine* line;
            ArdourCanvas::Polygon*  shading;
-           list<Point*>            points;
+           std::list<Point*>       points;
            ARDOUR::AutomationList  normative_curve; /* 0 - 1.0, linear */
            ARDOUR::AutomationList  gain_curve;      /* 0 - 2.0, gain mapping */
-           vector<ArdourCanvas::WaveView*>  waves;
-           
+           std::vector<ArdourCanvas::WaveView*>  waves;
+
            Half();
        };
-       
+
        enum WhichFade {
                In = 0,
                Out = 1
        };
-       
+
        Half fade[2];
        WhichFade current;
-       
+
        bool point_grabbed;
-       vector<Gtk::Button*> fade_out_buttons;
-       vector<Gtk::Button*> fade_in_buttons;
+       std::vector<Gtk::Button*> fade_out_buttons;
+       std::vector<Gtk::Button*> fade_in_buttons;
 
        Gtk::VBox vpacker2;
 
@@ -150,7 +163,7 @@ class CrossfadeEditor : public ArdourDialog
        void add_control_point (double x, double y);
        Point* make_point ();
        void redraw ();
-    
+
        double effective_width () const { return canvas->get_allocation().get_width() - (2.0 * canvas_border); }
        double effective_height () const { return canvas->get_allocation().get_height() - (2.0 * canvas_border); }
 
@@ -165,7 +178,7 @@ class CrossfadeEditor : public ArdourDialog
 
        void build_presets ();
        void apply_preset (Preset*);
-    
+
        Gtk::RadioButton select_in_button;
        Gtk::RadioButton select_out_button;
        Gtk::HBox   curve_button_box;
@@ -175,25 +188,26 @@ class CrossfadeEditor : public ArdourDialog
 
        double x_coordinate (double& xfract) const;
        double y_coordinate (double& yfract) const;
-    
+
        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>);
        void cancel_audition ();
        void audition_state_changed (bool);
-       
+
        enum Audition {
                Both,
                Left,
                Right
        };
-       
+
        void audition_toggled ();
        void audition_right_toggled ();
        void audition_right_dry_toggled ();
@@ -207,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 ();
 };