X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fcrossfade_edit.cc;h=d6fe779bf193e3adde5aa843a00907b4609540c1;hb=6991a07902cc844b87c895aa56de613c96b88b4f;hp=c545a02b464451fe1747be91f8ac818e2ddf9470;hpb=c0e6f8e4c324c3f44613949b59acd9e864ab263d;p=ardour.git

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index c545a02b46..d6fe779bf1 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -30,6 +30,7 @@
 #include "ardour/automation_list.h"
 #include "evoral/Curve.hpp"
 #include "ardour/crossfade.h"
+#include "ardour/dB.h"
 #include "ardour/session.h"
 #include "ardour/auditioner.h"
 #include "ardour/audioplaylist.h"
@@ -49,7 +50,6 @@
 #include "crossfade_edit.h"
 #include "rgb_macros.h"
 #include "keyboard.h"
-#include "utils.h"
 #include "gui_thread.h"
 #include "actions.h"
 
@@ -135,21 +135,21 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d
 	toplevel = new ArdourCanvas::Rectangle (canvas->root());
 	toplevel->set (ArdourCanvas::Rect (0, 0, 10, 10));
 	toplevel->set_fill (true);
-	toplevel->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorBase());
+	toplevel->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorBase());
 	toplevel->set_outline (false);
 	toplevel->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event));
 
 	fade[Out].line = new ArdourCanvas::PolyLine (canvas->root());
-	fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine());
+	fade[Out].line->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorLine());
 
 	fade[Out].shading = new ArdourCanvas::Polygon (canvas->root());
-	fade[Out].shading->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLineShading());
+	fade[Out].shading->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorLineShading());
 
 	fade[In].line = new ArdourCanvas::PolyLine (canvas->root());
-	fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine());
+	fade[In].line->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorLine());
 
 	fade[In].shading = new ArdourCanvas::Polygon (canvas->root());
-	fade[In].shading->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLineShading());
+	fade[In].shading->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorLineShading());
 
 	fade[In].shading->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::canvas_event));
 	fade[In].line->Event.connect (sigc::mem_fun (*this, &CrossfadeEditor::curve_event));
@@ -463,8 +463,8 @@ CrossfadeEditor::make_point ()
 
 	p->box = new ArdourCanvas::Rectangle (canvas->root());
 	p->box->set_fill (true);
-	p->box->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointFill());
-	p->box->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointOutline());
+	p->box->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorPointFill());
+	p->box->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorPointOutline());
 
 	p->curve = fade[current].line;
 
@@ -781,7 +781,7 @@ CrossfadeEditor::apply_preset (Preset *preset)
 void
 CrossfadeEditor::apply ()
 {
-	_session->begin_reversible_command (_("Edit crossfade"));
+	the_editor().begin_reversible_command (_("Edit crossfade"));
 
 	XMLNode& before = xfade->get_state ();
 
@@ -794,7 +794,7 @@ CrossfadeEditor::apply ()
 			)
 		);
 
-	_session->commit_reversible_command ();
+	the_editor().commit_reversible_command ();
 }
 
 void
@@ -885,176 +885,168 @@ CrossfadeEditor::build_presets ()
 	/* FADE IN */
 
 	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.000000, GAIN_COEFF_SMALL));
 	p->push_back (PresetPoint (0.166667, 0.166366));
 	p->push_back (PresetPoint (0.333333, 0.332853));
 	p->push_back (PresetPoint (0.500000, 0.499459));
 	p->push_back (PresetPoint (0.666667, 0.666186));
 	p->push_back (PresetPoint (0.833333, 0.833033));
-	p->push_back (PresetPoint (1.000000, 1.000000));
+	p->push_back (PresetPoint (1.000000, GAIN_COEFF_UNITY));
 	fade_in_presets->push_back (p);
 
 	p = new Preset ("S(1)-curve", "fadein-S1");
-	p->push_back (PresetPoint (0, 0));
+	p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
 	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));
+	p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
 	fade_in_presets->push_back (p);
 
 	p = new Preset ("S(2)-curve", "fadein-S2");
