build ardour3_ui_default.conf at build time, to allow font substitutions to be done...

[ardour.git] / gtk2_ardour / crossfade_edit.cc

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 1db0438729a2fef753e4dc7d2156f7da0b837a41..c545a02b464451fe1747be91f8ac818e2ddf9470 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -105,7 +105,6 @@ CrossfadeEditor::CrossfadeEditor (Session* s, boost::shared_ptr<Crossfade> xf, d
 
        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());
 
@@ -136,23 +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()->canvasvar_CrossfadeEditorBase.get());
+       toplevel->set_fill_color (ARDOUR_UI::config()->get_canvasvar_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_width (1);
-       fade[Out].line->set_outline_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get());
+       fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine());
 
        fade[Out].shading = new ArdourCanvas::Polygon (canvas->root());
-       fade[Out].shading->set_fill_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get());
+       fade[Out].shading->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLineShading());
 
        fade[In].line = new ArdourCanvas::PolyLine (canvas->root());
-       fade[In].line->set_outline_width (1);
-       fade[In].line->set_outline_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get());
+       fade[In].line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorLine());
 
        fade[In].shading = new ArdourCanvas::Polygon (canvas->root());
-       fade[In].shading->set_fill_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get());
+       fade[In].shading->set_fill_color (ARDOUR_UI::config()->get_canvasvar_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));
@@ -466,9 +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()->canvasvar_CrossfadeEditorPointFill.get());
-       p->box->set_outline_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorPointOutline.get());
-       p->box->set_outline_width (1);
+       p->box->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointFill());
+       p->box->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorPointOutline());
 
        p->curve = fade[current].line;
 
@@ -624,7 +620,7 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& /*alloc*/)
 
                (*i)->set_y_position (yoff);
                (*i)->set_height (ht);
-               (*i)->set_frames_per_pixel (spu);
+               (*i)->set_samples_per_pixel (spu);
        }
 
        ht = canvas->get_allocation().get_height() / xfade->out()->n_channels();
@@ -636,7 +632,7 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& /*alloc*/)
 
                (*i)->set_y_position (yoff);
                (*i)->set_height (ht);
-               (*i)->set_frames_per_pixel (spu);
+               (*i)->set_samples_per_pixel (spu);
        }
 
 }
@@ -1069,17 +1065,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()->canvasvar_SelectedCrossfadeEditorWave.get());
-                       (*i)->set_fill_color (ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get());
+                       (*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave());
+                       (*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave());
                }
 
                for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
-                       (*i)->set_outline_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get());
-                       (*i)->set_fill_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get());
+                       (*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave());
+                       (*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave());
                }
 
-               fade[In].line->set_outline_color (ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorLine.get());
-               fade[Out].line->set_outline_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get());
+               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[Out].shading->hide();
                fade[In].shading->show();
 
@@ -1094,17 +1090,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()->canvasvar_CrossfadeEditorWave.get());
-                       (*i)->set_fill_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get());
+                       (*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave());
+                       (*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave());
                }
 
                for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
-                       (*i)->set_outline_color (ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get());
-                       (*i)->set_fill_color (ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get());
+                       (*i)->set_outline_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave());
+                       (*i)->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave());
                }
 
-               fade[Out].line->set_outline_color (ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorLine.get());
-               fade[In].line->set_outline_color (ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get());
+               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[In].shading->hide();
                fade[Out].shading->show();
 
@@ -1146,9 +1142,9 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
        double spu;
 
        if (which == In) {
-               color = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
+               color = ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave();
        } else {
-               color = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
+               color = ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave();
        }
 
        ht = canvas->get_allocation().get_height() / (double) nchans;
@@ -1170,14 +1166,12 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
                        waveview->set_x_position (canvas_border);
                        waveview->set_y_position (yoff);
                        waveview->set_height (ht);
-                       waveview->set_frames_per_pixel (spu);
+                       waveview->set_samples_per_pixel (spu);
                        waveview->property_amplitude_above_axis() = 2.0;
                        waveview->set_outline_color (color);
                        waveview->set_fill_color (color);
 
-                       if (which == In) {
-                               waveview->set_region_start (region->start());
-                       } else {
+                       if (which != In) {
                                waveview->set_region_start (region->start() + region->length() - xfade->length());
                        }