Remove declaration of unused and undefined method in Session class

[ardour.git] / gtk2_ardour / crossfade_edit.cc

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 0940f91b4fbe817511523984ceb28184e754ab10..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() = color_map[cCrossfadeEditorBase];
+       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() = color_map[cCrossfadeEditorLine];
+       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() = color_map[cCrossfadeEditorLineShading];
+       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() = color_map[cCrossfadeEditorLine];
+       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() = color_map[cCrossfadeEditorLineShading];
+       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));
@@ -193,7 +192,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
 
        for (list<Preset*>::iterator i = fade_in_presets->begin(); i != fade_in_presets->end(); ++i) {
 
-               pxmap = manage (new Image (get_xpm((*i)->xpm)));
+               pxmap = manage (new Image (::get_icon ((*i)->image_name)));
                pbutton = manage (new Button);
                pbutton->add (*pxmap);
                pbutton->set_name ("CrossfadeEditButton");
@@ -214,7 +213,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
 
        for (list<Preset*>::iterator i = fade_out_presets->begin(); i != fade_out_presets->end(); ++i) {
 
-               pxmap = manage (new Image (get_xpm((*i)->xpm)));
+               pxmap = manage (new Image (::get_icon ((*i)->image_name)));
                pbutton = manage (new Button);
                pbutton->add (*pxmap);
                pbutton->set_name ("CrossfadeEditButton");
@@ -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() = color_map[cCrossfadeEditorPointFill];
-       p->box->property_outline_color_rgba() = color_map[cCrossfadeEditorPointOutline];
+       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;
@@ -721,6 +720,20 @@ CrossfadeEditor::redraw ()
 void
 CrossfadeEditor::apply_preset (Preset *preset)
 {
+  
+       WhichFade wf =  find(fade_in_presets->begin(), fade_in_presets->end(), preset) != fade_in_presets->end() ? In : Out;
+       
+       if (current != wf) {
+         
+               if (wf == In) {
+                       select_in_button.clicked();
+               } else {
+                       select_out_button.clicked();
+               }
+               
+               curve_select_clicked (wf);
+       }  
+       
        for (list<Point*>::iterator i = fade[current].points.begin(); i != fade[current].points.end(); ++i) {
                delete *i;
        }
@@ -746,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;
@@ -799,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
@@ -820,6 +833,8 @@ CrossfadeEditor::reset ()
 {
        set (xfade->fade_in(),  In);
        set (xfade->fade_out(), Out);
+
+        curve_select_clicked (current);
 }
 
 void
@@ -831,7 +846,8 @@ CrossfadeEditor::build_presets ()
        fade_out_presets = new Presets;
 
        /* FADE OUT */
-       p = new Preset ("hiin.xpm");
+       // p = new Preset ("hiin.xpm");
+       p = new Preset ("crossfade_in_fast-cut");
        p->push_back (PresetPoint (0, 0));
        p->push_back (PresetPoint (0.0207373, 0.197222));
        p->push_back (PresetPoint (0.0645161, 0.525));
@@ -842,7 +858,8 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 1));
        fade_in_presets->push_back (p);
        
-       p = new Preset ("loin.xpm");
+       // p = new Preset ("loin.xpm");
+       p = new Preset ("crossfade_in_transition");
        p->push_back (PresetPoint (0, 0));
        p->push_back (PresetPoint (0.389401, 0.0333333));
        p->push_back (PresetPoint (0.629032, 0.0861111));
@@ -852,7 +869,8 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 1));
        fade_in_presets->push_back (p);
 
-       p = new Preset ("regin.xpm");
+       // p = new Preset ("regin.xpm");
+       p = new Preset ("crossfade_in_constant");
        p->push_back (PresetPoint (0, 0));
        p->push_back (PresetPoint (0.0737327, 0.308333));
        p->push_back (PresetPoint (0.246544, 0.658333));
@@ -862,7 +880,8 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 1));
        fade_in_presets->push_back (p);
 
-       p = new Preset ("regin2.xpm");
+       // p = new Preset ("regin2.xpm");
+       p = new Preset ("crossfade_in_slow-cut");
        p->push_back (PresetPoint (0, 0));
        p->push_back (PresetPoint (0.304147, 0.0694444));
        p->push_back (PresetPoint (0.529954, 0.152778));
@@ -872,14 +891,25 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 1));
        fade_in_presets->push_back (p);
 
-       p = new Preset ("linin.xpm");
+       // p = new Preset ("linin.xpm");
+       p = new Preset ("crossfade_in_dipped");
        p->push_back (PresetPoint (0, 0));
        p->push_back (PresetPoint (1, 1));
        fade_in_presets->push_back (p);
 
