remove "canvasvar_" from all functions related to obtaining values from ARDOUR_UI...
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 22 Oct 2014 02:55:08 +0000 (22:55 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 22 Oct 2014 02:58:58 +0000 (22:58 -0400)
39 files changed:
gtk2_ardour/audio_region_view.cc
gtk2_ardour/audio_streamview.cc
gtk2_ardour/automation_line.cc
gtk2_ardour/automation_streamview.cc
gtk2_ardour/automation_time_axis.cc
gtk2_ardour/canvas_patch_change.cc
gtk2_ardour/canvas_vars.h
gtk2_ardour/control_point.cc
gtk2_ardour/crossfade_edit.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor_canvas.cc
gtk2_ardour/editor_drag.cc
gtk2_ardour/editor_group_tabs.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_rulers.cc
gtk2_ardour/editor_tempodisplay.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/generic_pluginui.cc
gtk2_ardour/ghostregion.cc
gtk2_ardour/level_meter.cc
gtk2_ardour/marker.cc
gtk2_ardour/meter_patterns.cc
gtk2_ardour/midi_region_view.cc
gtk2_ardour/midi_streamview.cc
gtk2_ardour/mixer_group_tabs.cc
gtk2_ardour/mono_panner.cc
gtk2_ardour/note_base.cc
gtk2_ardour/note_base.h
gtk2_ardour/patch_change.cc
gtk2_ardour/region_view.cc
gtk2_ardour/route_time_axis.cc
gtk2_ardour/shuttle_control.cc
gtk2_ardour/stereo_panner.cc
gtk2_ardour/sys_ex.cc
gtk2_ardour/tempo_lines.cc
gtk2_ardour/time_axis_view.cc
gtk2_ardour/time_axis_view_item.cc
gtk2_ardour/verbose_cursor.cc
waf

index da6aeff7bfb08cba5c438856de1a913c9ceeecef..ced48920e0df41dc8297b8c271de96fe9f212b5b 100644 (file)
@@ -153,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_canvasvar_InactiveFadeHandle());
+               fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
                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_canvasvar_InactiveFadeHandle());
+               fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
                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_canvasvar_InactiveFadeHandle());
+               fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
                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_canvasvar_InactiveFadeHandle());
+               fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
                fade_out_trim_handle->set_data ("regionview", this);
                fade_out_trim_handle->hide ();
        }
@@ -315,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_canvasvar_InactiveCrossfade());
+                       start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade());
                        start_xfade_rect->set_fill (true);
                }
        }
@@ -328,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_canvasvar_InactiveCrossfade());
+                       end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade());
                        end_xfade_rect->set_fill (true);
                }
        }
@@ -736,14 +736,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_canvasvar_ActiveCrossfade());
-               start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+               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_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_canvasvar_CrossfadeLine());
+               start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
                start_xfade_rect->set_fill (false);
                start_xfade_rect->set_outline (false);
                start_xfade_rect->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::RIGHT));
@@ -827,15 +827,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_canvasvar_ActiveCrossfade());
-               end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+               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_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_canvasvar_CrossfadeLine());
+               end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
                end_xfade_rect->set_fill (false);
                end_xfade_rect->set_outline (false);
                end_xfade_rect->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT));
@@ -990,26 +990,26 @@ AudioRegionView::set_colors ()
 
        if (gain_line) {
                gain_line->set_line_color (audio_region()->envelope_active() ? 
-                                          ARDOUR_UI::config()->get_canvasvar_GainLine() : 
-                                          ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
+                                          ARDOUR_UI::config()->get_GainLine() : 
+                                          ARDOUR_UI::config()->get_GainLineInactive());
        }
 
        set_waveform_colors ();
 
        if (start_xfade_curve) {
-               start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
-               start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+               start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
+               start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
        }
        if (end_xfade_curve) {
-               end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
-               end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+               end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
+               end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
        }
 
        if (start_xfade_rect) {
-               start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+               start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
        }
        if (end_xfade_rect) {
-               end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+               end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
        }
 }
 
@@ -1370,8 +1370,8 @@ AudioRegionView::envelope_active_changed ()
 {
        if (gain_line) {
                gain_line->set_line_color (audio_region()->envelope_active() ? 
-                                          ARDOUR_UI::config()->get_canvasvar_GainLine() : 
-                                          ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
+                                          ARDOUR_UI::config()->get_GainLine() : 
+                                          ARDOUR_UI::config()->get_GainLineInactive());
                update_envelope_visibility ();
        }
 }
@@ -1402,30 +1402,30 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& wave
 {
        ArdourCanvas::Color fill;
        ArdourCanvas::Color outline;
-       ArdourCanvas::Color clip = ARDOUR_UI::config()->get_canvasvar_WaveFormClip();
-       ArdourCanvas::Color zero = ARDOUR_UI::config()->get_canvasvar_ZeroLine();
+       ArdourCanvas::Color clip = ARDOUR_UI::config()->get_WaveFormClip();
+       ArdourCanvas::Color zero = ARDOUR_UI::config()->get_ZeroLine();
 
        if (_selected) {
                if (_region->muted()) {
                        /* hide outline with zero alpha */
-                       outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), 0);
-                       fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(), MUTED_ALPHA);
+                       outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveForm(), 0);
+                       fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveFormFill(), MUTED_ALPHA);
                } else {
-                       outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm();
-                       fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
+                       outline = ARDOUR_UI::config()->get_SelectedWaveForm();
+                       fill = ARDOUR_UI::config()->get_SelectedWaveFormFill();
                }
        } else {
                if (_recregion) {
-                       outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm();
-                       fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill();
+                       outline = ARDOUR_UI::config()->get_RecWaveForm();
+                       fill = ARDOUR_UI::config()->get_RecWaveFormFill();
                } else {
                        if (_region->muted()) {
                                /* hide outline with zero alpha */
-                               outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), 0); 
-                               fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveFormFill(), MUTED_ALPHA);
+                               outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveForm(), 0);   
+                               fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveFormFill(), MUTED_ALPHA);
                        } else {
-                               outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
-                               fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill();
+                               outline = ARDOUR_UI::config()->get_WaveForm();
+                               fill = ARDOUR_UI::config()->get_WaveFormFill();
                        }
                }
        }
index 75f4a7fe33e4b9c14a791fe4e37c64c677098a85..2fda9edb076e561b89b9e87919a477730c6320e6 100644 (file)
@@ -249,12 +249,12 @@ AudioStreamView::setup_rec_box ()
                        case Normal:
                        case NonLayered:
                                xend = xstart;
-                               fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
+                               fill_color = ARDOUR_UI::config()->get_RecordingRect();
                                break;
 
                        case Destructive:
                                xend = xstart + 2;
-                               fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
+                               fill_color = ARDOUR_UI::config()->get_RecordingRect();
                                /* make the recording rect translucent to allow
                                   the user to see the peak data coming in, etc.
                                */
@@ -268,7 +268,7 @@ AudioStreamView::setup_rec_box ()
                        rec_rect->set_x1 (xend);
                        rec_rect->set_y1 (child_height ());
                        rec_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
-                       rec_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
+                       rec_rect->set_outline_color (ARDOUR_UI::config()->get_TimeAxisFrame());
                        rec_rect->set_fill_color (fill_color);
 
                        RecBoxInfo recbox;
@@ -511,15 +511,15 @@ AudioStreamView::color_handler ()
 {
        //case cAudioTrackBase:
        if (_trackview.is_track()) {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioTrackBase());
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioTrackBase());
        }
 
        //case cAudioBusBase:
        if (!_trackview.is_track()) {
                if (Profile->get_sae() && _trackview.route()->is_master()) {
-                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioMasterBusBase());
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioMasterBusBase());
                } else {
-                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioBusBase());
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioBusBase());
                }
        }
 }
index 29d07d1a4a3e16e073b7a81fee73ed7e0041b447..b22681f1f825691b25abaa5d53a0cd3e7b120aa3 100644 (file)
@@ -912,7 +912,7 @@ AutomationLine::set_selected_points (PointSelection const & points)
 
 void AutomationLine::set_colors ()
 {
-       set_line_color (ARDOUR_UI::config()->get_canvasvar_AutomationLine());
+       set_line_color (ARDOUR_UI::config()->get_AutomationLine());
        for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
                (*i)->set_color ();
        }
index 53c643c0270ff4990007fccc00f27b855ef64081..7d8f1969c4954e60aef05a3f1176cc76fe75fba5 100644 (file)
@@ -192,11 +192,11 @@ void
 AutomationStreamView::color_handler ()
 {
        /*if (_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_canvasvar_MidiTrackBase();
+               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_MidiTrackBase();
        }
 
        if (!_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_canvasvar_MidiBusBase();;
+               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_MidiBusBase();;
        }*/
 }
 
index f3d82d0b0a7dd888ca082f5a3094147d8db03c83..87f2a2e26a3c5fc56a57741206594f7e14ab3fae 100644 (file)
@@ -119,9 +119,9 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 
        CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name));
        _base_rect->set_x1 (ArdourCanvas::COORD_MAX);
-       _base_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_AutomationTrackOutline());
+       _base_rect->set_outline_color (ARDOUR_UI::config()->get_AutomationTrackOutline());
        _base_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); // bottom separator
-       _base_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AutomationTrackFill());
+       _base_rect->set_fill_color (ARDOUR_UI::config()->get_AutomationTrackFill());
        _base_rect->set_data ("trackview", this);
        _base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this));
        if (!a) {
@@ -253,7 +253,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                                )
                        );
 
-               line->set_line_color (ARDOUR_UI::config()->get_canvasvar_ProcessorAutomationLine());
+               line->set_line_color (ARDOUR_UI::config()->get_ProcessorAutomationLine());
                line->queue_reset ();
                add_line (line);
        }
index 04626692fbdeb54dc136855d9454e1b78f9be8b3..e836dba7a802d6d88a5ce2a4ea731bfa38c3d742 100644 (file)
@@ -55,11 +55,11 @@ CanvasPatchChange::CanvasPatchChange(
                parent,
                height,
                (active_channel
-                ? ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeOutline()
-                : ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeInactiveChannelOutline()),
+                ? ARDOUR_UI::config()->get_MidiPatchChangeOutline()
+                : ARDOUR_UI::config()->get_MidiPatchChangeInactiveChannelOutline()),
                (active_channel
-                ? ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeFill()
-                : ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeInactiveChannelFill()),
+                ? ARDOUR_UI::config()->get_MidiPatchChangeFill()
+                : ARDOUR_UI::config()->get_MidiPatchChangeInactiveChannelFill()),
                x,
                y)
        , _info (info)
index 3f729596b3e11f70249bce606f28a13aa21cf167..34fc3adc3a3e528a24a49719b91d6739bff8f9b6 100644 (file)
 
 */
 