-	p->push_back (PresetPoint (0.0, 0.0));
+	p->push_back (PresetPoint (0.0, GAIN_COEFF_SMALL));
 	p->push_back (PresetPoint (0.055, 0.222));
 	p->push_back (PresetPoint (0.163, 0.35));
 	p->push_back (PresetPoint (0.837, 0.678));
 	p->push_back (PresetPoint (0.945, 0.783));
-	p->push_back (PresetPoint (1.0, 1.0));
+	p->push_back (PresetPoint (1.0, GAIN_COEFF_UNITY));
 	fade_in_presets->push_back (p);
 
 	p = new Preset ("Constant power (-3dB)", "fadein-constant-power");
 
-	p->push_back (PresetPoint (0.000000, 0.000000));
+	p->push_back (PresetPoint (0.000000, GAIN_COEFF_SMALL));
 	p->push_back (PresetPoint (0.166667, 0.282192));
 	p->push_back (PresetPoint (0.333333, 0.518174));
 	p->push_back (PresetPoint (0.500000, 0.707946));
 	p->push_back (PresetPoint (0.666667, 0.851507));
 	p->push_back (PresetPoint (0.833333, 0.948859));
-	p->push_back (PresetPoint (1.000000, 1.000000));
+	p->push_back (PresetPoint (1.000000, GAIN_COEFF_UNITY));
 
 	fade_in_presets->push_back (p);
 
-	if (!Profile->get_sae()) {
-
-	  	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));
-		p->push_back (PresetPoint (0.829493, 0.233333));
-		p->push_back (PresetPoint (0.9447, 0.483333));
-		p->push_back (PresetPoint (0.976959, 0.697222));
-		p->push_back (PresetPoint (1, 1));
-		fade_in_presets->push_back (p);
-
-		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));
-		p->push_back (PresetPoint (0.725806, 0.333333));
-		p->push_back (PresetPoint (0.847926, 0.558333));
-		p->push_back (PresetPoint (0.919355, 0.730556));
-		p->push_back (PresetPoint (1, 1));
-		fade_in_presets->push_back (p);
-
-		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));
-		p->push_back (PresetPoint (0.470046, 0.886111));
-		p->push_back (PresetPoint (0.652074, 0.972222));
-		p->push_back (PresetPoint (0.771889, 0.988889));
-		p->push_back (PresetPoint (1, 1));
-		fade_in_presets->push_back (p);
-
-		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));
-		p->push_back (PresetPoint (0.152074, 0.802778));
-		p->push_back (PresetPoint (0.276498, 0.919444));
-		p->push_back (PresetPoint (0.481567, 0.980556));
-		p->push_back (PresetPoint (0.767281, 1));
-		p->push_back (PresetPoint (1, 1));
-		fade_in_presets->push_back (p);
-	}
+	p = new Preset ("Short cut", "fadein-short-cut");
+	p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
+	p->push_back (PresetPoint (0.389401, 0.0333333));
+	p->push_back (PresetPoint (0.629032, 0.0861111));
+	p->push_back (PresetPoint (0.829493, 0.233333));
+	p->push_back (PresetPoint (0.9447, 0.483333));
+	p->push_back (PresetPoint (0.976959, 0.697222));
+	p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
+	fade_in_presets->push_back (p);
+
+	p = new Preset ("Slow cut", "fadein-slow-cut");
+	p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
+	p->push_back (PresetPoint (0.304147, 0.0694444));
+	p->push_back (PresetPoint (0.529954, 0.152778));
+	p->push_back (PresetPoint (0.725806, 0.333333));
+	p->push_back (PresetPoint (0.847926, 0.558333));
+	p->push_back (PresetPoint (0.919355, 0.730556));
+	p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
+	fade_in_presets->push_back (p);
+
+	p = new Preset ("Fast cut", "fadein-fast-cut");
+	p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
+	p->push_back (PresetPoint (0.0737327, 0.308333));
+	p->push_back (PresetPoint (0.246544, 0.658333));
+	p->push_back (PresetPoint (0.470046, 0.886111));
+	p->push_back (PresetPoint (0.652074, 0.972222));
+	p->push_back (PresetPoint (0.771889, 0.988889));
+	p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
+	fade_in_presets->push_back (p);
+
+	p = new Preset ("Long cut", "fadein-long-cut");
+	p->push_back (PresetPoint (0, GAIN_COEFF_SMALL));
+	p->push_back (PresetPoint (0.0207373, 0.197222));
+	p->push_back (PresetPoint (0.0645161, 0.525));
+	p->push_back (PresetPoint (0.152074, 0.802778));
+	p->push_back (PresetPoint (0.276498, 0.919444));
+	p->push_back (PresetPoint (0.481567, 0.980556));
+	p->push_back (PresetPoint (0.767281, 1));
+	p->push_back (PresetPoint (1, GAIN_COEFF_UNITY));
+	fade_in_presets->push_back (p);
 
 	/* FADE OUT */
 
 	// p = new Preset ("regout.xpm");
 	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.000000, GAIN_COEFF_UNITY));
 	p->push_back (PresetPoint (0.166667, 0.833033));
 	p->push_back (PresetPoint (0.333333, 0.666186));
 	p->push_back (PresetPoint (0.500000, 0.499459));
 	p->push_back (PresetPoint (0.666667, 0.332853));
 	p->push_back (PresetPoint (0.833333, 0.166366));
