Superficial code cleanup.

[ardour.git] / gtk2_ardour / crossfade_edit.h

diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 715aa1a3607da3f6fe3765d9dd0aa66c4d4af110..9e4db3be8828a4278fa77abafe5f1b8da01c5431 100644 (file)
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -26,14 +26,14 @@
 #include <gtkmm/button.h>
 #include <gtkmm/radiobutton.h>
 
-#include <ardour/curve.h>
+#include <evoral/Curve.hpp>
 #include "ardour_dialog.h"
 #include "canvas.h"
 
 namespace ARDOUR
 {
        class Session;
-       class Curve;
+       class AutomationList;
        class Crossfade;
 }
 
@@ -105,8 +105,8 @@ class CrossfadeEditor : public ArdourDialog
            ArdourCanvas::Line*     line;
            ArdourCanvas::Polygon*  shading;
            list<Point*>            points;
-           ARDOUR::Curve           normative_curve; /* 0 - 1.0, linear */
-           ARDOUR::Curve           gain_curve;      /* 0 - 2.0, gain mapping */
+           ARDOUR::AutomationList  normative_curve; /* 0 - 1.0, linear */
+           ARDOUR::AutomationList  gain_curve;      /* 0 - 2.0, gain mapping */
            vector<ArdourCanvas::WaveView*>  waves;
            
            Half();
@@ -176,7 +176,7 @@ class CrossfadeEditor : public ArdourDialog
        double x_coordinate (double& xfract) const;
        double y_coordinate (double& yfract) const;
     
-       void set (const ARDOUR::Curve& alist, WhichFade);
+       void set (const ARDOUR::AutomationList& alist, WhichFade);
 
        sigc::connection peaks_ready_connection;
 
@@ -187,13 +187,20 @@ class CrossfadeEditor : public ArdourDialog
        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 ();