-CANVAS_VARIABLE(canvasvar_ActiveCrossfade, "active crossfade")
-CANVAS_VARIABLE(canvasvar_AudioBusBase, "audio bus base")
-CANVAS_VARIABLE(canvasvar_AudioMasterBusBase, "audio master bus base")
-CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base")
-CANVAS_VARIABLE(canvasvar_AutomationLine, "automation line")
-CANVAS_VARIABLE(canvasvar_AutomationTrackFill, "automation track fill")
-CANVAS_VARIABLE(canvasvar_AutomationTrackOutline, "automation track outline")
-CANVAS_VARIABLE(canvasvar_CDMarkerBar, "cd marker bar")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorBase, "crossfade editor base")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorLine, "crossfade editor line")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorLineShading, "crossfade editor line shading")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointFill, "crossfade editor point fill")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointOutline, "crossfade editor point outline")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorWave, "crossfade editor wave")
-CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWaveFill, "selected crossfade editor wave fill")
-CANVAS_VARIABLE(canvasvar_CrossfadeLine, "crossfade line")
-CANVAS_VARIABLE(canvasvar_EditPoint, "edit point")
-CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "entered automation line")
-CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill")
-CANVAS_VARIABLE(canvasvar_ControlPointOutline, "control point outline")
-CANVAS_VARIABLE(canvasvar_ControlPointSelected, "control point selected")
-CANVAS_VARIABLE(canvasvar_EnteredGainLine, "entered gain line")
-CANVAS_VARIABLE(canvasvar_EnteredMarker, "entered marker")
-CANVAS_VARIABLE(canvasvar_FrameHandle, "frame handle")
-CANVAS_VARIABLE(canvasvar_GainLine, "gain line")
-CANVAS_VARIABLE(canvasvar_GainLineInactive, "gain line inactive")
-CANVAS_VARIABLE(canvasvar_GhostTrackBase, "ghost track base")
-CANVAS_VARIABLE(canvasvar_GhostTrackMidiOutline, "ghost track midi outline")
-CANVAS_VARIABLE(canvasvar_GhostTrackWave, "ghost track wave")
-CANVAS_VARIABLE(canvasvar_GhostTrackWaveFill, "ghost track wave fill")
-CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "ghost track wave clip")
-CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "ghost track zero line")
-CANVAS_VARIABLE(canvasvar_ImageTrack, "image track")
-CANVAS_VARIABLE(canvasvar_InactiveCrossfade, "inactive crossfade")
-CANVAS_VARIABLE(canvasvar_InactiveFadeHandle, "inactive fade handle")
-CANVAS_VARIABLE(canvasvar_InactiveGroupTab, "inactive group tab")
-CANVAS_VARIABLE(canvasvar_LocationCDMarker, "location cd marker")
-CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop")
-CANVAS_VARIABLE(canvasvar_LocationMarker, "location marker")
-CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch")
-CANVAS_VARIABLE(canvasvar_LocationRange, "location range")
-CANVAS_VARIABLE(canvasvar_MarkerBar, "marker bar")
-CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
-CANVAS_VARIABLE(canvasvar_MarkerDragLine, "marker drag line")
-CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
-CANVAS_VARIABLE(canvasvar_MarkerTrack, "marker track")
-CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar")
-CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat")
-CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar")
-CANVAS_VARIABLE(canvasvar_MeterBridgePeakLabel, "meterbridge peaklabel")
-CANVAS_VARIABLE(canvasvar_MeterColorBBC, "meter color BBC")
-CANVAS_VARIABLE(canvasvar_MeterColor0, "meter fill: 0")
-CANVAS_VARIABLE(canvasvar_MeterColor1, "meter fill: 1")
-CANVAS_VARIABLE(canvasvar_MeterColor2, "meter fill: 2")
-CANVAS_VARIABLE(canvasvar_MeterColor3, "meter fill: 3")
-CANVAS_VARIABLE(canvasvar_MeterColor4, "meter fill: 4")
-CANVAS_VARIABLE(canvasvar_MeterColor5, "meter fill: 5")
-CANVAS_VARIABLE(canvasvar_MeterColor6, "meter fill: 6")
-CANVAS_VARIABLE(canvasvar_MeterColor7, "meter fill: 7")
-CANVAS_VARIABLE(canvasvar_MeterColor8, "meter fill: 8")
-CANVAS_VARIABLE(canvasvar_MeterColor9, "meter fill: 9")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor0, "midi meter fill: 0")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor1, "midi meter fill: 1")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor2, "midi meter fill: 2")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor3, "midi meter fill: 3")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor4, "midi meter fill: 4")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor5, "midi meter fill: 5")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor6, "midi meter fill: 6")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor7, "midi meter fill: 7")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor8, "midi meter fill: 8")
-CANVAS_VARIABLE(canvasvar_MidiMeterColor9, "midi meter fill: 9")
-CANVAS_VARIABLE(canvasvar_MeterBackgroundBot, "meter background: bottom")
-CANVAS_VARIABLE(canvasvar_MeterBackgroundTop, "meter background: top")
-CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker")
-CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
-CANVAS_VARIABLE(canvasvar_MidiFrameBase, "midi frame base")
-CANVAS_VARIABLE(canvasvar_MidiNoteInactiveChannel, "midi note inactive channel")
-CANVAS_VARIABLE(canvasvar_MidiNoteColorBase, "midi note color min")
-CANVAS_VARIABLE(canvasvar_MidiNoteColorMid, "midi note color mid")
-CANVAS_VARIABLE(canvasvar_MidiNoteColorTop, "midi note color max")
-CANVAS_VARIABLE(canvasvar_SelectedMidiNoteColorBase, "selected midi note color min")
-CANVAS_VARIABLE(canvasvar_SelectedMidiNoteColorMid, "selected midi note color mid")
-CANVAS_VARIABLE(canvasvar_SelectedMidiNoteColorTop, "selected midi note color max")
-CANVAS_VARIABLE(canvasvar_MidiNoteSelected, "midi note selected")
-CANVAS_VARIABLE(canvasvar_MidiNoteVelocityText, "midi note velocity text")
-CANVAS_VARIABLE(canvasvar_MidiPatchChangeFill, "midi patch change fill")
-CANVAS_VARIABLE(canvasvar_MidiPatchChangeOutline, "midi patch change outline")
-CANVAS_VARIABLE(canvasvar_MidiPatchChangeInactiveChannelFill, "midi patch change inactive channel fill")
-CANVAS_VARIABLE(canvasvar_MidiPatchChangeInactiveChannelOutline, "midi patch change inactive channel outline")
-CANVAS_VARIABLE(canvasvar_MidiSysExFill, "midi sysex fill")
-CANVAS_VARIABLE(canvasvar_MidiSysExOutline, "midi sysex outline")
-CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
-CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
-CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")
-CANVAS_VARIABLE(canvasvar_NameHighlightFill, "name highlight fill")
-CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "name highlight outline")
-CANVAS_VARIABLE(canvasvar_PianoRollBlackOutline, "piano roll black outline")
-CANVAS_VARIABLE(canvasvar_PianoRollBlack, "piano roll black")
-CANVAS_VARIABLE(canvasvar_PianoRollWhite, "piano roll white")
-CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
-CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
-CANVAS_VARIABLE(canvasvar_PunchLine, "punch line")
-CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "range drag bar rect")
-CANVAS_VARIABLE(canvasvar_RangeDragRect, "range drag rect")
-CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "range marker bar")
-CANVAS_VARIABLE(canvasvar_RecordingRect, "recording rect")
-CANVAS_VARIABLE(canvasvar_RecWaveFormFill, "recorded waveform fill")
-CANVAS_VARIABLE(canvasvar_RecWaveForm, "recorded waveform outline")
-CANVAS_VARIABLE(canvasvar_RubberBandRect, "rubber band rect")
-CANVAS_VARIABLE(canvasvar_RulerBase, "ruler base")
-CANVAS_VARIABLE(canvasvar_RulerText, "ruler text")
-CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
-CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
-CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
-CANVAS_VARIABLE(canvasvar_SelectedWaveFormFill, "selected waveform fill")
-CANVAS_VARIABLE(canvasvar_SelectedWaveForm, "selected waveform outline")
-CANVAS_VARIABLE(canvasvar_SelectionRect, "selection rect")
-CANVAS_VARIABLE(canvasvar_Selection, "selection")
-CANVAS_VARIABLE(canvasvar_Shuttle, "shuttle")
-CANVAS_VARIABLE(canvasvar_Silence, "silence")
-CANVAS_VARIABLE(canvasvar_SilenceText, "silence text")
-CANVAS_VARIABLE(canvasvar_MonoPannerOutline, "mono panner outline")
-CANVAS_VARIABLE(canvasvar_MonoPannerFill, "mono panner fill")
-CANVAS_VARIABLE(canvasvar_MonoPannerText, "mono panner text")
-CANVAS_VARIABLE(canvasvar_MonoPannerBackground, "mono panner bg")
-CANVAS_VARIABLE(canvasvar_MonoPannerPositionFill, "mono panner position fill")
-CANVAS_VARIABLE(canvasvar_MonoPannerPositionOutline, "mono panner position outline")
-CANVAS_VARIABLE(canvasvar_StereoPannerOutline, "stereo panner outline")
-CANVAS_VARIABLE(canvasvar_StereoPannerFill, "stereo panner fill")
-CANVAS_VARIABLE(canvasvar_StereoPannerText, "stereo panner text")
-CANVAS_VARIABLE(canvasvar_StereoPannerBackground, "stereo panner bg")
-CANVAS_VARIABLE(canvasvar_StereoPannerRule, "stereo panner rule")
-CANVAS_VARIABLE(canvasvar_StereoPannerMonoOutline, "stereo panner mono outline")
-CANVAS_VARIABLE(canvasvar_StereoPannerMonoFill, "stereo panner mono fill")
-CANVAS_VARIABLE(canvasvar_StereoPannerMonoText, "stereo panner mono text")
-CANVAS_VARIABLE(canvasvar_StereoPannerMonoBackground, "stereo panner mono bg")
-CANVAS_VARIABLE(canvasvar_StereoPannerInvertedOutline, "stereo panner inverted outline")
-CANVAS_VARIABLE(canvasvar_StereoPannerInvertedFill, "stereo panner inverted fill")
-CANVAS_VARIABLE(canvasvar_StereoPannerInvertedText, "stereo panner inverted text")
-CANVAS_VARIABLE(canvasvar_StereoPannerInvertedBackground, "stereo panner inverted bg")
-CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
-CANVAS_VARIABLE(canvasvar_TempoMarker, "tempo marker")
-CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "time axis frame")
-CANVAS_VARIABLE(canvasvar_SelectedTimeAxisFrame, "selected time axis frame")
-CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time stretch fill")
-CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time stretch outline")
-CANVAS_VARIABLE(canvasvar_MonitorKnobArcStart, "monitor knob: arc start")
-CANVAS_VARIABLE(canvasvar_MonitorKnobArcEnd, "monitor knob: arc end")
-CANVAS_VARIABLE(canvasvar_TransportDragRect, "transport drag rect")
-CANVAS_VARIABLE(canvasvar_TransportLoopRect, "transport loop rect")
-CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "transport marker bar")
-CANVAS_VARIABLE(canvasvar_TransportPunchRect, "transport punch rect")
-CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
-CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
-CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
-CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
-CANVAS_VARIABLE(canvasvar_VideoBar, "video timeline bar")
-CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
-CANVAS_VARIABLE(canvasvar_CoveredRegion, "region area covered by another region")
-CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
-CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
-CANVAS_VARIABLE(canvasvar_WaveFormFill, "waveform fill")
-CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
-CANVAS_VARIABLE(canvasvar_MonitorSectionKnob, "monitor knob")
+CANVAS_VARIABLE(ActiveCrossfade, "active crossfade")
+CANVAS_VARIABLE(AudioBusBase, "audio bus base")
+CANVAS_VARIABLE(AudioMasterBusBase, "audio master bus base")
+CANVAS_VARIABLE(AudioTrackBase, "audio track base")
+CANVAS_VARIABLE(AutomationLine, "automation line")
+CANVAS_VARIABLE(AutomationTrackFill, "automation track fill")
+CANVAS_VARIABLE(AutomationTrackOutline, "automation track outline")
+CANVAS_VARIABLE(CDMarkerBar, "cd marker bar")
+CANVAS_VARIABLE(CrossfadeEditorBase, "crossfade editor base")
+CANVAS_VARIABLE(CrossfadeEditorLine, "crossfade editor line")
+CANVAS_VARIABLE(CrossfadeEditorLineShading, "crossfade editor line shading")
+CANVAS_VARIABLE(CrossfadeEditorPointFill, "crossfade editor point fill")
+CANVAS_VARIABLE(CrossfadeEditorPointOutline, "crossfade editor point outline")
+CANVAS_VARIABLE(CrossfadeEditorWave, "crossfade editor wave")
+CANVAS_VARIABLE(SelectedCrossfadeEditorWaveFill, "selected crossfade editor wave fill")
+CANVAS_VARIABLE(CrossfadeLine, "crossfade line")
+CANVAS_VARIABLE(EditPoint, "edit point")
+CANVAS_VARIABLE(EnteredAutomationLine, "entered automation line")
+CANVAS_VARIABLE(ControlPointFill, "control point fill")
+CANVAS_VARIABLE(ControlPointOutline, "control point outline")
+CANVAS_VARIABLE(ControlPointSelected, "control point selected")
+CANVAS_VARIABLE(EnteredGainLine, "entered gain line")
+CANVAS_VARIABLE(EnteredMarker, "entered marker")
+CANVAS_VARIABLE(FrameHandle, "frame handle")
+CANVAS_VARIABLE(GainLine, "gain line")
+CANVAS_VARIABLE(GainLineInactive, "gain line inactive")
+CANVAS_VARIABLE(GhostTrackBase, "ghost track base")
+CANVAS_VARIABLE(GhostTrackMidiOutline, "ghost track midi outline")
+CANVAS_VARIABLE(GhostTrackWave, "ghost track wave")
+CANVAS_VARIABLE(GhostTrackWaveFill, "ghost track wave fill")
+CANVAS_VARIABLE(GhostTrackWaveClip, "ghost track wave clip")
+CANVAS_VARIABLE(GhostTrackZeroLine, "ghost track zero line")
+CANVAS_VARIABLE(ImageTrack, "image track")
+CANVAS_VARIABLE(InactiveCrossfade, "inactive crossfade")
+CANVAS_VARIABLE(InactiveFadeHandle, "inactive fade handle")
+CANVAS_VARIABLE(InactiveGroupTab, "inactive group tab")
+CANVAS_VARIABLE(LocationCDMarker, "location cd marker")
+CANVAS_VARIABLE(LocationLoop, "location loop")
+CANVAS_VARIABLE(LocationMarker, "location marker")
+CANVAS_VARIABLE(LocationPunch, "location punch")
+CANVAS_VARIABLE(LocationRange, "location range")
+CANVAS_VARIABLE(MarkerBar, "marker bar")
+CANVAS_VARIABLE(MarkerBarSeparator, "marker bar separator")
+CANVAS_VARIABLE(MarkerDragLine, "marker drag line")
+CANVAS_VARIABLE(MarkerLabel, "marker label")
+CANVAS_VARIABLE(MarkerTrack, "marker track")
+CANVAS_VARIABLE(MeasureLineBar, "measure line bar")
+CANVAS_VARIABLE(MeasureLineBeat, "measure line beat")
+CANVAS_VARIABLE(MeterBar, "meter bar")
+CANVAS_VARIABLE(MeterBridgePeakLabel, "meterbridge peaklabel")
+CANVAS_VARIABLE(MeterColorBBC, "meter color BBC")
+CANVAS_VARIABLE(MeterColor0, "meter fill: 0")
+CANVAS_VARIABLE(MeterColor1, "meter fill: 1")
+CANVAS_VARIABLE(MeterColor2, "meter fill: 2")
+CANVAS_VARIABLE(MeterColor3, "meter fill: 3")
+CANVAS_VARIABLE(MeterColor4, "meter fill: 4")
+CANVAS_VARIABLE(MeterColor5, "meter fill: 5")
+CANVAS_VARIABLE(MeterColor6, "meter fill: 6")
+CANVAS_VARIABLE(MeterColor7, "meter fill: 7")
+CANVAS_VARIABLE(MeterColor8, "meter fill: 8")
+CANVAS_VARIABLE(MeterColor9, "meter fill: 9")
+CANVAS_VARIABLE(MidiMeterColor0, "midi meter fill: 0")
+CANVAS_VARIABLE(MidiMeterColor1, "midi meter fill: 1")
+CANVAS_VARIABLE(MidiMeterColor2, "midi meter fill: 2")
+CANVAS_VARIABLE(MidiMeterColor3, "midi meter fill: 3")
+CANVAS_VARIABLE(MidiMeterColor4, "midi meter fill: 4")
+CANVAS_VARIABLE(MidiMeterColor5, "midi meter fill: 5")
+CANVAS_VARIABLE(MidiMeterColor6, "midi meter fill: 6")
+CANVAS_VARIABLE(MidiMeterColor7, "midi meter fill: 7")
+CANVAS_VARIABLE(MidiMeterColor8, "midi meter fill: 8")
+CANVAS_VARIABLE(MidiMeterColor9, "midi meter fill: 9")
+CANVAS_VARIABLE(MeterBackgroundBot, "meter background: bottom")
+CANVAS_VARIABLE(MeterBackgroundTop, "meter background: top")
+CANVAS_VARIABLE(MeterMarker, "meter marker")
+CANVAS_VARIABLE(MidiBusBase, "midi bus base")
+CANVAS_VARIABLE(MidiFrameBase, "midi frame base")
+CANVAS_VARIABLE(MidiNoteInactiveChannel, "midi note inactive channel")
+CANVAS_VARIABLE(MidiNoteColorBase, "midi note color min")
+CANVAS_VARIABLE(MidiNoteColorMid, "midi note color mid")
+CANVAS_VARIABLE(MidiNoteColorTop, "midi note color max")
+CANVAS_VARIABLE(SelectedMidiNoteColorBase, "selected midi note color min")
+CANVAS_VARIABLE(SelectedMidiNoteColorMid, "selected midi note color mid")
+CANVAS_VARIABLE(SelectedMidiNoteColorTop, "selected midi note color max")
+CANVAS_VARIABLE(MidiNoteSelected, "midi note selected")
+CANVAS_VARIABLE(MidiNoteVelocityText, "midi note velocity text")
+CANVAS_VARIABLE(MidiPatchChangeFill, "midi patch change fill")
+CANVAS_VARIABLE(MidiPatchChangeOutline, "midi patch change outline")
+CANVAS_VARIABLE(MidiPatchChangeInactiveChannelFill, "midi patch change inactive channel fill")
+CANVAS_VARIABLE(MidiPatchChangeInactiveChannelOutline, "midi patch change inactive channel outline")
+CANVAS_VARIABLE(MidiSysExFill, "midi sysex fill")
+CANVAS_VARIABLE(MidiSysExOutline, "midi sysex outline")
+CANVAS_VARIABLE(MidiSelectRectFill, "midi select rect fill")
+CANVAS_VARIABLE(MidiSelectRectOutline, "midi select rect outline")
+CANVAS_VARIABLE(MidiTrackBase, "midi track base")
+CANVAS_VARIABLE(NameHighlightFill, "name highlight fill")
+CANVAS_VARIABLE(NameHighlightOutline, "name highlight outline")
+CANVAS_VARIABLE(PianoRollBlackOutline, "piano roll black outline")
+CANVAS_VARIABLE(PianoRollBlack, "piano roll black")
+CANVAS_VARIABLE(PianoRollWhite, "piano roll white")
+CANVAS_VARIABLE(PlayHead, "play head")
+CANVAS_VARIABLE(ProcessorAutomationLine, "processor automation line")
+CANVAS_VARIABLE(PunchLine, "punch line")
+CANVAS_VARIABLE(RangeDragBarRect, "range drag bar rect")
+CANVAS_VARIABLE(RangeDragRect, "range drag rect")
+CANVAS_VARIABLE(RangeMarkerBar, "range marker bar")
+CANVAS_VARIABLE(RecordingRect, "recording rect")
+CANVAS_VARIABLE(RecWaveFormFill, "recorded waveform fill")
+CANVAS_VARIABLE(RecWaveForm, "recorded waveform outline")
+CANVAS_VARIABLE(RubberBandRect, "rubber band rect")
+CANVAS_VARIABLE(RulerBase, "ruler base")
+CANVAS_VARIABLE(RulerText, "ruler text")
+CANVAS_VARIABLE(SelectedCrossfadeEditorLine, "selected crossfade editor line")
+CANVAS_VARIABLE(SelectedCrossfadeEditorWave, "selected crossfade editor wave")
+CANVAS_VARIABLE(SelectedFrameBase, "selected region base")
+CANVAS_VARIABLE(SelectedWaveFormFill, "selected waveform fill")
+CANVAS_VARIABLE(SelectedWaveForm, "selected waveform outline")
+CANVAS_VARIABLE(SelectionRect, "selection rect")
+CANVAS_VARIABLE(Selection, "selection")
+CANVAS_VARIABLE(Shuttle, "shuttle")
+CANVAS_VARIABLE(Silence, "silence")
+CANVAS_VARIABLE(SilenceText, "silence text")
+CANVAS_VARIABLE(MonoPannerOutline, "mono panner outline")
+CANVAS_VARIABLE(MonoPannerFill, "mono panner fill")
+CANVAS_VARIABLE(MonoPannerText, "mono panner text")
+CANVAS_VARIABLE(MonoPannerBackground, "mono panner bg")
+CANVAS_VARIABLE(MonoPannerPositionFill, "mono panner position fill")
+CANVAS_VARIABLE(MonoPannerPositionOutline, "mono panner position outline")
+CANVAS_VARIABLE(StereoPannerOutline, "stereo panner outline")
+CANVAS_VARIABLE(StereoPannerFill, "stereo panner fill")
+CANVAS_VARIABLE(StereoPannerText, "stereo panner text")
+CANVAS_VARIABLE(StereoPannerBackground, "stereo panner bg")
+CANVAS_VARIABLE(StereoPannerRule, "stereo panner rule")
+CANVAS_VARIABLE(StereoPannerMonoOutline, "stereo panner mono outline")
+CANVAS_VARIABLE(StereoPannerMonoFill, "stereo panner mono fill")
+CANVAS_VARIABLE(StereoPannerMonoText, "stereo panner mono text")
+CANVAS_VARIABLE(StereoPannerMonoBackground, "stereo panner mono bg")
+CANVAS_VARIABLE(StereoPannerInvertedOutline, "stereo panner inverted outline")
+CANVAS_VARIABLE(StereoPannerInvertedFill, "stereo panner inverted fill")
+CANVAS_VARIABLE(StereoPannerInvertedText, "stereo panner inverted text")
+CANVAS_VARIABLE(StereoPannerInvertedBackground, "stereo panner inverted bg")
+CANVAS_VARIABLE(TempoBar, "tempo bar")
+CANVAS_VARIABLE(TempoMarker, "tempo marker")
+CANVAS_VARIABLE(TimeAxisFrame, "time axis frame")
+CANVAS_VARIABLE(SelectedTimeAxisFrame, "selected time axis frame")
+CANVAS_VARIABLE(TimeStretchFill, "time stretch fill")
+CANVAS_VARIABLE(TimeStretchOutline, "time stretch outline")
+CANVAS_VARIABLE(MonitorKnobArcStart, "monitor knob: arc start")
+CANVAS_VARIABLE(MonitorKnobArcEnd, "monitor knob: arc end")
+CANVAS_VARIABLE(TransportDragRect, "transport drag rect")
+CANVAS_VARIABLE(TransportLoopRect, "transport loop rect")
+CANVAS_VARIABLE(TransportMarkerBar, "transport marker bar")
+CANVAS_VARIABLE(TransportPunchRect, "transport punch rect")
+CANVAS_VARIABLE(TrimHandleLocked, "trim handle locked")
+CANVAS_VARIABLE(TrimHandle, "trim handle")
+CANVAS_VARIABLE(VerboseCanvasCursor, "verbose canvas cursor")
+CANVAS_VARIABLE(VestigialFrame, "vestigial frame")
+CANVAS_VARIABLE(VideoBar, "video timeline bar")
+CANVAS_VARIABLE(FrameBase, "region base")
+CANVAS_VARIABLE(CoveredRegion, "region area covered by another region")
+CANVAS_VARIABLE(WaveForm, "waveform outline")
+CANVAS_VARIABLE(WaveFormClip, "clipped waveform")
+CANVAS_VARIABLE(WaveFormFill, "waveform fill")
+CANVAS_VARIABLE(ZeroLine, "zero line")
+CANVAS_VARIABLE(MonitorSectionKnob, "monitor knob")
 