-	p->push_back (PresetPoint (1.000000, 0.000000));
+	p->push_back (PresetPoint (1.000000, GAIN_COEFF_SMALL));
 	fade_out_presets->push_back (p);
 
 	p = new Preset ("S(1)-Curve", "fadeout-S1");
-	p->push_back (PresetPoint (0, 1));
+	p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
 	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));
+	p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
 	fade_out_presets->push_back (p);
 
 	p = new Preset ("S(2)-Curve", "fadeout-S2");
-	p->push_back (PresetPoint (0.0, 1.0));
+	p->push_back (PresetPoint (0.0, GAIN_COEFF_UNITY));
 	p->push_back (PresetPoint (0.163, 0.678));
 	p->push_back (PresetPoint (0.055, 0.783));
 	p->push_back (PresetPoint (0.837, 0.35));
 	p->push_back (PresetPoint (0.945, 0.222));
-	p->push_back (PresetPoint (1.0, 0.0));
+	p->push_back (PresetPoint (1.0, GAIN_COEFF_SMALL));
 	fade_out_presets->push_back (p);
 
 	// p = new Preset ("linout.xpm");
 	p = new Preset ("Constant power (-3dB cut)", "fadeout-constant-power");
-	p->push_back (PresetPoint (0.000000, 1.000000));
+	p->push_back (PresetPoint (0.000000, GAIN_COEFF_UNITY));
 	p->push_back (PresetPoint (0.166667, 0.948859));
 	p->push_back (PresetPoint (0.333333, 0.851507));
 	p->push_back (PresetPoint (0.500000, 0.707946));
 	p->push_back (PresetPoint (0.666667, 0.518174));
 	p->push_back (PresetPoint (0.833333, 0.282192));
-	p->push_back (PresetPoint (1.000000, 0.000000));
+	p->push_back (PresetPoint (1.000000, GAIN_COEFF_SMALL));
 	fade_out_presets->push_back (p);
 
-	if (!Profile->get_sae()) {
-		// p = new Preset ("hiout.xpm");
-		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));
-		p->push_back (PresetPoint (0.759259, 0.931129));
-		p->push_back (PresetPoint (0.918981, 0.68595));
-		p->push_back (PresetPoint (0.976852, 0.22865));
-		p->push_back (PresetPoint (1, 0));
-		fade_out_presets->push_back (p);
-
-		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));
-		p->push_back (PresetPoint (0.529954, 0.886111));
-		p->push_back (PresetPoint (0.753456, 0.658333));
-		p->push_back (PresetPoint (0.9262673, 0.308333));
-		p->push_back (PresetPoint (1, 0));
-		fade_out_presets->push_back (p);
-
-		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));
-		p->push_back (PresetPoint (0.470046, 0.152778));
-		p->push_back (PresetPoint (0.695853, 0.0694444));
-		p->push_back (PresetPoint (1, 0));
-		fade_out_presets->push_back (p);
-
-		// p = new Preset ("loout.xpm");
-		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));
-		p->push_back (PresetPoint (0.170507, 0.233333));
-		p->push_back (PresetPoint (0.370968, 0.0861111));
-		p->push_back (PresetPoint (0.610599, 0.0333333));
-		p->push_back (PresetPoint (1, 0));
-		fade_out_presets->push_back (p);
+	// p = new Preset ("hiout.xpm");
+	p = new Preset ("Short cut", "fadeout-short-cut");
+	p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
+	p->push_back (PresetPoint (0.305556, GAIN_COEFF_UNITY));
+	p->push_back (PresetPoint (0.548611, 0.991736));
+	p->push_back (PresetPoint (0.759259, 0.931129));
+	p->push_back (PresetPoint (0.918981, 0.68595));
+	p->push_back (PresetPoint (0.976852, 0.22865));
+	p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
+	fade_out_presets->push_back (p);
 
