X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_edit.h;h=5d9e665ba0f3f0515b3a1fe53af4402c972b97d0;hb=d04ca6d4149b602a193da8fbb88c03fef94f9e5d;hp=715aa1a3607da3f6fe3765d9dd0aa66c4d4af110;hpb=2e8f80e37a7d20deb3f138cd72c26f8c6de9d1ab;p=ardour.git

diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 715aa1a360..5d9e665ba0 100644
--- 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,103 +26,116 @@
 #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
 {
 	class Session;
-	class Curve;
+	class AutomationList;
 	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;
-	    ARDOUR::Curve           normative_curve; /* 0 - 1.0, linear */
-	    ARDOUR::Curve           gain_curve;      /* 0 - 2.0, gain mapping */
-	    vector<ArdourCanvas::WaveView*>  waves;
-	    
+	    std::list<Point*>       points;
+	    ARDOUR::AutomationList  normative_curve; /* 0 - 1.0, linear */
+	    ARDOUR::AutomationList  gain_curve;      /* 0 - 2.0, gain mapping */
+	    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,32 +188,40 @@ class CrossfadeEditor : public ArdourDialog
 
 	double x_coordinate (double& xfract) const;
 	double y_coordinate (double& yfract) const;
-    
-	void set (const ARDOUR::Curve& alist, WhichFade);
 
-	sigc::connection peaks_ready_connection;
+	void set (const ARDOUR::AutomationList& alist, WhichFade);
+
+	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 ();
 	void audition_left_toggled ();
 	void audition_left_dry_toggled ();
 
+	void audition (Audition);
 	void audition_both ();
 	void audition_left_dry ();
 	void audition_left ();
 	void audition_right_dry ();
 	void audition_right ();
 
-	void xfade_changed (ARDOUR::Change);
+	void xfade_changed (const PBD::PropertyChange&);
 
 	void dump ();
 };