-CANVAS_VARIABLE(canvasvar_ButtonBorder, "border color")
+CANVAS_VARIABLE(ButtonBorder, "border color")
 #define BUTTON_VARS(root,name) \
-CANVAS_VARIABLE(canvasvar_ ## root ## Fill, name ": fill") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillActive, name ": fill active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## LED, name ": led") \
-CANVAS_VARIABLE(canvasvar_ ## root ## LEDActive, name ": led active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## Text, name ": text") \
-CANVAS_VARIABLE(canvasvar_ ## root ## TextActive, name ": text active") \
+CANVAS_VARIABLE(root ## Fill, name ": fill") \
+CANVAS_VARIABLE(root ## FillActive, name ": fill active") \
+CANVAS_VARIABLE(root ## LED, name ": led") \
+CANVAS_VARIABLE(root ## LEDActive, name ": led active") \
+CANVAS_VARIABLE(root ## Text, name ": text") \
+CANVAS_VARIABLE(root ## TextActive, name ": text active") \
 
 BUTTON_VARS(ProcessorPreFader, "processor prefader")
 BUTTON_VARS(ProcessorFader, "processor fader")
@@ -238,10 +238,10 @@ BUTTON_VARS(GenericButton, "generic button")
 BUTTON_VARS(PeakDisplayButton, "peak display")
 
 #define CLOCK_VARS(root,name) \
-       CANVAS_VARIABLE(canvasvar_ ## root ## Background, name ": background") \
-       CANVAS_VARIABLE(canvasvar_ ## root ## Text, name ": text") \
-       CANVAS_VARIABLE(canvasvar_ ## root ## EditedText, name ": edited text") \
-       CANVAS_VARIABLE(canvasvar_ ## root ## Cursor, name ": cursor") 
+       CANVAS_VARIABLE(root ## Background, name ": background") \
+       CANVAS_VARIABLE(root ## Text, name ": text") \
+       CANVAS_VARIABLE(root ## EditedText, name ": edited text") \
+       CANVAS_VARIABLE(root ## Cursor, name ": cursor") 
 
 CLOCK_VARS(TransportClock, "transport clock")
 CLOCK_VARS(SecondaryClock, "secondary clock")
@@ -253,44 +253,44 @@ CLOCK_VARS(PunchClock, "punch clock")
 CLOCK_VARS(SelectionClock, "selection clock")
 CLOCK_VARS(NudgeClock, "nudge clock")
 CLOCK_VARS(GenericClock, "clock")
-CANVAS_FONT_VARIABLE(canvasvar_SmallFont, "small font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallerFont, "smaller font")
-CANVAS_FONT_VARIABLE(canvasvar_NormalFont, "normal font")
-CANVAS_FONT_VARIABLE(canvasvar_BigFont, "big font")
-CANVAS_FONT_VARIABLE(canvasvar_LargeFont, "large font")
-CANVAS_FONT_VARIABLE(canvasvar_LargerFont, "larger font")
-CANVAS_FONT_VARIABLE(canvasvar_HugerFont, "huger font")
-CANVAS_FONT_VARIABLE(canvasvar_MassiveFont, "massive font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallBoldFont, "small bold font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallerBoldFont, "smaller bold font")
-CANVAS_FONT_VARIABLE(canvasvar_NormalBoldFont, "normal bold font")
-CANVAS_FONT_VARIABLE(canvasvar_BigBoldFont, "big bold font")
-CANVAS_FONT_VARIABLE(canvasvar_LargeBoldFont, "large bold font")
-CANVAS_FONT_VARIABLE(canvasvar_LargerBoldFont, "larger bold font")
-CANVAS_FONT_VARIABLE(canvasvar_HugerBoldFont, "huger bold font")
-CANVAS_FONT_VARIABLE(canvasvar_MassiveBoldFont, "massive bold font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallItalicFont, "small italic font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallerItalicFont, "smaller italic font")
-CANVAS_FONT_VARIABLE(canvasvar_NormalItalicFont, "normal italic font")
-CANVAS_FONT_VARIABLE(canvasvar_BigItalicFont, "big italic font")
-CANVAS_FONT_VARIABLE(canvasvar_LargeItalicFont, "large italic font")
-CANVAS_FONT_VARIABLE(canvasvar_LargerItalicFont, "larger italic font")
-CANVAS_FONT_VARIABLE(canvasvar_HugerItalicFont, "huger italic font")
-CANVAS_FONT_VARIABLE(canvasvar_MassiveItalicFont, "massive italic font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallMonospaceFont, "small monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallerMonospaceFont, "smaller monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_NormalMonospaceFont, "normal monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_BigMonospaceFont, "big monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_LargeMonospaceFont, "large monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_LargerMonospaceFont, "larger monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_HugerMonospaceFont, "huger monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_MassiveMonospaceFont, "massive monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallBoldMonospaceFont, "small bold monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_SmallerBoldMonospaceFont, "smaller bold monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_NormalBoldMonospaceFont, "normal bold monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_BigBoldMonospaceFont, "big bold monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_LargeBoldMonospaceFont, "large bold monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_LargerBoldMonospaceFont, "larger bold monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_HugerBoldMonospaceFont, "huger bold monospace font")
-CANVAS_FONT_VARIABLE(canvasvar_MassiveBoldMonospaceFont, "massive bold monospace font")
+CANVAS_FONT_VARIABLE(SmallFont, "small font")
+CANVAS_FONT_VARIABLE(SmallerFont, "smaller font")
+CANVAS_FONT_VARIABLE(NormalFont, "normal font")
+CANVAS_FONT_VARIABLE(BigFont, "big font")
+CANVAS_FONT_VARIABLE(LargeFont, "large font")
+CANVAS_FONT_VARIABLE(LargerFont, "larger font")
+CANVAS_FONT_VARIABLE(HugerFont, "huger font")
+CANVAS_FONT_VARIABLE(MassiveFont, "massive font")
+CANVAS_FONT_VARIABLE(SmallBoldFont, "small bold font")
+CANVAS_FONT_VARIABLE(SmallerBoldFont, "smaller bold font")
+CANVAS_FONT_VARIABLE(NormalBoldFont, "normal bold font")
+CANVAS_FONT_VARIABLE(BigBoldFont, "big bold font")
+CANVAS_FONT_VARIABLE(LargeBoldFont, "large bold font")
+CANVAS_FONT_VARIABLE(LargerBoldFont, "larger bold font")
+CANVAS_FONT_VARIABLE(HugerBoldFont, "huger bold font")
+CANVAS_FONT_VARIABLE(MassiveBoldFont, "massive bold font")
+CANVAS_FONT_VARIABLE(SmallItalicFont, "small italic font")
+CANVAS_FONT_VARIABLE(SmallerItalicFont, "smaller italic font")
+CANVAS_FONT_VARIABLE(NormalItalicFont, "normal italic font")
+CANVAS_FONT_VARIABLE(BigItalicFont, "big italic font")
+CANVAS_FONT_VARIABLE(LargeItalicFont, "large italic font")
+CANVAS_FONT_VARIABLE(LargerItalicFont, "larger italic font")
+CANVAS_FONT_VARIABLE(HugerItalicFont, "huger italic font")
+CANVAS_FONT_VARIABLE(MassiveItalicFont, "massive italic font")
+CANVAS_FONT_VARIABLE(SmallMonospaceFont, "small monospace font")
+CANVAS_FONT_VARIABLE(SmallerMonospaceFont, "smaller monospace font")
+CANVAS_FONT_VARIABLE(NormalMonospaceFont, "normal monospace font")
+CANVAS_FONT_VARIABLE(BigMonospaceFont, "big monospace font")
+CANVAS_FONT_VARIABLE(LargeMonospaceFont, "large monospace font")
+CANVAS_FONT_VARIABLE(LargerMonospaceFont, "larger monospace font")
+CANVAS_FONT_VARIABLE(HugerMonospaceFont, "huger monospace font")
+CANVAS_FONT_VARIABLE(MassiveMonospaceFont, "massive monospace font")
+CANVAS_FONT_VARIABLE(SmallBoldMonospaceFont, "small bold monospace font")
+CANVAS_FONT_VARIABLE(SmallerBoldMonospaceFont, "smaller bold monospace font")
+CANVAS_FONT_VARIABLE(NormalBoldMonospaceFont, "normal bold monospace font")
+CANVAS_FONT_VARIABLE(BigBoldMonospaceFont, "big bold monospace font")
+CANVAS_FONT_VARIABLE(LargeBoldMonospaceFont, "large bold monospace font")
+CANVAS_FONT_VARIABLE(LargerBoldMonospaceFont, "larger bold monospace font")
+CANVAS_FONT_VARIABLE(HugerBoldMonospaceFont, "huger bold monospace font")
+CANVAS_FONT_VARIABLE(MassiveBoldMonospaceFont, "massive bold monospace font")
 
index 90761d77c814691a584a4f04bf6daf2e3b2ff31c..ea50f8bab86c9510a21e777d88f4f7a8fe45c3d0 100644 (file)
@@ -45,8 +45,8 @@ ControlPoint::ControlPoint (AutomationLine& al)
 
        _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
        _item->set_fill (true);
-       _item->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ControlPointFill());
-       _item->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ControlPointOutline());
+       _item->set_fill_color (ARDOUR_UI::config()->get_ControlPointFill());
+       _item->set_outline_color (ARDOUR_UI::config()->get_ControlPointOutline());
        _item->set_data ("control_point", this);
        _item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
 
@@ -70,7 +70,7 @@ ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
 
        _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
        _item->set_fill (true);
-       _item->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ControlPointOutline());
+       _item->set_outline_color (ARDOUR_UI::config()->get_ControlPointOutline());
 
        /* NOTE: no event handling in copied ControlPoints */
 
@@ -122,13 +122,13 @@ ControlPoint::set_color ()
        uint32_t color = 0;
 
        if (_selected) {
-               color = ARDOUR_UI::config()->get_canvasvar_ControlPointSelected();
+               color = ARDOUR_UI::config()->get_ControlPointSelected();
        } else {
-               color = ARDOUR_UI::config()->get_canvasvar_ControlPointOutline();
+               color = ARDOUR_UI::config()->get_ControlPointOutline();
        }
 
        _item->set_outline_color (color);
-       _item->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ControlPointFill());
+       _item->set_fill_color (ARDOUR_UI::config()->get_ControlPointFill());
 }
 
 void
index 02d3ceb4bb77e6df8555ddec776a755ed9f0d268..9654a9afd9eee66035e375288130d4139d145102 100644 (file)
@@ -134,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));
@@ -462,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;
 
@@ -1064,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();
 
@@ -1089,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();
 
@@ -1141,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;
index 70f9b4f509070fbf56455dadfee48ac27b3fa4de..bf6b9bd02178d59711ce4bcde57993afff417161 100644 (file)
@@ -388,11 +388,11 @@ Editor::Editor ()
 
        sfbrowser = 0;
 
-       location_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationMarker();
-       location_range_color = ARDOUR_UI::config()->get_canvasvar_LocationRange();
-       location_cd_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationCDMarker();
-       location_loop_color = ARDOUR_UI::config()->get_canvasvar_LocationLoop();
-       location_punch_color = ARDOUR_UI::config()->get_canvasvar_LocationPunch();
+       location_marker_color = ARDOUR_UI::config()->get_LocationMarker();
+       location_range_color = ARDOUR_UI::config()->get_LocationRange();
+       location_cd_marker_color = ARDOUR_UI::config()->get_LocationCDMarker();
+       location_loop_color = ARDOUR_UI::config()->get_LocationLoop();
+       location_punch_color = ARDOUR_UI::config()->get_LocationPunch();
 
        zoom_focus = ZoomFocusLeft;
        _edit_point = EditAtMouse;
index dcbcd44da0184af74bbdaed697101f7c837cff61..0df1731e5fb986fda0eac2225632b185246f58b9 100644 (file)
@@ -870,8 +870,8 @@ Editor::set_horizontal_position (double p)
 void
 Editor::color_handler()
 {
-       ArdourCanvas::Color base = ARDOUR_UI::config()->get_canvasvar_RulerBase();
-       ArdourCanvas::Color text = ARDOUR_UI::config()->get_canvasvar_RulerText();
+       ArdourCanvas::Color base = ARDOUR_UI::config()->get_RulerBase();
+       ArdourCanvas::Color text = ARDOUR_UI::config()->get_RulerText();
        timecode_ruler->set_fill_color (base);
        timecode_ruler->set_outline_color (text);
        minsec_ruler->set_fill_color (base);
@@ -881,52 +881,52 @@ Editor::color_handler()
        bbt_ruler->set_fill_color (base);
        bbt_ruler->set_outline_color (text);
        
-       playhead_cursor->set_color (ARDOUR_UI::config()->get_canvasvar_PlayHead());
+       playhead_cursor->set_color (ARDOUR_UI::config()->get_PlayHead());
 
-       meter_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MeterBar());
-       meter_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       meter_bar->set_fill_color (ARDOUR_UI::config()->get_MeterBar());
+       meter_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
 
-       tempo_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TempoBar());
-       tempo_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       tempo_bar->set_fill_color (ARDOUR_UI::config()->get_TempoBar());
+       tempo_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
 
-       marker_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MarkerBar());
-       marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       marker_bar->set_fill_color (ARDOUR_UI::config()->get_MarkerBar());
+       marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
 
-       cd_marker_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_CDMarkerBar());
-       cd_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       cd_marker_bar->set_fill_color (ARDOUR_UI::config()->get_CDMarkerBar());
+       cd_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
 
-       range_marker_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeMarkerBar());
-       range_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       range_marker_bar->set_fill_color (ARDOUR_UI::config()->get_RangeMarkerBar());
+       range_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
 
-       transport_marker_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportMarkerBar());
-       transport_marker_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
+       transport_marker_bar->set_fill_color (ARDOUR_UI::config()->get_TransportMarkerBar());
+       transport_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator());
 
-       cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
-       cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
+       cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_RangeDragBarRect());
+       cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_RangeDragBarRect());
 
-       range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
-       range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragBarRect());
+       range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_RangeDragBarRect());
+       range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_RangeDragBarRect());
 
-       transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportDragRect());
-       transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportDragRect());
+       transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_TransportDragRect());
+       transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_TransportDragRect());
 
