Added support for exporting mp4 chapter marks

[ardour.git] / gtk2_ardour / crossfade_edit.cc

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 214ba7fb067ace0bb9d1c848ba6e159562a886fc..976ca8ff9e8539d88dff159e60b5d7612585cd0b 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -49,7 +49,6 @@
 #include "crossfade_edit.h"
 #include "rgb_macros.h"
 #include "keyboard.h"
-#include "utils.h"
 #include "gui_thread.h"
 #include "actions.h"
 
@@ -105,7 +104,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,21 +134,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 (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->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));
@@ -464,8 +462,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 (ARDOUR_UI::config()->get_CrossfadeEditorPointFill());
+       p->box->set_outline_color (ARDOUR_UI::config()->get_CrossfadeEditorPointOutline());
 
        p->curve = fade[current].line;
 
@@ -782,7 +780,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 ();
 
@@ -795,7 +793,7 @@ CrossfadeEditor::apply ()
                        )
                );
 
-       _session->commit_reversible_command ();
+       the_editor().commit_reversible_command ();
 }
 
 void
@@ -1066,17 +1064,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 (ARDOUR_UI::config()->get_SelectedCrossfadeEditorWave());
+                       (*i)->set_fill_color (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->get_CrossfadeEditorWave());
+                       (*i)->set_fill_color (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->get_SelectedCrossfadeEditorLine());
+               fade[Out].line->set_outline_color (ARDOUR_UI::config()->get_CrossfadeEditorLine());
                fade[Out].shading->hide();
                fade[In].shading->show();
 
@@ -1091,17 +1089,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 (ARDOUR_UI::config()->get_CrossfadeEditorWave());
+                       (*i)->set_fill_color (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->get_SelectedCrossfadeEditorWave());
+                       (*i)->set_fill_color (ARDOUR_UI::config()->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 (ARDOUR_UI::config()->get_SelectedCrossfadeEditorLine());
+               fade[In].line->set_outline_color (ARDOUR_UI::config()->get_CrossfadeEditorLine());
                fade[In].shading->hide();
                fade[Out].shading->show();
 
@@ -1143,9 +1141,9 @@ CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade wh
        double spu;
 
        if (which == In) {
-               color = ARDOUR_UI::config()->get_canvasvar_SelectedCrossfadeEditorWave();
+               color = ARDOUR_UI::config()->get_SelectedCrossfadeEditorWave();
        } else {
-               color = ARDOUR_UI::config()->get_canvasvar_CrossfadeEditorWave();
+               color = ARDOUR_UI::config()->get_CrossfadeEditorWave();
        }
 
        ht = canvas->get_allocation().get_height() / (double) nchans;