+       p = new Preset ("crossfade_in_default");
+       p->push_back (PresetPoint (0, 0));
+       p->push_back (PresetPoint (0.1, 0.01));
+       p->push_back (PresetPoint (0.2, 0.03));
+       p->push_back (PresetPoint (0.8, 0.97));
+       p->push_back (PresetPoint (0.9, 0.99));
+       p->push_back (PresetPoint (1, 1));
+       fade_in_presets->push_back (p);
+       
        /* FADE OUT */
 
-       p = new Preset ("hiout.xpm");
+       // p = new Preset ("hiout.xpm");
+       p = new Preset ("crossfade_out_fast-cut");
        p->push_back (PresetPoint (0, 1));
        p->push_back (PresetPoint (0.305556, 1));
        p->push_back (PresetPoint (0.548611, 0.991736));
@@ -889,7 +919,8 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 0));
        fade_out_presets->push_back (p);
        
-       p = new Preset ("regout.xpm");
+       // p = new Preset ("regout.xpm");
+       p = new Preset ("crossfade_out_constant");
        p->push_back (PresetPoint (0, 1));
        p->push_back (PresetPoint (0.228111, 0.988889));
        p->push_back (PresetPoint (0.347926, 0.972222));
@@ -899,7 +930,8 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 0));
        fade_out_presets->push_back (p);
 
-       p = new Preset ("loout.xpm");
+       // p = new Preset ("loout.xpm");
+       p = new Preset ("crossfade_out_transition");
        p->push_back (PresetPoint (0, 1));
        p->push_back (PresetPoint (0.023041, 0.697222));
        p->push_back (PresetPoint (0.0553,   0.483333));
@@ -909,7 +941,8 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 0));
        fade_out_presets->push_back (p);
 
-       p = new Preset ("regout2.xpm");
+       // p = new Preset ("regout2.xpm");
+       p = new Preset ("crossfade_out_slow-fade");
        p->push_back (PresetPoint (0, 1));
        p->push_back (PresetPoint (0.080645, 0.730556));
        p->push_back (PresetPoint (0.277778, 0.289256));
@@ -918,8 +951,18 @@ CrossfadeEditor::build_presets ()
        p->push_back (PresetPoint (1, 0));
        fade_out_presets->push_back (p);
 
-       p = new Preset ("linout.xpm");
+       // p = new Preset ("linout.xpm");
+       p = new Preset ("crossfade_out_dipped");
+       p->push_back (PresetPoint (0, 1));
+       p->push_back (PresetPoint (1, 0));
+       fade_out_presets->push_back (p);
+       
+       p = new Preset ("crossfade_out_default");
        p->push_back (PresetPoint (0, 1));
+       p->push_back (PresetPoint (0.1, 0.99));
+       p->push_back (PresetPoint (0.2, 0.97));
+       p->push_back (PresetPoint (0.8, 0.03));
+       p->push_back (PresetPoint (0.9, 0.01));
        p->push_back (PresetPoint (1, 0));
        fade_out_presets->push_back (p);
 }
@@ -932,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() = color_map[cSelectedCrossfadeEditorWave];
+                       (*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() = color_map[cCrossfadeEditorWave];
+                       (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
                }
 
-               fade[In].line->property_fill_color_rgba() = color_map[cSelectedCrossfadeEditorLine];
-               fade[Out].line->property_fill_color_rgba() = color_map[cCrossfadeEditorLine];
+               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();
 
@@ -952,26 +995,18 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf)
                        (*i)->box->show ();
                }
 
-               for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
-                       (*i)->set_sensitive (false);
-               }
-
-               for (vector<Button*>::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) {
-                       (*i)->set_sensitive (true);
-               }
-
        } else {
 
                for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
-                       (*i)->property_wave_color() = color_map[cCrossfadeEditorWave];
+                       (*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() = color_map[cSelectedCrossfadeEditorWave];
+                       (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
                }
 
-               fade[Out].line->property_fill_color_rgba() = color_map[cSelectedCrossfadeEditorLine];
-               fade[In].line->property_fill_color_rgba() = color_map[cCrossfadeEditorLine];
+               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();
 
@@ -983,14 +1018,6 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf)
                        (*i)->box->show();
                }
 
-               for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
-                       (*i)->set_sensitive (true);
-               }
-
-               for (vector<Button*>::iterator i = fade_in_buttons.begin(); i != fade_in_buttons.end(); ++i) {
-                       (*i)->set_sensitive (false);
-               }
-
        }
 }
 
@@ -1021,9 +1048,9 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
        double spu;
 
        if (which == In) {
-               color = color_map[cSelectedCrossfadeEditorWave];
+               color = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
        } else {
-               color = color_map[cCrossfadeEditorWave];
+               color = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
        }
 
        ht = canvas->get_allocation().get_height() / (double) nchans;
@@ -1033,8 +1060,7 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
                
                gdouble yoff = n * ht;
                
-               if (region->source(n)->peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
-                       
+               if (region->audio_source(n)->peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
                        WaveView* waveview = new WaveView (*(canvas->root()));
 
                        waveview->property_data_src() = region.get();