-       transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportLoopRect());
-       transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportLoopRect());
+       transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->get_TransportLoopRect());
+       transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->get_TransportLoopRect());
 
-       transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TransportPunchRect());
-       transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TransportPunchRect());
+       transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->get_TransportPunchRect());
+       transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->get_TransportPunchRect());
 
-       transport_punchin_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_PunchLine());
-       transport_punchout_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_PunchLine());
+       transport_punchin_line->set_outline_color (ARDOUR_UI::config()->get_PunchLine());
+       transport_punchout_line->set_outline_color (ARDOUR_UI::config()->get_PunchLine());
 
-       rubberband_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RubberBandRect());
-       rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->get_canvasvar_RubberBandRect());
+       rubberband_rect->set_outline_color (ARDOUR_UI::config()->get_RubberBandRect());
+       rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->get_RubberBandRect());
 
-       location_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationMarker();
-       location_range_color = ARDOUR_UI::config()->get_canvasvar_LocationRange();
-       location_cd_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationCDMarker();
-       location_loop_color = ARDOUR_UI::config()->get_canvasvar_LocationLoop();
-       location_punch_color = ARDOUR_UI::config()->get_canvasvar_LocationPunch();
+       location_marker_color = ARDOUR_UI::config()->get_LocationMarker();
+       location_range_color = ARDOUR_UI::config()->get_LocationRange();
+       location_cd_marker_color = ARDOUR_UI::config()->get_LocationCDMarker();
+       location_loop_color = ARDOUR_UI::config()->get_LocationLoop();
+       location_punch_color = ARDOUR_UI::config()->get_LocationPunch();
 
        refresh_location_display ();
 /*
index eb5af07bb8f72adf433d65de0849d39a8b96ae2e..aa37467f2c18d4e048c3953d6fbdc9eb51ecffad 100644 (file)
@@ -2583,7 +2583,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
                _marker = new MeterMarker (
                        *_editor,
                        *_editor->meter_group,
-                       ARDOUR_UI::config()->get_canvasvar_MeterMarker(),
+                       ARDOUR_UI::config()->get_MeterMarker(),
                        name,
                        *new MeterSection (_marker->meter())
                );
@@ -2713,7 +2713,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                _marker = new TempoMarker (
                        *_editor,
                        *_editor->tempo_group,
-                       ARDOUR_UI::config()->get_canvasvar_TempoMarker(),
+                       ARDOUR_UI::config()->get_TempoMarker(),
                        name,
                        *new TempoSection (_marker->tempo())
                        );
@@ -4445,8 +4445,8 @@ RangeMarkerBarDrag::RangeMarkerBarDrag (Editor* e, ArdourCanvas::Item* i, Operat
                                                                      physical_screen_height (_editor->get_window())));
        _drag_rect->hide ();
 
-       _drag_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_RangeDragRect());
-       _drag_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RangeDragRect());
+       _drag_rect->set_fill_color (ARDOUR_UI::config()->get_RangeDragRect());
+       _drag_rect->set_outline_color (ARDOUR_UI::config()->get_RangeDragRect());
 }
 
 void
index fff113a7e200b5fd1ceea96b04bfa4fe3e22d2ad..dfbcc4c6ac2bc02869edf02b7adba1c3295da228 100644 (file)
@@ -95,7 +95,7 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        if (tab.group && tab.group->is_active()) {
                ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
        } else {
-               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->get_canvasvar_InactiveGroupTab(), r, g, b, a);
+               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->get_InactiveGroupTab(), r, g, b, a);
        }
 
        a = 1.0;
index 92b9a6d81aefd156c7c8ccac3b668daedfb5e436..621319dfb67cdd4a6830df3d540f74486cd9e2ac 100644 (file)
@@ -1710,7 +1710,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                if (mouse_mode == MouseGain) {
                        ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
                        if (line) {
-                               line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EnteredGainLine());
+                               line->set_outline_color (ARDOUR_UI::config()->get_EnteredGainLine());
                        }
                }
                break;
@@ -1719,7 +1719,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                if (mouse_mode == MouseGain || mouse_mode == MouseObject) {
                        ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
                        if (line) {
-                               line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EnteredAutomationLine());
+                               line->set_outline_color (ARDOUR_UI::config()->get_EnteredAutomationLine());
                        }
                }
                break;
@@ -1737,7 +1737,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                        break;
                }
                entered_marker = marker;
-               marker->set_color_rgba (ARDOUR_UI::config()->get_canvasvar_EnteredMarker());
+               marker->set_color_rgba (ARDOUR_UI::config()->get_EnteredMarker());
                // fall through
        case MeterMarkerItem:
        case TempoMarkerItem:
@@ -1847,7 +1847,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
        {
                ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
                if (rect) {
-                       rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+                       rect->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
                }
        }
        break;
@@ -1858,7 +1858,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
        case FeatureLineItem:
        {
                ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
-               line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ZeroLine());
+               line->set_outline_color (ARDOUR_UI::config()->get_ZeroLine());
        }
        break;
 
index 5dc93cde993f2f4e208fcb9aba9bbdd1783df7c6..6e2267bf62b1eca0d9750ee6a2c0d06390e7ed5b 100644 (file)
@@ -126,9 +126,9 @@ Editor::initialize_rulers ()
           but it seems hard.
        */
 #ifdef __APPLE__       
