Patch from jdavisp3 to fix bug #1841.

[ardour.git] / gtk2_ardour / crossfade_edit.cc

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 349297f8cda83506b16d5f1a7ac323fc8877ea99..8e9c4f07dd15b9b362dce7539922e1e5e85f704d 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -48,7 +48,6 @@
 #include "canvas_impl.h"
 #include "simplerect.h"
 #include "waveview.h"
-#include "color.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -66,8 +65,8 @@ CrossfadeEditor::Presets* CrossfadeEditor::fade_out_presets = 0;
 
 CrossfadeEditor::Half::Half ()
        : line (0), 
-         normative_curve (0.0, 1.0, 1.0, true),
-         gain_curve (0.0, 2.0, 1.0, true)
+         normative_curve (Parameter(GainAutomation), 0.0, 1.0, 1.0), // FIXME: GainAutomation?
+         gain_curve (Parameter(GainAutomation), 0.0, 2.0, 1.0)
 {
 }
 
@@ -129,23 +128,23 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
        toplevel->property_x2() =  10.0;
        toplevel->property_y2() =  10.0;
        toplevel->property_fill() =  true;
-       toplevel->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorBase.get();
+       toplevel->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorBase.get();
        toplevel->property_outline_pixels() =  0;
        toplevel->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event));
        
        fade[Out].line = new ArdourCanvas::Line (*(canvas->root()));
        fade[Out].line->property_width_pixels() = 1;
-       fade[Out].line->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLine.get();
+       fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get();
                
        fade[Out].shading = new ArdourCanvas::Polygon (*(canvas->root()));
-       fade[Out].shading->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLineShading.get();
+       fade[Out].shading->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get();
 
        fade[In].line = new ArdourCanvas::Line (*(canvas->root()));
        fade[In].line->property_width_pixels() = 1;
-       fade[In].line->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLine.get();
+       fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get();
                
        fade[In].shading = new ArdourCanvas::Polygon (*(canvas->root()));
-       fade[In].shading->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLineShading.get();
+       fade[In].shading->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get();
        
        fade[In].shading->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event));
        fade[In].line->signal_event().connect (mem_fun (*this, &CrossfadeEditor::curve_event));
@@ -327,10 +326,10 @@ CrossfadeEditor::audition_state_changed (bool yn)
 }
 
 void
-CrossfadeEditor::set (const ARDOUR::Curve& curve, WhichFade which)
+CrossfadeEditor::set (const ARDOUR::AutomationList& curve, WhichFade which)
 {
        double firstx, endx;
-       ARDOUR::Curve::const_iterator the_end;
+       ARDOUR::AutomationList::const_iterator the_end;
 
        for (list<Point*>::iterator i = fade[which].points.begin(); i != fade[which].points.end(); ++i) {
                        delete *i;
@@ -350,7 +349,7 @@ CrossfadeEditor::set (const ARDOUR::Curve& curve, WhichFade which)
        firstx = (*curve.const_begin())->when;
        endx = (*the_end)->when;
 
-       for (ARDOUR::Curve::const_iterator i = curve.const_begin(); i != curve.const_end(); ++i) {
+       for (ARDOUR::AutomationList::const_iterator i = curve.const_begin(); i != curve.const_end(); ++i) {
                
                double xfract = ((*i)->when - firstx) / (endx - firstx);
                double yfract = ((*i)->value - miny) / (maxy - miny);
@@ -454,8 +453,8 @@ CrossfadeEditor::make_point ()
 
        p->box = new ArdourCanvas::SimpleRect (*(canvas->root()));
        p->box->property_fill() = true;
-       p->box->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorPointFill.get();
-       p->box->property_outline_color_rgba() = Config->canvasvar_CrossfadeEditorPointOutline.get();
+       p->box->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorPointFill.get();
+       p->box->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorPointOutline.get();
        p->box->property_outline_pixels() = 1;
 
        p->curve = fade[current].line;
@@ -644,7 +643,7 @@ CrossfadeEditor::redraw ()
        size_t npoints = (size_t) effective_width();
        float vec[npoints];
 
-       fade[current].normative_curve.get_vector (0, 1.0, vec, npoints);
+       fade[current].normative_curve.curve().get_vector (0, 1.0, vec, npoints);
        
        ArdourCanvas::Points pts;
        ArdourCanvas::Points spts;
@@ -760,13 +759,13 @@ CrossfadeEditor::apply ()
 void
 CrossfadeEditor::_apply_to (boost::shared_ptr<Crossfade> xf)
 {
-       ARDOUR::Curve& in (xf->fade_in());
-       ARDOUR::Curve& out (xf->fade_out());
+       ARDOUR::AutomationList& in (xf->fade_in());
+       ARDOUR::AutomationList& out (xf->fade_out());
 
        /* IN */
 
 
-       ARDOUR::Curve::const_iterator the_end = in.const_end();
+       ARDOUR::AutomationList::const_iterator the_end = in.const_end();
        --the_end;
 
        double firstx = (*in.begin())->when;
@@ -813,8 +812,8 @@ CrossfadeEditor::setup (boost::shared_ptr<Crossfade> xfade)
 {
        _apply_to (xfade);
        xfade->set_active (true);
-       xfade->fade_in().solve ();
-       xfade->fade_out().solve ();
+       xfade->fade_in().curve().solve ();
+       xfade->fade_out().curve().solve ();
 }
 
 void
@@ -976,15 +975,15 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf)
        if (wf == In) {
                
                for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
-                       (*i)->property_wave_color() = Config->canvasvar_SelectedCrossfadeEditorWave.get();
+                       (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
                }
 
                for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
-                       (*i)->property_wave_color() = Config->canvasvar_CrossfadeEditorWave.get();
+                       (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
                }
 
-               fade[In].line->property_fill_color_rgba() = Config->canvasvar_SelectedCrossfadeEditorLine.get();
-               fade[Out].line->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLine.get();
+               fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorLine.get();
+               fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get();
                fade[Out].shading->hide();
                fade[In].shading->show();
 
@@ -999,15 +998,15 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf)
        } else {
 
                for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
-                       (*i)->property_wave_color() = Config->canvasvar_CrossfadeEditorWave.get();
+                       (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
                }
 
                for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
-                       (*i)->property_wave_color() = Config->canvasvar_SelectedCrossfadeEditorWave.get();
+                       (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
                }
 
-               fade[Out].line->property_fill_color_rgba() = Config->canvasvar_SelectedCrossfadeEditorLine.get();
-               fade[In].line->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLine.get();
+               fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorLine.get();
+               fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get();
                fade[In].shading->hide();
                fade[Out].shading->show();
 
@@ -1049,9 +1048,9 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
        double spu;
 
        if (which == In) {
-               color = Config->canvasvar_SelectedCrossfadeEditorWave.get();
+               color = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
        } else {
-               color = Config->canvasvar_CrossfadeEditorWave.get();
+               color = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
        }
 
        ht = canvas->get_allocation().get_height() / (double) nchans;