fix merge conflict from master

[ardour.git] / gtk2_ardour / crossfade_edit.cc

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 0c8daafb045995826673acdb50616d103a4c61db..aaea3a224274666a2b0af6fc984853503b2cc444 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -37,6 +37,7 @@
 #include "ardour/audiosource.h"
 #include "ardour/region_factory.h"
 #include "ardour/profile.h"
+#include "ardour/crossfade_binder.h"
 
 #include <gtkmm2ext/gtk_ui.h>
 
@@ -97,13 +98,12 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d
          select_out_button (_("Fade Out")),
 
          _peaks_ready_connection (0)
-         
+
 {
        set_session (s);
 
        set_wmclass (X_("ardour_automationedit"), PROGRAM_NAME);
        set_name ("CrossfadeEditWindow");
-       set_position (Gtk::WIN_POS_MOUSE);
 
        add_accel_group (ActionManager::ui_manager->get_accel_group());
 
@@ -295,9 +295,9 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d
 
        curve_select_clicked (In);
 
-       xfade->PropertyChanged.connect (state_connection, invalidator (*this), ui_bind (&CrossfadeEditor::xfade_changed, this, _1), gui_context());
+       xfade->PropertyChanged.connect (state_connection, invalidator (*this), boost::bind (&CrossfadeEditor::xfade_changed, this, _1), gui_context());
 
-       _session->AuditionActive.connect (_session_connections, invalidator (*this), ui_bind (&CrossfadeEditor::audition_state_changed, this, _1), gui_context());
+       _session->AuditionActive.connect (_session_connections, invalidator (*this), boost::bind (&CrossfadeEditor::audition_state_changed, this, _1), gui_context());
        show_all_children();
 }
 
@@ -509,7 +509,7 @@ CrossfadeEditor::Point::move_to (double nx, double ny, double xfract, double yfr
        } else if ( xfract > 1.0 ) {
                xfract = 1.0;
        }
-        
+
        if ( yfract < 0.0 ) {
                yfract = 0.0;
        } else if ( yfract > 1.0 ) {
@@ -788,10 +788,16 @@ CrossfadeEditor::apply ()
        _session->begin_reversible_command (_("Edit crossfade"));
 
        XMLNode& before = xfade->get_state ();
-       
+
        _apply_to (xfade);
 
-       _session->add_command (new MementoCommand<Crossfade> (*xfade.get(), &before, &xfade->get_state ()));
+       _session->add_command (
+               new MementoCommand<Crossfade> (
+                       new ARDOUR::CrossfadeBinder (_session->playlists, xfade->id ()),
+                       &before, &xfade->get_state ()
+                       )
+               );
+
        _session->commit_reversible_command ();
 }
 
@@ -809,8 +815,6 @@ CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
 
        double firstx = (*in.begin())->when;
        double endx = (*the_end)->when;
-       double miny = in.get_min_y ();
-       double maxy = in.get_max_y ();
 
        in.freeze ();
        in.clear ();
@@ -818,7 +822,7 @@ CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
        for (list<Point*>::iterator i = fade[In].points.begin(); i != fade[In].points.end(); ++i) {
 
                double when = firstx + ((*i)->x * (endx - firstx));
-               double value = (*i)->y; // miny + ((*i)->y * (maxy - miny));
+               double value = (*i)->y;
                in.add (when, value);
        }
 
@@ -829,8 +833,6 @@ CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
 
        firstx = (*out.begin())->when;
        endx = (*the_end)->when;
-       miny = out.get_min_y ();
-       maxy = out.get_max_y ();
 
        out.freeze ();
        out.clear ();
@@ -838,7 +840,7 @@ CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
        for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
 
                double when = firstx + ((*i)->x * (endx - firstx));
-               double value = (*i)->y; // miny + ((*i)->y * (maxy - miny));
+               double value = (*i)->y;
                out.add (when, value);
        }
 
@@ -886,7 +888,7 @@ CrossfadeEditor::build_presets ()
 
        /* FADE IN */
 
-       p = new Preset ("Linear (-6dB)", "crossfade-in-linear");
+       p = new Preset ("Linear (-6dB)", "fadein-linear");
        p->push_back (PresetPoint (0, 0));
        p->push_back (PresetPoint (0.000000, 0.000000));
        p->push_back (PresetPoint (0.166667, 0.166366));
@@ -897,7 +899,7 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1.000000, 1.000000));
        fade_in_presets->push_back (p);
 
-       p = new Preset ("S(1)-curve", "crossfade-in-S1");
+       p = new Preset ("S(1)-curve", "fadein-S1");
        p->push_back (PresetPoint (0, 0));
        p->push_back (PresetPoint (0.1, 0.01));
        p->push_back (PresetPoint (0.2, 0.03));
@@ -906,7 +908,7 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 1));
        fade_in_presets->push_back (p);
 