-       Pango::FontDescription font (ARDOUR_UI::config()->get_canvasvar_SmallerFont());
+       Pango::FontDescription font (ARDOUR_UI::config()->get_SmallerFont());
 #else
-       Pango::FontDescription font (ARDOUR_UI::config()->get_canvasvar_SmallFont());
+       Pango::FontDescription font (ARDOUR_UI::config()->get_SmallFont());
 #endif
        _timecode_metric = new TimecodeMetric (this);
        _bbt_metric = new BBTMetric (this);
index 44d0154dd48ad493bd83dbaf3c9e7a5d58b6ebd8..fec380ee358c5f56e1220e2a1250bfc6ad4904ff 100644 (file)
@@ -85,7 +85,7 @@ Editor::draw_metric_marks (const Metrics& metrics)
 
                if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
                        snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ());
-                       metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->get_canvasvar_MeterMarker(), buf,
+                       metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->get_MeterMarker(), buf,
                                                                 *(const_cast<MeterSection*>(ms))));
                } else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
                        if (Config->get_allow_non_quarter_pulse()) {
@@ -93,7 +93,7 @@ Editor::draw_metric_marks (const Metrics& metrics)
                        } else {
                                snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
                        }
-                       metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->get_canvasvar_TempoMarker(), buf,
+                       metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->get_TempoMarker(), buf,
                                                                 *(const_cast<TempoSection*>(ts))));
                }
 