-	}
+	p = new Preset ("Slow cut", "fadeout-slow-cut");
+	p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
+	p->push_back (PresetPoint (0.228111, 0.988889));
+	p->push_back (PresetPoint (0.347926, 0.972222));
+	p->push_back (PresetPoint (0.529954, 0.886111));
+	p->push_back (PresetPoint (0.753456, 0.658333));
+	p->push_back (PresetPoint (0.9262673, 0.308333));
+	p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
+	fade_out_presets->push_back (p);
+
+	p = new Preset ("Fast cut", "fadeout-fast-cut");
+	p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
+	p->push_back (PresetPoint (0.080645, 0.730556));
+	p->push_back (PresetPoint (0.277778, 0.289256));
+	p->push_back (PresetPoint (0.470046, 0.152778));
+	p->push_back (PresetPoint (0.695853, 0.0694444));
+	p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
+	fade_out_presets->push_back (p);
+
+	// p = new Preset ("loout.xpm");
+	p = new Preset ("Long cut", "fadeout-long-cut");
+	p->push_back (PresetPoint (0, GAIN_COEFF_UNITY));
+	p->push_back (PresetPoint (0.023041, 0.697222));
+	p->push_back (PresetPoint (0.0553,   0.483333));
+	p->push_back (PresetPoint (0.170507, 0.233333));
+	p->push_back (PresetPoint (0.370968, 0.0861111));
+	p->push_back (PresetPoint (0.610599, 0.0333333));
+	p->push_back (PresetPoint (1, GAIN_COEFF_SMALL));
+	fade_out_presets->push_back (p);
 }
 
 void
@@ -1065,17 +1057,17 @@ 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)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave());
-			(*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave());
+			(*i)->set_outline_color (UIConfiguration::instance().get_SelectedCrossfadeEditorWave());
+			(*i)->set_fill_color (UIConfiguration::instance().get_SelectedCrossfadeEditorWave());
 		}
 
 		for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
-			(*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave());
-			(*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave());
+			(*i)->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorWave());
+			(*i)->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorWave());
 		}
 
-		fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorLine());
-		fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine());
+		fade[In].line->set_outline_color (UIConfiguration::instance().get_SelectedCrossfadeEditorLine());
+		fade[Out].line->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorLine());
 		fade[Out].shading->hide();
 		fade[In].shading->show();
 
@@ -1090,17 +1082,17 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf)
 	} else {
 
 		for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
-			(*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave());
-			(*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave());
+			(*i)->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorWave());
+			(*i)->set_fill_color (UIConfiguration::instance().get_CrossfadeEditorWave());
 		}
 
 		for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
-			(*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave());
-			(*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave());
+			(*i)->set_outline_color (UIConfiguration::instance().get_SelectedCrossfadeEditorWave());
+			(*i)->set_fill_color (UIConfiguration::instance().get_SelectedCrossfadeEditorWave());
 		}
 
-		fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorLine());
-		fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine());
+		fade[Out].line->set_outline_color (UIConfiguration::instance().get_SelectedCrossfadeEditorLine());
+		fade[In].line->set_outline_color (UIConfiguration::instance().get_CrossfadeEditorLine());
 		fade[In].shading->hide();
 		fade[Out].shading->show();
 
@@ -1142,9 +1134,9 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
 	double spu;
 
 	if (which == In) {
-		color = ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave();
+		color = UIConfiguration::instance().get_SelectedCrossfadeEditorWave();
 	} else {
-		color = ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave();
+		color = UIConfiguration::instance().get_CrossfadeEditorWave();
 	}
 
 	ht = canvas->get_allocation().get_height() / (double) nchans;