-       p = new Preset ("S(2)-curve", "crossfade-in-S2");
+       p = new Preset ("S(2)-curve", "fadein-S2");
        p->push_back (PresetPoint (0.0, 0.0));
        p->push_back (PresetPoint (0.055, 0.222));
        p->push_back (PresetPoint (0.163, 0.35));
@@ -915,7 +917,7 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1.0, 1.0));
        fade_in_presets->push_back (p);
 
-       p = new Preset ("Constant Power (-3dB)", "crossfade-in-constant-power");
+       p = new Preset ("Constant power (-3dB)", "fadein-constant-power");
 
        p->push_back (PresetPoint (0.000000, 0.000000));
        p->push_back (PresetPoint (0.166667, 0.282192));
@@ -929,7 +931,7 @@ CrossfadeEditor::build_presets ()
 
        if (!Profile->get_sae()) {
 
-               p = new Preset ("Short cut", "crossfade-in-short-cut");
+               p = new Preset ("Short cut", "fadein-short-cut");
                p->push_back (PresetPoint (0, 0));
                p->push_back (PresetPoint (0.389401, 0.0333333));
                p->push_back (PresetPoint (0.629032, 0.0861111));
@@ -939,7 +941,7 @@ CrossfadeEditor::build_presets ()
                p->push_back (PresetPoint (1, 1));
                fade_in_presets->push_back (p);
 
-               p = new Preset ("Slow cut", "crossfade-in-slow-cut");
+               p = new Preset ("Slow cut", "fadein-slow-cut");
                p->push_back (PresetPoint (0, 0));
                p->push_back (PresetPoint (0.304147, 0.0694444));
                p->push_back (PresetPoint (0.529954, 0.152778));
@@ -949,7 +951,7 @@ CrossfadeEditor::build_presets ()
                p->push_back (PresetPoint (1, 1));
                fade_in_presets->push_back (p);
 
-               p = new Preset ("Fast cut", "crossfade-in-fast-cut");
+               p = new Preset ("Fast cut", "fadein-fast-cut");
                p->push_back (PresetPoint (0, 0));
                p->push_back (PresetPoint (0.0737327, 0.308333));
                p->push_back (PresetPoint (0.246544, 0.658333));
@@ -959,7 +961,7 @@ CrossfadeEditor::build_presets ()
                p->push_back (PresetPoint (1, 1));
                fade_in_presets->push_back (p);
 
-               p = new Preset ("Long cut", "crossfade-in-long-cut");
+               p = new Preset ("Long cut", "fadein-long-cut");
                p->push_back (PresetPoint (0, 0));
                p->push_back (PresetPoint (0.0207373, 0.197222));
                p->push_back (PresetPoint (0.0645161, 0.525));
@@ -974,7 +976,7 @@ CrossfadeEditor::build_presets ()
        /* FADE OUT */
 
        // p = new Preset ("regout.xpm");
-       p = new Preset ("Linear (-6dB cut)", "crossfade-out-linear");
+       p = new Preset ("Linear (-6dB cut)", "fadeout-linear");
        p->push_back (PresetPoint (0, 1));
        p->push_back (PresetPoint (0.000000, 1.000000));
        p->push_back (PresetPoint (0.166667, 0.833033));
@@ -985,7 +987,7 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1.000000, 0.000000));
        fade_out_presets->push_back (p);
 
-       p = new Preset ("S(1)-Curve", "crossfade-out-S1");
+       p = new Preset ("S(1)-Curve", "fadeout-S1");
        p->push_back (PresetPoint (0, 1));
        p->push_back (PresetPoint (0.1, 0.99));
        p->push_back (PresetPoint (0.2, 0.97));
@@ -994,7 +996,7 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 0));
        fade_out_presets->push_back (p);
 
-       p = new Preset ("S(2)-Curve", "crossfade-out-S2");
+       p = new Preset ("S(2)-Curve", "fadeout-S2");
        p->push_back (PresetPoint (0.0, 1.0));
        p->push_back (PresetPoint (0.163, 0.678));
        p->push_back (PresetPoint (0.055, 0.783));
@@ -1004,7 +1006,7 @@ CrossfadeEditor::build_presets ()
        fade_out_presets->push_back (p);
 
        // p = new Preset ("linout.xpm");
-       p = new Preset ("Constant Power (-3dB cut)", "crossfade-out-constant-power");
+       p = new Preset ("Constant power (-3dB cut)", "fadeout-constant-power");
        p->push_back (PresetPoint (0.000000, 1.000000));
        p->push_back (PresetPoint (0.166667, 0.948859));
        p->push_back (PresetPoint (0.333333, 0.851507));