index fcb22f5575c076ef4f716526db07c1e317438774..fe82ea802496529405af2d5b8df95c1d4c4869d9 100644 (file)
@@ -102,7 +102,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
        gain_display.set_alignment(0.5);
 
        peak_display.set_name ("peak display");
-       peak_display.set_layout_font (ARDOUR_UI::config()->get_canvasvar_SmallFont());
+       peak_display.set_layout_font (ARDOUR_UI::config()->get_SmallFont());
        max_peak = minus_infinity();
        peak_display.set_text (_("-inf"));
        peak_display.set_alignment (0.5, 0.5);
index 9e0272d6443c8782b554293a967f2509f01b7f8f..21a21b17518e11ad155f6c13e83faf76b6cea6b9 100644 (file)
@@ -702,8 +702,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
                                0xcccc00ff, 0xcccc00ff,
                                0xffaa00ff, 0xffaa00ff,
                                0xff0000ff,
-                               ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot(),
-                               ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop()
+                               ARDOUR_UI::config()->get_MeterBackgroundBot(),
+                               ARDOUR_UI::config()->get_MeterBackgroundTop()
                                );
 
                info->min_unbound = desc.min_unbound;
index ec062155cb513f955c929fc0c0069e70f13cf739..f8255a30c95a58260d0c2123f3479b92742025f9 100644 (file)
@@ -87,8 +87,8 @@ void
 GhostRegion::set_colors ()
 {
        if (is_automation_ghost()) {
-               base_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackBase());
-               base_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackBase());
+               base_rect->set_outline_color (ARDOUR_UI::config()->get_GhostTrackBase());
+               base_rect->set_fill_color (ARDOUR_UI::config()->get_GhostTrackBase());
        }
 }
 
@@ -142,17 +142,17 @@ AudioGhostRegion::set_colors ()
        guint fill_color;
 
        if (is_automation_ghost()) {
-               fill_color = ARDOUR_UI::config()->get_canvasvar_GhostTrackWaveFill();
+               fill_color = ARDOUR_UI::config()->get_GhostTrackWaveFill();
        }
        else {
                fill_color = source_track_color(200);
        }
 
        for (uint32_t n=0; n < waves.size(); ++n) {
-               waves[n]->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackWave());
+               waves[n]->set_outline_color (ARDOUR_UI::config()->get_GhostTrackWave());
                waves[n]->set_fill_color (fill_color);
-               waves[n]->set_clip_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackWaveClip());
-               waves[n]->set_zero_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackZeroLine());
+               waves[n]->set_clip_color (ARDOUR_UI::config()->get_GhostTrackWaveClip());
+               waves[n]->set_zero_color (ARDOUR_UI::config()->get_GhostTrackZeroLine());
        }
 }
 
@@ -237,7 +237,7 @@ MidiGhostRegion::set_colors()
 
        for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
                (*it)->rect->set_fill_color (fill);
-               (*it)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackMidiOutline());
+               (*it)->rect->set_outline_color (ARDOUR_UI::config()->get_GhostTrackMidiOutline());
        }
 }
 
@@ -274,7 +274,7 @@ MidiGhostRegion::add_note (NoteBase* n)
        events.push_back (event);
 
        event->rect->set_fill_color (source_track_color(200));
-       event->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackMidiOutline());
+       event->rect->set_outline_color (ARDOUR_UI::config()->get_GhostTrackMidiOutline());
 
        MidiStreamView* mv = midi_view();
 
index 9f50f6cc05d21cc042482b1ecc6df273a59fb80c..1257c7a6b3ae2756461cd3a6e304a236b831f0f4 100644 (file)
@@ -273,36 +273,36 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                uint32_t b[4];
                float stp[4];
                int styleflags = Config->get_meter_style_led() ? 3 : 1;
-               b[0] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot();
-               b[1] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop();
+               b[0] = ARDOUR_UI::config()->get_MeterBackgroundBot();
+               b[1] = ARDOUR_UI::config()->get_MeterBackgroundTop();
                b[2] = 0x991122ff; // red highlight gradient Bot
                b[3] = 0x551111ff; // red highlight gradient Top
                if (n < nmidi) {
-                       c[0] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor0();
-                       c[1] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor1();
-                       c[2] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor2();
-                       c[3] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor3();
-                       c[4] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor4();
-                       c[5] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor5();
-                       c[6] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor6();
-                       c[7] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor7();
-                       c[8] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor8();
-                       c[9] = ARDOUR_UI::config()->get_canvasvar_MidiMeterColor9();
+                       c[0] = ARDOUR_UI::config()->get_MidiMeterColor0();
+                       c[1] = ARDOUR_UI::config()->get_MidiMeterColor1();
+                       c[2] = ARDOUR_UI::config()->get_MidiMeterColor2();
+                       c[3] = ARDOUR_UI::config()->get_MidiMeterColor3();
+                       c[4] = ARDOUR_UI::config()->get_MidiMeterColor4();
+                       c[5] = ARDOUR_UI::config()->get_MidiMeterColor5();
+                       c[6] = ARDOUR_UI::config()->get_MidiMeterColor6();
+                       c[7] = ARDOUR_UI::config()->get_MidiMeterColor7();
+                       c[8] = ARDOUR_UI::config()->get_MidiMeterColor8();
+                       c[9] = ARDOUR_UI::config()->get_MidiMeterColor9();
                        stp[0] = 115.0 *  32.0 / 128.0;
                        stp[1] = 115.0 *  64.0 / 128.0;
                        stp[2] = 115.0 * 100.0 / 128.0;
                        stp[3] = 115.0 * 112.0 / 128.0;
                } else {
-                       c[0] = ARDOUR_UI::config()->get_canvasvar_MeterColor0();
-                       c[1] = ARDOUR_UI::config()->get_canvasvar_MeterColor1();
-                       c[2] = ARDOUR_UI::config()->get_canvasvar_MeterColor2();
-                       c[3] = ARDOUR_UI::config()->get_canvasvar_MeterColor3();
-                       c[4] = ARDOUR_UI::config()->get_canvasvar_MeterColor4();
-                       c[5] = ARDOUR_UI::config()->get_canvasvar_MeterColor5();
-                       c[6] = ARDOUR_UI::config()->get_canvasvar_MeterColor6();
-                       c[7] = ARDOUR_UI::config()->get_canvasvar_MeterColor7();
-                       c[8] = ARDOUR_UI::config()->get_canvasvar_MeterColor8();
-                       c[9] = ARDOUR_UI::config()->get_canvasvar_MeterColor9();
+                       c[0] = ARDOUR_UI::config()->get_MeterColor0();
+                       c[1] = ARDOUR_UI::config()->get_MeterColor1();
+                       c[2] = ARDOUR_UI::config()->get_MeterColor2();
+                       c[3] = ARDOUR_UI::config()->get_MeterColor3();
+                       c[4] = ARDOUR_UI::config()->get_MeterColor4();
+                       c[5] = ARDOUR_UI::config()->get_MeterColor5();
+                       c[6] = ARDOUR_UI::config()->get_MeterColor6();
+                       c[7] = ARDOUR_UI::config()->get_MeterColor7();
+                       c[8] = ARDOUR_UI::config()->get_MeterColor8();
+                       c[9] = ARDOUR_UI::config()->get_MeterColor9();
 
                        switch (meter_type) {
                                case MeterK20:
index 671085a7e3c0499afbba1d3ce1c3138dfab1c03a..6570825780ad4f105e5574ae8e7b01a8e484a142 100644 (file)
@@ -331,7 +331,7 @@ Marker::setup_line ()
                if (_track_canvas_line == 0) {
 
                        _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group());
-                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_EditPoint());
+                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->get_EditPoint());
                        _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                }
 
@@ -342,7 +342,7 @@ Marker::setup_line ()
                _track_canvas_line->set_x1 (d.x);
                _track_canvas_line->set_y0 (d.y);
                _track_canvas_line->set_y1 (ArdourCanvas::COORD_MAX);
-               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_canvasvar_EditPoint() : _color);
+               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_EditPoint() : _color);
                _track_canvas_line->raise_to_top ();
                _track_canvas_line->show ();
 
index 55eb16246a532e5fcc2e4d66de8614827adceee6..16036ad83e04c8965bbcd645aa132635870f3ae4 100644 (file)
@@ -614,7 +614,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types)
        Pango::AttrFontDesc* font_attr;
        Pango::FontDescription font;
 
-       font = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallMonospaceFont());
+       font = Pango::FontDescription (ARDOUR_UI::config()->get_SmallMonospaceFont());
        double fixfontsize = 81920.0 / (double) ARDOUR::Config->get_font_scale();
 
        font.set_weight (Pango::WEIGHT_NORMAL);
