next modifier, and remove color 102 since nothing uses it

[ardour.git] / gtk2_ardour / audio_region_view.cc

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 0a2222dedd814f334a65bf6ae6d8c5b82e64dab5..8a146520ec9a96e458e2d7e8bd7ae2596fc2dc36 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -72,7 +72,6 @@ using namespace PBD;
 using namespace Editing;
 using namespace ArdourCanvas;
 
-static const int32_t sync_mark_width = 9;
 static double const handle_size = 10; /* height of fade handles */
 
 AudioRegionView::AudioRegionView (ArdourCanvas::Container *parent, RouteTimeAxisView &tv, boost::shared_ptr<AudioRegion> r, double spu,
@@ -154,28 +153,28 @@ AudioRegionView::init (bool wfd)
                fade_in_handle = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in handle for %1", region()->name()));
                fade_in_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
-               fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
+               fade_in_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
                fade_in_handle->set_data ("regionview", this);
                fade_in_handle->hide ();
 
                fade_out_handle = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out handle for %1", region()->name()));
                fade_out_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
-               fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
+               fade_out_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
                fade_out_handle->set_data ("regionview", this);
                fade_out_handle->hide ();
 
                fade_in_trim_handle = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in trim handle for %1", region()->name()));
                fade_in_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
-               fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
+               fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
                fade_in_trim_handle->set_data ("regionview", this);
                fade_in_trim_handle->hide ();
 
                fade_out_trim_handle = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out trim handle for %1", region()->name()));
                fade_out_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
-               fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
+               fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
                fade_out_trim_handle->set_data ("regionview", this);
                fade_out_trim_handle->hide ();
        }
@@ -316,7 +315,7 @@ AudioRegionView::fade_in_active_changed ()
                if (audio_region()->fade_in_active()) {
                        start_xfade_rect->set_fill (false);
                } else {
-                       start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade());
+                       start_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade"));
                        start_xfade_rect->set_fill (true);
                }
        }
@@ -329,7 +328,7 @@ AudioRegionView::fade_out_active_changed ()
                if (audio_region()->fade_out_active()) {
                        end_xfade_rect->set_fill (false);
                } else {        
-                       end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade());
+                       end_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade"));
                        end_xfade_rect->set_fill (true);
                }
        }
@@ -738,14 +737,14 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, frame
        if (!start_xfade_curve) {
                start_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::Start);
                CANVAS_DEBUG_NAME (start_xfade_curve, string_compose ("xfade start out line for %1", region()->name()));
-               start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
-               start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+               start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+               start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
                start_xfade_curve->set_ignore_events (true);
        }
        if (!start_xfade_rect) {
                start_xfade_rect = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (start_xfade_rect, string_compose ("xfade start rect for %1", region()->name()));
-               start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+               start_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
                start_xfade_rect->set_fill (false);
                start_xfade_rect->set_outline (false);
                start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this));
@@ -827,15 +826,15 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
        if (!end_xfade_curve) {
                end_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::End);
                CANVAS_DEBUG_NAME (end_xfade_curve, string_compose ("xfade end out line for %1", region()->name()));
-               end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
-               end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+               end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+               end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
                end_xfade_curve->set_ignore_events (true);
        }
 
        if (!end_xfade_rect) {
                end_xfade_rect = new ArdourCanvas::Rectangle (group);
                CANVAS_DEBUG_NAME (end_xfade_rect, string_compose ("xfade end rect for %1", region()->name()));
-               end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+               end_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
                end_xfade_rect->set_fill (false);
                end_xfade_rect->set_outline (false);
                end_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_end_xfade_event), end_xfade_rect, this));
@@ -988,26 +987,26 @@ AudioRegionView::set_colors ()
 
        if (gain_line) {
                gain_line->set_line_color (audio_region()->envelope_active() ? 
-                                          ARDOUR_UI::config()->get_GainLine() : 
-                                          ARDOUR_UI::config()->get_GainLineInactive());
+                                          ARDOUR_UI::config()->color ("gain line") : 
+                                          ARDOUR_UI::config()->color ("gain line inactive"));
        }
 
        set_waveform_colors ();
 
        if (start_xfade_curve) {
-               start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
-               start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+               start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+               start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
        }
        if (end_xfade_curve) {
-               end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
-               end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+               end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+               end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
        }
 
        if (start_xfade_rect) {
-               start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+               start_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
        }
        if (end_xfade_rect) {
-               end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+               end_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
        }
 }
 
@@ -1051,7 +1050,7 @@ AudioRegionView::update_envelope_visibility ()
                return;
        }
 
-       if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseGain || trackview.editor().current_mouse_mode() == Editing::MouseRange ) {
+       if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseRange ) {
                gain_line->add_visibility (AutomationLine::Line);
        } else {
                gain_line->hide ();
@@ -1368,8 +1367,8 @@ AudioRegionView::envelope_active_changed ()
 {
        if (gain_line) {
                gain_line->set_line_color (audio_region()->envelope_active() ? 
-                                          ARDOUR_UI::config()->get_GainLine() : 
-                                          ARDOUR_UI::config()->get_GainLineInactive());
+                                          ARDOUR_UI::config()->color ("gain line") : 
+                                          ARDOUR_UI::config()->color ("gain line inactive"));
                update_envelope_visibility ();
        }
 }
@@ -1400,30 +1399,30 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& wave
 {
        ArdourCanvas::Color fill;
        ArdourCanvas::Color outline;
-       ArdourCanvas::Color clip = ARDOUR_UI::config()->get_WaveFormClip();
-       ArdourCanvas::Color zero = ARDOUR_UI::config()->get_ZeroLine();
+       ArdourCanvas::Color clip = ARDOUR_UI::config()->color ("clipped waveform");
+       ArdourCanvas::Color zero = ARDOUR_UI::config()->color ("zero line");
 
        if (_selected) {
                if (_region->muted()) {
                        /* hide outline with zero alpha */
-                       outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveForm(), 0);
-                       fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveFormFill(), MUTED_ALPHA);
+                       outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("selected waveform outline"), 0);
+                       fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("selected waveform fill"), MUTED_ALPHA);
                } else {
-                       outline = ARDOUR_UI::config()->get_SelectedWaveForm();
-                       fill = ARDOUR_UI::config()->get_SelectedWaveFormFill();
+                       outline = ARDOUR_UI::config()->color ("selected waveform outline");
+                       fill = ARDOUR_UI::config()->color ("selected waveform fill");
                }
        } else {
                if (_recregion) {
-                       outline = ARDOUR_UI::config()->get_RecWaveForm();
-                       fill = ARDOUR_UI::config()->get_RecWaveFormFill();
+                       outline = ARDOUR_UI::config()->color ("recording waveform outline");
+                       fill = ARDOUR_UI::config()->color ("recording waveform fill");
                } else {
                        if (_region->muted()) {
                                /* hide outline with zero alpha */
-                               outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveForm(), 0);   
-                               fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveFormFill(), MUTED_ALPHA);
+                               outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("waveform outline"), 0);       
+                               fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("waveform fill"), MUTED_ALPHA);
                        } else {
-                               outline = ARDOUR_UI::config()->get_WaveForm();
-                               fill = ARDOUR_UI::config()->get_WaveFormFill();
+                               outline = ARDOUR_UI::config()->color ("waveform outline");
+                               fill = ARDOUR_UI::config()->color ("waveform fill");
                        }
                }
        }