@@ -1016,7 +1018,7 @@ CrossfadeEditor::build_presets ()
 
        if (!Profile->get_sae()) {
                // p = new Preset ("hiout.xpm");
-               p = new Preset ("Short cut", "crossfade-out-short-cut");
+               p = new Preset ("Short cut", "fadeout-short-cut");
                p->push_back (PresetPoint (0, 1));
                p->push_back (PresetPoint (0.305556, 1));
                p->push_back (PresetPoint (0.548611, 0.991736));
@@ -1026,7 +1028,7 @@ CrossfadeEditor::build_presets ()
                p->push_back (PresetPoint (1, 0));
                fade_out_presets->push_back (p);
 
-               p = new Preset ("Slow cut", "crossfade-out-slow-cut");
+               p = new Preset ("Slow cut", "fadeout-slow-cut");
                p->push_back (PresetPoint (0, 1));
                p->push_back (PresetPoint (0.228111, 0.988889));
                p->push_back (PresetPoint (0.347926, 0.972222));
@@ -1036,7 +1038,7 @@ CrossfadeEditor::build_presets ()
                p->push_back (PresetPoint (1, 0));
                fade_out_presets->push_back (p);
 
-               p = new Preset ("Fast cut", "crossfade-out-fast-cut");
+               p = new Preset ("Fast cut", "fadeout-fast-cut");
                p->push_back (PresetPoint (0, 1));
                p->push_back (PresetPoint (0.080645, 0.730556));
                p->push_back (PresetPoint (0.277778, 0.289256));
@@ -1046,7 +1048,7 @@ CrossfadeEditor::build_presets ()
                fade_out_presets->push_back (p);
 
                // p = new Preset ("loout.xpm");
-               p = new Preset ("Long cut", "crossfade-out-long-cut");
+               p = new Preset ("Long cut", "fadeout-long-cut");
                p->push_back (PresetPoint (0, 1));
                p->push_back (PresetPoint (0.023041, 0.697222));
                p->push_back (PresetPoint (0.0553,   0.483333));
@@ -1154,7 +1156,7 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
 
        delete _peaks_ready_connection;
        _peaks_ready_connection = 0;
-       
+
        for (uint32_t n = 0; n < nchans; ++n) {
 
                gdouble yoff = n * ht;
@@ -1207,7 +1209,7 @@ CrossfadeEditor::peaks_ready (boost::weak_ptr<AudioRegion> wr, WhichFade which)
        */
        delete _peaks_ready_connection;
        _peaks_ready_connection = 0;
-       
+
        make_waves (r, which);
 }
 
@@ -1251,16 +1253,16 @@ CrossfadeEditor::audition (Audition which)
                right_length = xfade->in()->length();
        }
 
-       PropertyList left_plist; 
-       PropertyList right_plist; 
+       PropertyList left_plist;
+       PropertyList right_plist;
+
 
-       
        left_plist.add (ARDOUR::Properties::start, left_start_offset);
        left_plist.add (ARDOUR::Properties::length, left_length);
        left_plist.add (ARDOUR::Properties::name, string ("xfade out"));
        left_plist.add (ARDOUR::Properties::layer, 0);
        left_plist.add (ARDOUR::Properties::fade_in_active, true);
-       
+
        right_plist.add (ARDOUR::Properties::start, 0);
        right_plist.add (ARDOUR::Properties::length, right_length);
        right_plist.add (ARDOUR::Properties::name, string("xfade in"));
@@ -1273,9 +1275,9 @@ CrossfadeEditor::audition (Audition which)
                left_plist.add (ARDOUR::Properties::scale_amplitude, 0.0f);
        }
 
-       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> 
+       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion>
                                                     (RegionFactory::create (xfade->out(), left_plist, false)));
-       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> 
+       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion>
                                              (RegionFactory::create (xfade->in(), right_plist, false)));
 
        // apply a 20ms declicking fade at the start and end of auditioning
@@ -1302,14 +1304,14 @@ CrossfadeEditor::audition_both ()
 void
 CrossfadeEditor::audition_left_dry ()
 {
-       PropertyList plist; 
+       PropertyList plist;
 
        plist.add (ARDOUR::Properties::start, xfade->out()->length() - xfade->length());
        plist.add (ARDOUR::Properties::length, xfade->length());
        plist.add (ARDOUR::Properties::name, string("xfade left"));
        plist.add (ARDOUR::Properties::layer, 0);
-       
-       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> 
+
+       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion>
                                             (RegionFactory::create (xfade->out(), plist, false)));
 
        _session->audition_region (left);
@@ -1324,14 +1326,14 @@ CrossfadeEditor::audition_left ()
 void
 CrossfadeEditor::audition_right_dry ()
 {
-       PropertyList plist; 
+       PropertyList plist;
 
        plist.add (ARDOUR::Properties::start, 0);
        plist.add (ARDOUR::Properties::length, xfade->length());
        plist.add (ARDOUR::Properties::name, string ("xfade right"));
        plist.add (ARDOUR::Properties::layer, 0);
 
-       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> 
+       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion>
                                              (RegionFactory::create (xfade->in(), plist, false)));
 
        _session->audition_region (right);