index 52b575abc24ea248f09d03332a56b0bb342921bc..08fab6ff86df705b7652d7be17a5f5b22bbb8ecd 100644 (file)
@@ -2546,7 +2546,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
 
                        // calculate the colors: get the color settings
                        uint32_t fill_color = UINT_RGBA_CHANGE_A(
-                               ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(),
+                               ARDOUR_UI::config()->get_MidiNoteSelected(),
                                128);
 
                        // make the resize preview notes more transparent and bright
@@ -2559,7 +2559,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
                                0.85));
 
                        resize_rect->set_outline_color (NoteBase::calculate_outline (
-                                                               ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected()));
+                                                               ARDOUR_UI::config()->get_MidiNoteSelected()));
 
                        resize_data->resize_rect = resize_rect;
                        _resize_data.push_back(resize_data);
@@ -3213,9 +3213,9 @@ MidiRegionView::set_frame_color()
        }
 
        if (_selected) {
-               f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
+               f = ARDOUR_UI::config()->get_SelectedFrameBase();
        } else if (high_enough_for_name) {
-               f= ARDOUR_UI::config()->get_canvasvar_MidiFrameBase();
+               f= ARDOUR_UI::config()->get_MidiFrameBase();
        } else {
                f = fill_color;
        }
index 55f4732a5c846affe4b4b579138f3bcc76c7b50a..c862a23e040f57b123e77180c0c269d3a41072ab 100644 (file)
@@ -311,7 +311,7 @@ MidiStreamView::draw_note_lines()
                 */
 
                if (i <= highest_note()) {
-                       _note_lines->add (y, 1.0, ARDOUR_UI::config()->get_canvasvar_PianoRollBlackOutline());
+                       _note_lines->add (y, 1.0, ARDOUR_UI::config()->get_PianoRollBlackOutline());
                }
 
                /* now add a thicker line/bar which covers the entire vertical
@@ -324,10 +324,10 @@ MidiStreamView::draw_note_lines()
                case 6:
                case 8:
                case 10:
-                       color = ARDOUR_UI::config()->get_canvasvar_PianoRollBlack();
+                       color = ARDOUR_UI::config()->get_PianoRollBlack();
                        break;
                default:
-                       color = ARDOUR_UI::config()->get_canvasvar_PianoRollWhite();
+                       color = ARDOUR_UI::config()->get_PianoRollWhite();
                        break;
                }
 
@@ -502,11 +502,11 @@ MidiStreamView::setup_rec_box ()
                        gdouble const xend = xstart;
                        uint32_t fill_color;
 
-                       fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
+                       fill_color = ARDOUR_UI::config()->get_RecordingRect();
 
                        ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group);
                        rec_rect->set (ArdourCanvas::Rect (xstart, 1, xend, _trackview.current_height() - 1));
-                       rec_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
+                       rec_rect->set_outline_color (ARDOUR_UI::config()->get_RecordingRect());
                        rec_rect->set_fill_color (fill_color);
                        rec_rect->lower_to_bottom();
 
@@ -579,9 +579,9 @@ MidiStreamView::color_handler ()
        draw_note_lines ();
 
        if (_trackview.is_midi_track()) {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MidiTrackBase());
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_MidiTrackBase());
        } else {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MidiBusBase());
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_MidiBusBase());
        }
 }
 
index 03e9409df22b4dfc07b83e17e7f1192b88a92e85..0b316ec771ef8624b96bbe9c12eb9400adac1bda 100644 (file)
@@ -103,7 +103,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        if (tab.group && tab.group->is_active()) {
                ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
        } else {
-               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->get_canvasvar_InactiveGroupTab(), r, g, b, a);
+               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->get_InactiveGroupTab(), r, g, b, a);
        }
        
        a = 1.0;
index fad2c09b644cdd3a6bcb693777c40630f8425b5d..1a137538d6522a92daa9776d692bb18fd13dc8a5 100644 (file)
@@ -81,7 +81,7 @@ MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::PannerShell> p)
        if (!have_font) {
                Pango::FontDescription font;
                Pango::AttrFontDesc* font_attr;
-               font = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallBoldMonospaceFont());
+               font = Pango::FontDescription (ARDOUR_UI::config()->get_SmallBoldMonospaceFont());
                font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
                panner_font_attributes.change(*font_attr);
                delete font_attr;
@@ -488,12 +488,12 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
 void
 MonoPanner::set_colors ()
 {
-        colors.fill = ARDOUR_UI::config()->get_canvasvar_MonoPannerFill();
-        colors.outline = ARDOUR_UI::config()->get_canvasvar_MonoPannerOutline();
-        colors.text = ARDOUR_UI::config()->get_canvasvar_MonoPannerText();
-        colors.background = ARDOUR_UI::config()->get_canvasvar_MonoPannerBackground();
-        colors.pos_outline = ARDOUR_UI::config()->get_canvasvar_MonoPannerPositionOutline();
-        colors.pos_fill = ARDOUR_UI::config()->get_canvasvar_MonoPannerPositionFill();
+        colors.fill = ARDOUR_UI::config()->get_MonoPannerFill();
+        colors.outline = ARDOUR_UI::config()->get_MonoPannerOutline();
+        colors.text = ARDOUR_UI::config()->get_MonoPannerText();
+        colors.background = ARDOUR_UI::config()->get_MonoPannerBackground();
+        colors.pos_outline = ARDOUR_UI::config()->get_MonoPannerPositionOutline();
+        colors.pos_fill = ARDOUR_UI::config()->get_MonoPannerPositionFill();
 }
 
 void
index 1a02b6e02e1d802e65f4c8980b1f7d0bd587590f..7bc45a4b258c091b2cbcfc987dd7dd5f3a6fc923 100644 (file)
@@ -94,7 +94,7 @@ NoteBase::show_velocity()
        if (!_text) {
                _text = new Text (_item->parent ());
                _text->set_ignore_events (true);
-               _text->set_color (ARDOUR_UI::config()->get_canvasvar_MidiNoteVelocityText());
+               _text->set_color (ARDOUR_UI::config()->get_MidiNoteVelocityText());
                _text->set_alignment (Pango::ALIGN_CENTER);
        }
 
@@ -119,8 +119,8 @@ NoteBase::on_channel_selection_change(uint16_t selection)
 {
        // make note change its color if its channel is not marked active
        if ( (selection & (1 << _note->channel())) == 0 ) {
-               set_fill_color(ARDOUR_UI::config()->get_canvasvar_MidiNoteInactiveChannel());
-               set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteInactiveChannel()));
+               set_fill_color(ARDOUR_UI::config()->get_MidiNoteInactiveChannel());
+               set_outline_color(calculate_outline(ARDOUR_UI::config()->get_MidiNoteInactiveChannel()));
        } else {
                // set the color according to the notes selection state
                set_selected(_selected);
@@ -148,7 +148,7 @@ NoteBase::set_selected(bool selected)
        set_fill_color (base_color());
         
        if (_selected) {
-               set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected()));
+               set_outline_color(calculate_outline(ARDOUR_UI::config()->get_MidiNoteSelected()));
        } else {
                set_outline_color(calculate_outline(base_color()));
        }
@@ -172,13 +172,13 @@ NoteBase::base_color()
        {
                uint32_t color = _region.midi_stream_view()->get_region_color();
                return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (color, opacity), 
-                                        ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(), 
+                                        ARDOUR_UI::config()->get_MidiNoteSelected(), 
                                         0.5);
        }
 
        case ChannelColors:
                return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity), 
-                                        ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(), 0.5);
+                                        ARDOUR_UI::config()->get_MidiNoteSelected(), 0.5);
 
        default:
                return meter_style_fill_color(_note->velocity(), selected());
index 5e52be0732e7577288e16838163147cde433e258..04de75f48f73034c275202aed2ddab71de549c1c 100644 (file)
@@ -105,25 +105,25 @@ class NoteBase : public sigc::trackable
                 if (selected) {
                         if (vel < 64) {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorBase(),
-                                       ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorMid(),
+                                       ARDOUR_UI::config()->get_SelectedMidiNoteColorBase(),
+                                       ARDOUR_UI::config()->get_SelectedMidiNoteColorMid(),
                                        (vel / (double)63.0));
                         } else {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorMid(),
-                                       ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorTop(),
+                                       ARDOUR_UI::config()->get_SelectedMidiNoteColorMid(),
+                                       ARDOUR_UI::config()->get_SelectedMidiNoteColorTop(),
                                        ((vel-64) / (double)63.0));
                         }
                 } else {
                         if (vel < 64) {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->get_canvasvar_MidiNoteColorBase(),
-                                       ARDOUR_UI::config()->get_canvasvar_MidiNoteColorMid(),
+                                       ARDOUR_UI::config()->get_MidiNoteColorBase(),
+                                       ARDOUR_UI::config()->get_MidiNoteColorMid(),
                                        (vel / (double)63.0));
                         } else {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->get_canvasvar_MidiNoteColorMid(),
-                                       ARDOUR_UI::config()->get_canvasvar_MidiNoteColorTop(),
+                                       ARDOUR_UI::config()->get_MidiNoteColorMid(),
+                                       ARDOUR_UI::config()->get_MidiNoteColorTop(),
                                        ((vel-64) / (double)63.0));
                         }
                 }
index b2882f27afbede59231f2f3a2be01654cd203a98..8943981f0920bf31cff7608c6d9440b10b7e2020 100644 (file)
@@ -58,8 +58,8 @@ PatchChange::PatchChange(
        _flag = new ArdourCanvas::Flag (
                parent,
                height,
-               ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeOutline(),
-               ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeFill(),
+               ARDOUR_UI::config()->get_MidiPatchChangeOutline(),
+               ARDOUR_UI::config()->get_MidiPatchChangeFill(),
                ArdourCanvas::Duple (x, y)
                );
        
index d45164ee4279e1a17d344c30f9f2046d22996aa4..5acafad0c3c6af9a81e8a65bc48afdb262410332 100644 (file)
@@ -239,7 +239,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
                 return;
         }
 
-        uint32_t const color = ARDOUR_UI::config()->get_canvasvar_Silence();
+        uint32_t const color = ARDOUR_UI::config()->get_Silence();
 
        for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
 
@@ -280,7 +280,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
         _silence_text = new ArdourCanvas::Text (group);
        _silence_text->set_ignore_events (true);
         _silence_text->set_font_description (get_font_for_style (N_("SilenceText")));
-        _silence_text->set_color (ARDOUR_UI::config()->get_canvasvar_SilenceText());
+        _silence_text->set_color (ARDOUR_UI::config()->get_SilenceText());
 
         /* both positions are relative to the region start offset in source */
 
@@ -792,7 +792,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
        bool me = false;
 
        /* the color that will be used to show parts of regions that will not be heard */
-       uint32_t const non_playing_color = ARDOUR_UI::config()->get_canvasvar_CoveredRegion ();
+       uint32_t const non_playing_color = ARDOUR_UI::config()->get_CoveredRegion ();
 
        while (t < end) {
 
index 9a17b65e074bb1ea6ef83272a0520aea1177e164..b68e814fba131e48d508f6f13b5eeca0e45f903f 100644 (file)
@@ -878,8 +878,8 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layer
 
        if (timestretch_rect == 0) {
                timestretch_rect = new ArdourCanvas::Rectangle (canvas_display ());
-               timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TimeStretchFill());
-               timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeStretchOutline());
+               timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_TimeStretchFill());
+               timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_TimeStretchOutline());
        }
 
        timestretch_rect->show ();
@@ -1771,11 +1771,11 @@ RouteTimeAxisView::color_handler ()
 {
        //case cTimeStretchOutline:
        if (timestretch_rect) {
-               timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeStretchOutline());
+               timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_TimeStretchOutline());
        }
        //case cTimeStretchFill:
        if (timestretch_rect) {
-               timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TimeStretchFill());
+               timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_TimeStretchFill());
        }
 
        reset_meter();
index 6fdf934238a85cba1d852f825241731a5b311afe..1da7a492f1647062af49f5dc5b133c18e23d9614 100644 (file)
@@ -113,7 +113,7 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc)
 
        //background
        pattern = cairo_pattern_create_linear (0, 0, 0, alloc.get_height());
-       uint32_t col = ARDOUR_UI::config()->get_canvasvar_Shuttle();
+       uint32_t col = ARDOUR_UI::config()->get_Shuttle();
        int r,b,g,a;
        UINT_TO_RGBA(col, &r, &g, &b, &a);
        cairo_pattern_add_color_stop_rgb (pattern, 0.0, r/400.0, g/400.0, b/400.0);
index ab923a47be737fece200eed8b01b2792b2f71b12..4492c73cfce06ca7ce48894c82330dda717adcb4 100644 (file)
@@ -87,7 +87,7 @@ StereoPanner::StereoPanner (boost::shared_ptr<PannerShell> p)
        if (!have_font) {
                Pango::FontDescription font;
                Pango::AttrFontDesc* font_attr;
-               font = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallBoldMonospaceFont());
+               font = Pango::FontDescription (ARDOUR_UI::config()->get_SmallBoldMonospaceFont());
                font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
                panner_font_attributes.change(*font_attr);
                delete font_attr;
@@ -667,23 +667,23 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 void
 StereoPanner::set_colors ()
 {
-       colors[Normal].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerFill();
-       colors[Normal].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerOutline();
-       colors[Normal].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerText();
-       colors[Normal].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerBackground();
-       colors[Normal].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
-
-       colors[Mono].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoFill();
-       colors[Mono].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoOutline();
-       colors[Mono].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoText();
-       colors[Mono].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoBackground();
-       colors[Mono].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
-
-       colors[Inverted].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedFill();
-       colors[Inverted].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedOutline();
-       colors[Inverted].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedText();
-       colors[Inverted].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedBackground();
-       colors[Inverted].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
+       colors[Normal].fill = ARDOUR_UI::config()->get_StereoPannerFill();
+       colors[Normal].outline = ARDOUR_UI::config()->get_StereoPannerOutline();
+       colors[Normal].text = ARDOUR_UI::config()->get_StereoPannerText();
+       colors[Normal].background = ARDOUR_UI::config()->get_StereoPannerBackground();
+       colors[Normal].rule = ARDOUR_UI::config()->get_StereoPannerRule();
+
+       colors[Mono].fill = ARDOUR_UI::config()->get_StereoPannerMonoFill();
+       colors[Mono].outline = ARDOUR_UI::config()->get_StereoPannerMonoOutline();
+       colors[Mono].text = ARDOUR_UI::config()->get_StereoPannerMonoText();
+       colors[Mono].background = ARDOUR_UI::config()->get_StereoPannerMonoBackground();
+       colors[Mono].rule = ARDOUR_UI::config()->get_StereoPannerRule();
+
+       colors[Inverted].fill = ARDOUR_UI::config()->get_StereoPannerInvertedFill();
+       colors[Inverted].outline = ARDOUR_UI::config()->get_StereoPannerInvertedOutline();
+       colors[Inverted].text = ARDOUR_UI::config()->get_StereoPannerInvertedText();
+       colors[Inverted].background = ARDOUR_UI::config()->get_StereoPannerInvertedBackground();
+       colors[Inverted].rule = ARDOUR_UI::config()->get_StereoPannerRule();
 }
 
 void
index ffa06aa8ae4fbd0d7c4acf0b611d439c6abfd9f3..817c6237580d098124923d268baf23467a4af5b7 100644 (file)
@@ -36,8 +36,8 @@ SysEx::SysEx (
        _flag = new ArdourCanvas::Flag (
                parent,
                height, 
-               ARDOUR_UI::config()->get_canvasvar_MidiSysExOutline(),
-               ARDOUR_UI::config()->get_canvasvar_MidiSysExFill(),
+               ARDOUR_UI::config()->get_MidiSysExOutline(),
+               ARDOUR_UI::config()->get_MidiSysExFill(),
                ArdourCanvas::Duple (x, y)
                );
        
index 1a3fdaed2e0c82432a75260c39cbc6eaa70f07ec..4c46389b1058ec5b530be023bc94834827fabdb7 100644 (file)
@@ -83,12 +83,12 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
        for (i = begin; i != end; ++i) {
 
                if ((*i).is_bar()) {
-                       color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBar();
+                       color = ARDOUR_UI::config()->get_MeasureLineBar();
                } else {
                        if (beat_density > 0.3) {
                                continue; /* only draw beat lines if the gaps between beats are large. */
                        }
-                       color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBeat();
+                       color = ARDOUR_UI::config()->get_MeasureLineBeat();
                }
 
                ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame);
index 9b3a9178d4ca4498273c7d900a0932838f721ff9..5167d243273c1d0383c27354ba15cc2414e77872 100644 (file)
@@ -1014,7 +1014,7 @@ TimeAxisView::get_selection_rect (uint32_t id)
                rect->rect = new ArdourCanvas::Rectangle (selection_group);
                CANVAS_DEBUG_NAME (rect->rect, "selection rect");
                rect->rect->set_outline (false);
-               rect->rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectionRect());
+               rect->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect());
 
                rect->start_trim = new ArdourCanvas::Rectangle (selection_group);
                CANVAS_DEBUG_NAME (rect->start_trim, "selection rect start trim");
@@ -1179,26 +1179,26 @@ TimeAxisView::color_handler ()
 
        for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
 
-               (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectionRect());
-               (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection());
+               (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect());
+               (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_Selection());
 
-               (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_canvasvar_Selection());
-               (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection());
+               (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_Selection());
+               (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_Selection());
                
-               (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_canvasvar_Selection());
-               (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection());
+               (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_Selection());
+               (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_Selection());
        }
        
        for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
                
-               (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectionRect());
-               (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection());
+               (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect());
+               (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_Selection());
                
-               (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_canvasvar_Selection());
-               (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection());
+               (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_Selection());
+               (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_Selection());
                
-               (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_canvasvar_Selection());
-               (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection());
+               (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_Selection());
+               (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_Selection());
        }
 }
 
index 74651f67f6d1eddd8ad74b4f3539e35d4bde44aa..063fc7305710a0e7b086cd1e7dc07db86fb0fafd 100644 (file)
@@ -73,7 +73,7 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
 void
 TimeAxisViewItem::set_constant_heights ()
 {
-        NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallFont());
+        NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_SmallFont());
 
         Gtk::Window win;
         Gtk::Label foo;
@@ -191,8 +191,8 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
        vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 1.0, 2.0, trackview.current_height()));
        CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
        vestigial_frame->hide ();
-       vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame());
-       vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame());
+       vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_VestigialFrame());
+       vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_VestigialFrame());
 
        if (visibility & ShowFrame) {
                frame = new ArdourCanvas::Rectangle (group, 
@@ -209,9 +209,9 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
                }
 
                if (_recregion) {
-                       frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
+                       frame->set_outline_color (ARDOUR_UI::config()->get_RecordingRect());
                } else {
-                       frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
+                       frame->set_outline_color (ARDOUR_UI::config()->get_TimeAxisFrame());
                }
 
        } else {
@@ -743,7 +743,7 @@ TimeAxisViewItem::fill_opacity () const
                return 130;
        }
 
-       uint32_t col = ARDOUR_UI::config()->get_canvasvar_FrameBase();
+       uint32_t col = ARDOUR_UI::config()->get_FrameBase();
        return UINT_RGBA_A (col);
 }
 
@@ -757,7 +757,7 @@ TimeAxisViewItem::get_fill_color () const
 
        if (_selected) {
 
-                f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
+                f = ARDOUR_UI::config()->get_SelectedFrameBase();
 
                if (o == 0) {
                        /* some condition of this item has set fill opacity to
@@ -770,10 +770,10 @@ TimeAxisViewItem::get_fill_color () const
        } else {
 
                if (_recregion) {
-                       f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
+                       f = ARDOUR_UI::config()->get_RecordingRect();
                } else {
                        if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-                               f = ARDOUR_UI::config()->get_canvasvar_FrameBase();
+                               f = ARDOUR_UI::config()->get_FrameBase();
                        } else {
                                f = fill_color;
                        }
@@ -800,9 +800,9 @@ TimeAxisViewItem::set_frame_color()
                uint32_t f;
 
                 if (_selected) {
-                        f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame();
+                        f = ARDOUR_UI::config()->get_SelectedTimeAxisFrame();
                 } else {
-                        f = ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame();
+                        f = ARDOUR_UI::config()->get_TimeAxisFrame();
                 }
 
                 if (!rect_visible) {
@@ -859,11 +859,11 @@ TimeAxisViewItem::set_trim_handle_colors()
 #else
        if (frame_handle_start) {
                if (position_locked) {
-                       frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
-                       frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
+                       frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
+                       frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
                } else {
-                       frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
-                       frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
+                       frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
+                       frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
                }
        }
 #endif
index 4973cee0b303aa5b98c5a562131ab1be985279c6..04a91a3027339730d3acf56ae72cdfe83c475026 100644 (file)
@@ -44,7 +44,7 @@ VerboseCursor::VerboseCursor (Editor* editor)
 {
        _canvas_item = new ArdourCanvas::TrackingText (_editor->get_noscroll_group());
        CANVAS_DEBUG_NAME (_canvas_item, "verbose canvas cursor");
-       _canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_LargerBoldFont()));
+       _canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_LargerBoldFont()));
        color_handler ();
 
        ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler));
@@ -53,7 +53,7 @@ VerboseCursor::VerboseCursor (Editor* editor)
 void
 VerboseCursor::color_handler ()
 {
-       _canvas_item->set_color (ARDOUR_UI::config()->get_canvasvar_VerboseCanvasCursor());
+       _canvas_item->set_color (ARDOUR_UI::config()->get_VerboseCanvasCursor());
 }
 
 ArdourCanvas::Item *
diff --git a/waf b/waf
index e0fd86648e214d155a198cd82284a00fed583e6c..2cecd67bc0382c186a319eb5ddfdc5c95de57e44 100755 (executable)
Binary files a/waf and b/waf differ