summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/audio_region_view.cc48
-rw-r--r--gtk2_ardour/automation_line.cc2
-rw-r--r--gtk2_ardour/color_aliases.h437
-rw-r--r--gtk2_ardour/dark.colors83
4 files changed, 33 insertions, 537 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index e657b1f5e0..ecd8fe2d5a 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -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_InactiveFadeHandle());
+ fade_in_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
fade_in_handle->set_data ("regionview", this);
fade_in_handle->hide ();
fade_out_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out handle for %1", region()->name()));
fade_out_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
- fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
+ fade_out_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle")());
fade_out_handle->set_data ("regionview", this);
fade_out_handle->hide ();
fade_in_trim_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in trim handle for %1", region()->name()));
fade_in_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
- fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
+ fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle")());
fade_in_trim_handle->set_data ("regionview", this);
fade_in_trim_handle->hide ();
fade_out_trim_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out trim handle for %1", region()->name()));
fade_out_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
- fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
+ fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle")());
fade_out_trim_handle->set_data ("regionview", this);
fade_out_trim_handle->hide ();
}
@@ -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_InactiveCrossfade());
+ start_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade");
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_InactiveCrossfade());
+ end_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade");
end_xfade_rect->set_fill (true);
}
}
@@ -737,14 +737,14 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, frame
if (!start_xfade_curve) {
start_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::Start);
CANVAS_DEBUG_NAME (start_xfade_curve, string_compose ("xfade start out line for %1", region()->name()));
- start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
- start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color ("active crossfade"));
+ start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
start_xfade_curve->set_ignore_events (true);
}
if (!start_xfade_rect) {
start_xfade_rect = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (start_xfade_rect, string_compose ("xfade start rect for %1", region()->name()));
- start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ start_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
start_xfade_rect->set_fill (false);
start_xfade_rect->set_outline (false);
start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this));
@@ -826,15 +826,15 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
if (!end_xfade_curve) {
end_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::End);
CANVAS_DEBUG_NAME (end_xfade_curve, string_compose ("xfade end out line for %1", region()->name()));
- end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
- end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color ("active crossfade"));
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
end_xfade_curve->set_ignore_events (true);
}
if (!end_xfade_rect) {
end_xfade_rect = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (end_xfade_rect, string_compose ("xfade end rect for %1", region()->name()));
- end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ end_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
end_xfade_rect->set_fill (false);
end_xfade_rect->set_outline (false);
end_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_end_xfade_event), end_xfade_rect, this));
@@ -987,26 +987,26 @@ AudioRegionView::set_colors ()
if (gain_line) {
gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_GainLine() :
- ARDOUR_UI::config()->get_GainLineInactive());
+ ARDOUR_UI::config()->color ("gain line") :
+ ARDOUR_UI::config()->color ("gain line inactive"));
}
set_waveform_colors ();
if (start_xfade_curve) {
- start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
- start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color ("active crossfade"));
+ start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
if (end_xfade_curve) {
- end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
- end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color ("active crossfade"));
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
if (start_xfade_rect) {
- start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ start_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
if (end_xfade_rect) {
- end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ end_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
}
@@ -1367,8 +1367,8 @@ AudioRegionView::envelope_active_changed ()
{
if (gain_line) {
gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_GainLine() :
- ARDOUR_UI::config()->get_GainLineInactive());
+ ARDOUR_UI::config()->color ("gain line") :
+ ARDOUR_UI::config()->color ("gain line inactive"));
update_envelope_visibility ();
}
}
@@ -1399,8 +1399,8 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& wave
{
ArdourCanvas::Color fill;
ArdourCanvas::Color outline;
- ArdourCanvas::Color clip = ARDOUR_UI::config()->get_WaveFormClip();
- ArdourCanvas::Color zero = ARDOUR_UI::config()->get_ZeroLine();
+ ArdourCanvas::Color clip = ARDOUR_UI::config()->color ("waveform clip");
+ ArdourCanvas::Color zero = ARDOUR_UI::config()->color ("zero line");
if (_selected) {
if (_region->muted()) {
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index aa4f251299..62c9118ef4 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -926,7 +926,7 @@ AutomationLine::set_selected_points (PointSelection const & points)
void AutomationLine::set_colors ()
{
- set_line_color (ARDOUR_UI::config()->get_AutomationLine());
+ set_line_color (ARDOUR_UI::config()->color ("automation line"));
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
(*i)->set_color ();
}
diff --git a/gtk2_ardour/color_aliases.h b/gtk2_ardour/color_aliases.h
index 405ff0611d..27221dc433 100644
--- a/gtk2_ardour/color_aliases.h
+++ b/gtk2_ardour/color_aliases.h
@@ -1,440 +1,3 @@
/* No guard clauses - used by ui_config.{cc,h} to define various members and
* methods amd included multiple times
*/
-COLOR_ALIAS(ActiveCrossfade,"active crossfade","color 1")
-COLOR_ALIAS(ArrangeBase,"arrange base","color 2")
-COLOR_ALIAS(AudioBusBase,"audio bus base","color 3")
-COLOR_ALIAS(AudioMasterBusBase,"audio master bus base","color 4")
-COLOR_ALIAS(AudioTrackBase,"audio track base","color 5")
-COLOR_ALIAS(AutomationLine,"automation line","color 6")
-COLOR_ALIAS(AutomationTrackFill,"automation track fill","color 5")
-COLOR_ALIAS(AutomationTrackOutline,"automation track outline","color 7")
-COLOR_ALIAS(BigClockActiveBackground,"big clock active: background","color 4")
-COLOR_ALIAS(BigClockActiveCursor,"big clock active: cursor","color 8")
-COLOR_ALIAS(BigClockActiveEditedText,"big clock active: edited text","color 8")
-COLOR_ALIAS(BigClockActiveText,"big clock active: text","color 9")
-COLOR_ALIAS(BigClockBackground,"big clock: background","color 4")
-COLOR_ALIAS(BigClockCursor,"big clock: cursor","color 8")
-COLOR_ALIAS(BigClockEditedText,"big clock: edited text","color 8")
-COLOR_ALIAS(BigClockText,"big clock: text","color 10")
-COLOR_ALIAS(ButtonBorder,"border color","color 4")
-COLOR_ALIAS(CDMarkerBar,"cd marker bar","color 11")
-COLOR_ALIAS(WaveFormClip,"clipped waveform","color 9")
-COLOR_ALIAS(GenericClockBackground,"clock: background","color 4")
-COLOR_ALIAS(GenericClockCursor,"clock: cursor","color 8")
-COLOR_ALIAS(GenericClockEditedText,"clock: edited text","color 8")
-COLOR_ALIAS(GenericClockText,"clock: text","color 12")
-COLOR_ALIAS(ControlPointFill,"control point fill","color 13")
-COLOR_ALIAS(ControlPointOutline,"control point outline","color 9")
-COLOR_ALIAS(ControlPointSelected,"control point selected","color 14")
-COLOR_ALIAS(CrossfadeEditorBase,"crossfade editor base","color 15")
-COLOR_ALIAS(CrossfadeEditorLine,"crossfade editor line","color 4")
-COLOR_ALIAS(CrossfadeEditorLineShading,"crossfade editor line shading","color 16")
-COLOR_ALIAS(CrossfadeEditorPointFill,"crossfade editor point fill","color 17")
-COLOR_ALIAS(CrossfadeEditorPointOutline,"crossfade editor point outline","color 18")
-COLOR_ALIAS(CrossfadeEditorWave,"crossfade editor wave","color 13")
-COLOR_ALIAS(CrossfadeLine,"crossfade line","color 4")
-COLOR_ALIAS(EditPoint,"edit point","color 18")
-COLOR_ALIAS(EnteredAutomationLine,"entered automation line","color 19")
-COLOR_ALIAS(EnteredGainLine,"entered gain line","color 19")
-COLOR_ALIAS(EnteredMarker,"entered marker","color 19")
-COLOR_ALIAS(FeedbackAlertFill,"feedback alert: fill","color 20")
-COLOR_ALIAS(FeedbackAlertFillActive,"feedback alert: fill active","color 9")
-COLOR_ALIAS(FeedbackAlertLED,"feedback alert: led","color 4")
-COLOR_ALIAS(FeedbackAlertLEDActive,"feedback alert: led active","color 4")
-COLOR_ALIAS(FeedbackAlertTextActive,"feedback alert: text","color 21")
-COLOR_ALIAS(FeedbackAlertText,"feedback alert: text active","color 22")
-COLOR_ALIAS(FrameHandle,"frame handle","color 23")
-COLOR_ALIAS(GainLine,"gain line","color 6")
-COLOR_ALIAS(GainLineInactive,"gain line inactive","color 24")
-COLOR_ALIAS(GenericButtonFill,"generic button: fill","color 25")
-COLOR_ALIAS(GenericButtonFillActive,"generic button: fill active","color 9")
-COLOR_ALIAS(GenericButtonLED,"generic button: led","color 15")
-COLOR_ALIAS(GenericButtonLEDActive,"generic button: led active","color 18")
-COLOR_ALIAS(GhostTrackBase,"ghost track base","color 28")
-COLOR_ALIAS(GhostTrackMidiOutline,"ghost track midi outline","color 4")
-COLOR_ALIAS(GhostTrackWaveClip,"ghost track wave","color 29")
-COLOR_ALIAS(GhostTrackWave,"ghost track wave clip","color 29")
-COLOR_ALIAS(GhostTrackWaveFill,"ghost track wave fill","color 29")
-COLOR_ALIAS(GhostTrackZeroLine,"ghost track zero line","color 30")
-COLOR_ALIAS(GtkArm, "gtk_arm","color 9")
-COLOR_ALIAS(GtkAudioBus, "gtk_audio_bus","color 61")
-COLOR_ALIAS(GtkAudioTrack, "gtk_audio_track","color 70")
-COLOR_ALIAS(GtkAutomationTrackHeader,"gtk_automation_track_header", "color 42")
-COLOR_ALIAS(GtkBackground,"gtk_background", "color 12")
-COLOR_ALIAS(GtkBases,"gtk_bases", "color 27")
-COLOR_ALIAS(GtkBgSelected,"gtk_bg_selected", "color 99")
-COLOR_ALIAS(GtkBgTooltip,"gtk_bg_tooltip", "color 52")
-COLOR_ALIAS(GtkBrightColor,"gtk_bright_color", "color 74")
-COLOR_ALIAS(GtkBrightIndicator,"gtk_bright_indicator", "color 9")
-COLOR_ALIAS(GtkContrastingIndicator,"gtk_contrasting_indicator", "color 91")
-COLOR_ALIAS(GtkControlBase,"gtk_control_base", "color 61")
-COLOR_ALIAS(GtkControlText,"gtk_control_text", "color 26")
-COLOR_ALIAS(GtkControlText2,"gtk_control_text2", "color 83")
-COLOR_ALIAS(GtkDarkest,"gtk_darkest", "color 29")
-COLOR_ALIAS(GtkFgSelected,"gtk_fg_selected", "color 18")
-COLOR_ALIAS(GtkFgTooltip,"gtk_fg_tooltip", "color 29")
-COLOR_ALIAS(GtkForeground,"gtk_foreground", "color 50")
-COLOR_ALIAS(GtkLightTextOnDark,"gtk_light_text_on_dark", "color 31")
-COLOR_ALIAS(GtkLightest,"gtk_lightest", "color 13")
-COLOR_ALIAS(GtkMidiChannelSelector,"gtk_midi_channel_selector", "color 44")
-COLOR_ALIAS(GtkMidiTrack,"gtk_midi_track", "color 58")
-COLOR_ALIAS(GtkMonitor,"gtk_monitor", "color 8")
-COLOR_ALIAS(GtkMono,"gtk_mono", "color 95")
-COLOR_ALIAS(GtkMute,"gtk_mute", "color 52")
-COLOR_ALIAS(GtkNotSoBrightIndicator,"gtk_not_so_bright_indicator", "color 32")
-COLOR_ALIAS(GtkProcessorFader,"gtk_processor_fader", "color 94")
-COLOR_ALIAS(GtkProcessorFaderFrame,"gtk_processor_fader_frame", "color 104")
-COLOR_ALIAS(GtkProcessorFrameselected,"gtk_processor_frame_selected", "color 32")
-COLOR_ALIAS(GtkProcessorPostfader,"gtk_processor_postfader", "color 79")
-COLOR_ALIAS(GtkProcessorPostfaderFrame,"gtk_processor_postfader_frame", "color 103")
-COLOR_ALIAS(GtkProcessorPrefader,"gtk_processor_prefader", "color 69")
-COLOR_ALIAS(GtkProcessorPrefaderFrame,"gtk_processor_prefader_frame", "color 69")
-COLOR_ALIAS(GtkSendBg,"gtk_send_bg", "color 70")
-COLOR_ALIAS(GtkSendFg,"gtk_send_fg", "color 24")
-COLOR_ALIAS(GtkSolo,"gtk_solo", "color 91")
-COLOR_ALIAS(GtkSomewhatBrightc,"gtk_somewhat_bright_indicator", "color 89")
-COLOR_ALIAS(GtkTexts,"gtk_texts", "color 50")
-COLOR_ALIAS(GtkTrackHeaderInactive,"gtk_track_header_inactive", "color 84")
-COLOR_ALIAS(GtkTrackHeaderSelected,"gtk_track_header_selected", "color 93")
-COLOR_ALIAS(ImageTrack,"image track","color 31")
-COLOR_ALIAS(InactiveCrossfade,"inactive crossfade","color 32")
-COLOR_ALIAS(InactiveFadeHandle,"inactive fade handle","color 33")
-COLOR_ALIAS(InactiveGroupTab,"inactive group tab","color 34")
-COLOR_ALIAS(InvertButtonFillActive,"invert button: fill active","color 35")
-COLOR_ALIAS(InvertButtonLEDActive,"invert button: led","color 36")
-COLOR_ALIAS(InvertButtonLED,"invert button: led active","color 37")
-COLOR_ALIAS(LocationCDMarker,"location cd marker","color 38")
-COLOR_ALIAS(LocationLoop,"location loop","color 39")
-COLOR_ALIAS(LocationMarker,"location marker","color 32")
-COLOR_ALIAS(LocationPunch,"location punch","color 40")
-COLOR_ALIAS(LocationRange,"location range","color 41")
-COLOR_ALIAS(LockButtonFillActive,"lock button: fill active","color 42")
-COLOR_ALIAS(LockButtonLEDActive,"lock button: led","color 4")
-COLOR_ALIAS(LockButtonLED,"lock button: led active","color 4")
-COLOR_ALIAS(MarkerBar,"marker bar","color 11")
-COLOR_ALIAS(MarkerBarSeparator,"marker bar separator","color 2")
-COLOR_ALIAS(MarkerDragLine,"marker drag line","color 44")
-COLOR_ALIAS(MarkerLabel,"marker label","color 4")
-COLOR_ALIAS(MarkerTrack,"marker track","color 31")
-COLOR_ALIAS(MeasureLineBar,"measure line bar","color 13")
-COLOR_ALIAS(MeasureLineBeat,"measure line beat","color 45")
-COLOR_ALIAS(MeterBackgroundBot,"meter background: bottom","color 46")
-COLOR_ALIAS(MeterBackgroundTop,"meter background: top","color 34")
-COLOR_ALIAS(MeterBar,"meter bar","color 25")
-COLOR_ALIAS(MeterBridgeLabelFill,"meterbridge label: fill","color 34")
-COLOR_ALIAS(MeterBridgeLabelFillActive,"meterbridge label: fill active","color 46")
-COLOR_ALIAS(MeterbridgeLabelLED,"meterbridge label: led","color 9")
-COLOR_ALIAS(MeterbridgeLabelLEDActive,"meterbridge label: led active","color 9")
-COLOR_ALIAS(MeterbridgeLabelText,"meterbridge label: text","color 26")
-COLOR_ALIAS(MeterbridgeLabelTextActive,"meterbridge label: text active","color 9")
-COLOR_ALIAS(MeterbridgePeakindicatorFill,"meterbridge peakindicator: fill","color 34")
-COLOR_ALIAS(MeterbridgePeakindicatorFillActive,"meterbridge peakindicator: fill active","color 9")
-COLOR_ALIAS(MeterbridgePeakindicatorLED,"meterbridge peakindicator: led","color 9")
-COLOR_ALIAS(MeterbridgePeakindicatorLEDActive,"meterbridge peakindicator: led active","color 9")
-COLOR_ALIAS(MeterbridgePeakindicatorText,"meterbridge peakindicator: text","color 9")
-COLOR_ALIAS(MeterbridgePeakindicatorTextActive,"meterbridge peakindicator: text active","color 9")
-COLOR_ALIAS(MeterMarker,"meterbridge peaklabel","color 9")
-COLOR_ALIAS(MeterStripDPMForeground, "meterstrip dpm fg", "color 9")
-COLOR_ALIAS(MeterStripPPMForeground, "meterstrip ppm fg", "color 13")
-COLOR_ALIAS(MeterStripVUForeground, "meterstrip vu fg", "color 4")
-COLOR_ALIAS(MeterStripDPMBackground, "meterstrip dpm bg", "color 9")
-COLOR_ALIAS(MeterStripPPMBackground, "meterstrip ppm bg", "color 27")
-COLOR_ALIAS(MeterStripVUBackground, "meterstrip vu bg", "color 32")
-COLOR_ALIAS(MidiBusBase,"midi bus base","color 4")
-COLOR_ALIAS(MidiDeviceButtonFillActive,"midi device: fill active","color 42")
-COLOR_ALIAS(MidiDeviceButtonLEDActive,"midi device: led","color 49")
-COLOR_ALIAS(MidiDeviceButtonLED,"midi device: led active","color 17")
-COLOR_ALIAS(MidiDeviceButtonTextActive,"midi device: text","color 26")
-COLOR_ALIAS(MidiDeviceButtonText,"midi device: text active","color 50")
-COLOR_ALIAS(MidiFrameBase,"midi frame base","color 51")
-COLOR_ALIAS(MidiInputButtonFillActive,"midi input button: fill active","color 48")
-COLOR_ALIAS(MidiInputButtonLEDActive,"midi input button: led","color 4")
-COLOR_ALIAS(MidiInputButtonLED,"midi input button: led active","color 4")
-COLOR_ALIAS(MidiMeterColor0,"midi meter fill: 0","color 52")
-COLOR_ALIAS(MidiMeterColor1,"midi meter fill: 1","color 53")
-COLOR_ALIAS(MidiMeterColor2,"midi meter fill: 2","color 53")
-COLOR_ALIAS(MidiMeterColor3,"midi meter fill: 3","color 54")
-COLOR_ALIAS(MidiMeterColor4,"midi meter fill: 4","color 54")
-COLOR_ALIAS(MidiMeterColor5,"midi meter fill: 5","color 55")
-COLOR_ALIAS(MidiMeterColor6,"midi meter fill: 6","color 55")
-COLOR_ALIAS(MidiMeterColor7,"midi meter fill: 7","color 56")
-COLOR_ALIAS(MidiMeterColor8,"midi meter fill: 8","color 56")
-COLOR_ALIAS(MidiMeterColor9,"midi meter fill: 9","color 17")
-COLOR_ALIAS(MidiNoteColorTop,"midi note color max","color 52")
-COLOR_ALIAS(MidiNoteColorMid,"midi note color mid","color 57")
-COLOR_ALIAS(MidiNoteColorBase,"midi note color min","color 58")
-COLOR_ALIAS(MidiNoteInactiveChannel,"midi note inactive channel","color 4")
-COLOR_ALIAS(MidiNoteSelected,"midi note selected","color 59")
-COLOR_ALIAS(MidiNoteVelocityText,"midi note velocity text","color 32")
-COLOR_ALIAS(MidiPatchChangeFill,"midi patch change fill","color 60")
-COLOR_ALIAS(MidiPatchChangeInactiveChannelFill,"midi patch change inactive channel fill","color 60")
-COLOR_ALIAS(MidiPatchChangeInactiveChannelOutline,"midi patch change inactive channel outline","color 61")
-COLOR_ALIAS(MidiPatchChangeOutline,"midi patch change outline","color 26")
-COLOR_ALIAS(MidiSelectRectFill,"midi select rect fill","color 62")
-COLOR_ALIAS(MidiSelectRectOutline,"midi select rect outline","color 63")
-COLOR_ALIAS(MidiSysExFill,"midi sysex fill","color 32")
-COLOR_ALIAS(MidiSysExOutline,"midi sysex outline","color 64")
-COLOR_ALIAS(MidiTrackBase,"midi track base","color 65")
-COLOR_ALIAS(MixerStripButtonFillActive,"mixer strip button: fill active","color 8")
-COLOR_ALIAS(MixerStripButtonLED,"mixer strip button: led","color 66")
-COLOR_ALIAS(MixerStripButtonLEDActive,"mixer strip button: led active","color 8")
-COLOR_ALIAS(MixerStripNameButtonFill,"mixer strip name button: fill active","color 67")
-COLOR_ALIAS(MixerStripNameButtonLED,"mixer strip name button: led","color 66")
-COLOR_ALIAS(MixerStripNameButtonLEDActive,"mixer strip name button: led active","color 8")
-COLOR_ALIAS(MonitorButtonFillActive,"monitor button: fill active","color 68")
-COLOR_ALIAS(MonitorButtonLEDActive,"monitor button: led","color 69")
-COLOR_ALIAS(MonitorButtonLED,"monitor button: led active","color 9")
-COLOR_ALIAS(MonitorKnobArcEnd,"monitor knob","color 60")
-COLOR_ALIAS(MonitorKnobArcStart,"monitor knob: arc end","color 70")
-COLOR_ALIAS(MonitorSectionKnob,"monitor knob: arc start","color 16")
-COLOR_ALIAS(MonitorSectionCutButtonFill,"monitor section cut: fill","color 71")
-COLOR_ALIAS(MonitorSectionCutButtonFillActive,"monitor section cut: fill active","color 8")
-COLOR_ALIAS(MonitorSectionCutButtonLED,"monitor section cut: led","color 36")
-COLOR_ALIAS(MonitorSectionCutButtonLEDActive,"monitor section cut: led active","color 37")
-COLOR_ALIAS(MonitorSectionCutButtonText,"monitor section cut: text","color 26")
-COLOR_ALIAS(MonitorSectionCutButtonTextActive,"monitor section cut: text active","color 4")
-COLOR_ALIAS(MonitorSectionDimButtonFill,"monitor section dim: fill","color 71")
-COLOR_ALIAS(MonitorSectionDimButtonFillActive,"monitor section dim: fill active","color 72")
-COLOR_ALIAS(MonitorSectionDimButtonLED,"monitor section dim: led","color 4")
-COLOR_ALIAS(MonitorSectionDimButtonLEDActive,"monitor section dim: led active","color 37")
-COLOR_ALIAS(MonitorSectionDimButtonText,"monitor section dim: text","color 26")
-COLOR_ALIAS(MonitorSectionDimButtonTextActive,"monitor section dim: text active","color 26")
-COLOR_ALIAS(MonitorSectionInvertButtonFill,"monitor section invert: fill","color 71")
-COLOR_ALIAS(MonitorSectionInvertButtonFillActive,"monitor section invert: fill active","color 35")
-COLOR_ALIAS(MonitorSectionInvertButtonLED,"monitor section invert: led","color 36")
-COLOR_ALIAS(MonitorSectionInvertButtonLEDActive,"monitor section invert: led active","color 37")
-COLOR_ALIAS(MonitorSectionInvertButtonText,"monitor section invert: text","color 4")
-COLOR_ALIAS(MonitorSectionInvertButtonTextActive,"monitor section invert: text active","color 4")
-COLOR_ALIAS(MonitorSectionMonoButtonFill,"monitor section mono: fill","color 71")
-COLOR_ALIAS(MonitorSectionMonoButtonFillActive,"monitor section mono: fill active","color 73")
-COLOR_ALIAS(MonitorSectionMonoButtonLED,"monitor section mono: led","color 36")
-COLOR_ALIAS(MonitorSectionMonoButtonLEDActive,"monitor section mono: led active","color 37")
-COLOR_ALIAS(MonitorSectionMonoButtonText,"monitor section mono: text","color 26")
-COLOR_ALIAS(MonitorSectionMonoButtonTextActive,"monitor section mono: text active","color 26")
-COLOR_ALIAS(MonitorSectionSoloButtonFill,"monitor section solo model: fill","color 71")
-COLOR_ALIAS(MonitorSectionSoloButtonFillActive,"monitor section solo model: fill active","color 42")
-COLOR_ALIAS(MonitorSectionSoloButtonLED,"monitor section solo model: led","color 66")
-COLOR_ALIAS(MonitorSectionSoloButtonLEDActive,"monitor section solo model: led active","color 8")
-COLOR_ALIAS(MonitorSectionSoloModelButtonText,"monitor section solo model: text","color 26")
-COLOR_ALIAS(MonitorSectionSoloModelButtonTextActive,"monitor section solo model: text active","color 26")
-COLOR_ALIAS(MonitorSectionSoloModelButtonFill,"monitor section solo: fill","color 71")
-COLOR_ALIAS(MonitorSectionSoloModelButtonFillActive,"monitor section solo: fill active","color 12")
-COLOR_ALIAS(MonitorSectionSoloModelButtonLED,"monitor section solo: led","color 36")
-COLOR_ALIAS(MonitorSectionSoloModelButtonLEDActive,"monitor section solo: led active","color 8")
-COLOR_ALIAS(MonitorSectionSoloButtonText,"monitor section solo: text","color 4")
-COLOR_ALIAS(MonitorSectionSoloButtonTextActive,"monitor section solo: text active","color 4")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonFill,"monitor solo exclusive: fill","color 71")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonFillActive,"monitor solo exclusive: fill active","color 20")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonLED,"monitor solo exclusive: led","color 66")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonLEDActive,"monitor solo exclusive: led active","color 8")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonText,"monitor solo exclusive: text","color 26")
-COLOR_ALIAS(MonitorSectionSoloExclusiveButtonTextActive,"monitor solo exclusive: text active","color 26")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonFill,"monitor solo override: fill","color 71")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonFillActive,"monitor solo override: fill active","color 42")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonLED,"monitor solo override: led","color 66")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonLEDActive,"monitor solo override: led active","color 8")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonText,"monitor solo override: text","color 26")
-COLOR_ALIAS(MonitorSectionSoloOverrideButtonTextActive,"monitor solo override: text active","color 26")
-COLOR_ALIAS(MonoPannerBackground,"mono panner bg","color 61")
-COLOR_ALIAS(MonoPannerFill,"mono panner fill","color 74")
-COLOR_ALIAS(MonoPannerOutline,"mono panner outline","color 70")
-COLOR_ALIAS(MonoPannerPositionFill,"mono panner position fill","color 11")
-COLOR_ALIAS(MonoPannerPositionOutline,"mono panner position outline","color 70")
-COLOR_ALIAS(MonoPannerText,"mono panner text","color 4")
-COLOR_ALIAS(MouseModeButtonFillActive,"mouse mode button: fill active","color 12")
-COLOR_ALIAS(MouseModeButtonLED,"mouse mode button: led","color 66")
-COLOR_ALIAS(MouseModeButtonLEDActive,"mouse mode button: led active","color 8")
-COLOR_ALIAS(MuteButtonFillActive,"mute button: fill active","color 75")
-COLOR_ALIAS(MuteButtonLED,"mute button: led","color 4")
-COLOR_ALIAS(MuteButtonLEDActive,"mute button: led active","color 4")
-COLOR_ALIAS(NameHighlightFill,"name highlight fill","color 18")
-COLOR_ALIAS(NameHighlightOutline,"name highlight outline","color 23")
-COLOR_ALIAS(NudgeButtonFill,"nudge button: fill","color 20")
-COLOR_ALIAS(NudgeButtonFillActive,"nudge button: fill active","color 42")
-COLOR_ALIAS(NudgeButtonLED,"nudge button: led","color 66")
-COLOR_ALIAS(NudgeButtonLEDActive,"nudge button: led active","color 8")
-COLOR_ALIAS(NudgeClockBackground,"nudge clock: background","color 7")
-COLOR_ALIAS(NudgeClockCursor,"nudge clock: cursor","color 8")
-COLOR_ALIAS(NudgeClockEditedText,"nudge clock: edited text","color 8")
-COLOR_ALIAS(NudgeClockText,"nudge clock: text","color 12")
-COLOR_ALIAS(PianoRollBlack,"piano roll black","color 76")
-COLOR_ALIAS(PianoRollBlackOutline,"piano roll black outline","color 10")
-COLOR_ALIAS(PianoRollWhite,"piano roll white","color 45")
-COLOR_ALIAS(PlayHead,"play head","color 9")
-COLOR_ALIAS(PluginBypassButtonFill,"plugin bypass button: fill","color 71")
-COLOR_ALIAS(PluginBypassButtonFillActive,"plugin bypass button: fill active","color 42")
-COLOR_ALIAS(PluginBypassButtonLED,"plugin bypass button: led","color 69")
-COLOR_ALIAS(PluginBypassButtonLEDActive,"plugin bypass button: led active","color 9")
-COLOR_ALIAS(ProcessorAutomationLine,"processor automation line","color 77")
-COLOR_ALIAS(ProcessorControlButtonFill,"processor control button: fill","color 29")
-COLOR_ALIAS(ProcessorControlButtonFillActive,"processor control button: fill active","color 46")
-COLOR_ALIAS(ProcessorControlButtonLED,"processor control button: led","color 67")
-COLOR_ALIAS(ProcessorControlButtonLEDActive,"processor control button: led active","color 16")
-COLOR_ALIAS(ProcessorFaderFill,"processor fader: fill","color 16")
-COLOR_ALIAS(ProcessorFaderFillActive,"processor fader: fill active","color 78")
-COLOR_ALIAS(ProcessorFaderLED,"processor fader: led","color 44")
-COLOR_ALIAS(ProcessorFaderLEDActive,"processor fader: led active","color 37")
-COLOR_ALIAS(ProcessorFaderText,"processor fader: text","color 45")
-COLOR_ALIAS(ProcessorFaderTextActive,"processor fader: text active","color 50")
-COLOR_ALIAS(ProcessorPostFaderFill,"processor postfader: fill","color 58")
-COLOR_ALIAS(ProcessorPostFaderFillActive,"processor postfader: fill active","color 79")
-COLOR_ALIAS(ProcessorPostFaderLED,"processor postfader: led","color 44")
-COLOR_ALIAS(ProcessorPostFaderLEDActive,"processor postfader: led active","color 37")
-COLOR_ALIAS(ProcessorPostFaderText,"processor postfader: text","color 45")
-COLOR_ALIAS(ProcessorPostFaderTextActive,"processor postfader: text active","color 50")
-COLOR_ALIAS(ProcessorPreFaderFill,"processor prefader: fill","color 40")
-COLOR_ALIAS(ProcessorPreFaderFillActive,"processor prefader: fill active","color 80")
-COLOR_ALIAS(ProcessorPreFaderLED,"processor prefader: led","color 44")
-COLOR_ALIAS(ProcessorPreFaderLEDActive,"processor prefader: led active","color 37")
-COLOR_ALIAS(ProcessorPreFaderText,"processor prefader: text","color 45")
-COLOR_ALIAS(ProcessorPreFaderTextActive,"processor prefader: text active","color 50")
-COLOR_ALIAS(PunchButtonFill,"punch button: fill","color 20")
-COLOR_ALIAS(PunchButtonFillActive,"punch button: fill active","color 9")
-COLOR_ALIAS(PunchButtonLED,"punch button: led","color 4")
-COLOR_ALIAS(PunchButtonLEDActive,"punch button: led active","color 4")
-COLOR_ALIAS(PunchClockBackground,"punch clock: background","color 4")
-COLOR_ALIAS(PunchClockCursor,"punch clock: cursor","color 9")
-COLOR_ALIAS(PunchClockEditedText,"punch clock: edited text","color 9")
-COLOR_ALIAS(PunchClockText,"punch clock: text","color 12")
-COLOR_ALIAS(PunchLine,"punch line","color 83")
-COLOR_ALIAS(RangeDragBarRect,"range drag bar rect","color 21")
-COLOR_ALIAS(RangeDragRect,"range drag rect","color 56")
-COLOR_ALIAS(RangeMarkerBar,"range marker bar","color 3")
-COLOR_ALIAS(RecWaveFormFill,"record enable button: fill","color 25")
-COLOR_ALIAS(RecWaveForm,"record waveform","color 83")
-COLOR_ALIAS(RecEnableButtonLED,"record enable button: led","color 84")
-COLOR_ALIAS(RecEnableButtonLEDActive,"record enable button: led active","color 85")
-COLOR_ALIAS(RecEnableButtonFill,"recorded waveform fill","color 13")
-COLOR_ALIAS(RecEnableButtonOutline,"recorded waveform outline","color 43")
-COLOR_ALIAS(RecordingRect,"recording rect","color 86")
-COLOR_ALIAS(RegionListAutomatic, "region list automatic", "color 53")
-COLOR_ALIAS(RegionListMissingSource, "region list missing source", "color 9")
-COLOR_ALIAS(RegionListWholeFile, "region list whole file", "color 1")
-COLOR_ALIAS(CoveredRegion,"region area covered by another region","color 87")
-COLOR_ALIAS(FrameBase,"region base","color 11")
-COLOR_ALIAS(RouteButtonFillActive,"route button: fill active","color 67")
-COLOR_ALIAS(RouteButtonLED,"route button: led","color 66")
-COLOR_ALIAS(RouteButtonLEDActive,"route button: led active","color 8")
-COLOR_ALIAS(RubberBandRect,"rubber band rect","color 88")
-COLOR_ALIAS(RudeAuditionFill,"rude audition: fill","color 20")
-COLOR_ALIAS(RudeAuditionFillActive,"rude audition: fill active","color 86")
-COLOR_ALIAS(RudeAuditionLED,"rude audition: led","color 4")
-COLOR_ALIAS(RudeAuditionLEDActive,"rude audition: led active","color 4")
-COLOR_ALIAS(RudeAuditionText,"rude audition: text","color 21")
-COLOR_ALIAS(RudeAuditionTextActive,"rude audition: text active","color 13")
-COLOR_ALIAS(RudeIsolateFill,"rude isolate: fill","color 42")
-COLOR_ALIAS(RudeIsolateFillActive,"rude isolate: fill active","color 89")
-COLOR_ALIAS(RudeIsolateLED,"rude isolate: led","color 4")
-COLOR_ALIAS(RudeIsolateLEDActive,"rude isolate: led active","color 4")
-COLOR_ALIAS(RudeIsolateText,"rude isolate: text","color 21")
-COLOR_ALIAS(RudeIsolateTextActive,"rude isolate: text active","color 4")
-COLOR_ALIAS(RudeSoloFill,"rude solo: fill","color 20")
-COLOR_ALIAS(RudeSoloFillActive,"rude solo: fill active","color 86")
-COLOR_ALIAS(RudeSoloLED,"rude solo: led","color 4")
-COLOR_ALIAS(RudeSoloLEDActive,"rude solo: led active","color 4")
-COLOR_ALIAS(RudeSoloText,"rude solo: text","color 21")
-COLOR_ALIAS(RudeSoloTextActive,"rude solo: text active","color 22")
-COLOR_ALIAS(RulerBase,"ruler base","color 90")
-COLOR_ALIAS(RulerText,"ruler text","color 22")
-COLOR_ALIAS(SecondaryClockBackground,"secondary clock: background","color 7")
-COLOR_ALIAS(SecondaryClockCursor,"secondary clock: cursor","color 8")
-COLOR_ALIAS(SecondaryClockEditedText,"secondary clock: edited text","color 8")
-COLOR_ALIAS(SecondaryClockText,"secondary clock: text","color 91")
-COLOR_ALIAS(SecondaryDeltaClockBackground,"secondary delta clock: background","color 4")
-COLOR_ALIAS(SecondaryDeltaClockCursor,"secondary delta clock: cursor","color 9")
-COLOR_ALIAS(SecondaryDeltaClockEditedText,"secondary delta clock: edited text","color 9")
-COLOR_ALIAS(SecondaryDeltaClockText,"secondary delta clock: text","color 92")
-COLOR_ALIAS(SelectedCrossfadeEditorLine,"selected crossfade editor line","color 14")
-COLOR_ALIAS(SelectedCrossfadeEditorWave,"selected crossfade editor wave","color 32")
-COLOR_ALIAS(SelectedCrossfadeEditorWaveFill,"selected crossfade editor wave fill","color 4")
-COLOR_ALIAS(SelectedMidiNoteColorTop,"selected midi note color max","color 62")
-COLOR_ALIAS(SelectedMidiNoteColorMid,"selected midi note color mid","color 93")
-COLOR_ALIAS(SelectedMidiNoteColorBase,"selected midi note color min","color 61")
-COLOR_ALIAS(SelectedFrameBase,"selected region base","color 25")
-COLOR_ALIAS(SelectedTimeAxisFrame,"selected time axis frame","color 86")
-COLOR_ALIAS(SelectedWaveFormFill,"selected waveform fill","color 8")
-COLOR_ALIAS(SelectedWaveForm,"selected waveform outline","color 67")
-COLOR_ALIAS(SelectionClockBackground,"selection","color 94")
-COLOR_ALIAS(SelectionClockCursor,"selection clock: background","color 4")
-COLOR_ALIAS(SelectionClockEditedText,"selection clock: cursor","color 9")
-COLOR_ALIAS(SelectionClockText,"selection clock: edited text","color 9")
-COLOR_ALIAS(Selection,"selection clock: text","color 12")
-COLOR_ALIAS(SelectionRect,"selection rect","color 95")
-COLOR_ALIAS(SendBg,"send bg","color 71")
-COLOR_ALIAS(SendButtonFill,"send alert button: fill","color 71")
-COLOR_ALIAS(SendButtonFillActive,"send alert button: fill active","color 96")
-COLOR_ALIAS(SendButtonLED,"send alert button: led","color 4")
-COLOR_ALIAS(SendButtonLEDActive,"send alert button: led active","color 4")
-COLOR_ALIAS(Shuttle,"shuttle","color 12")
-COLOR_ALIAS(Silence,"silence","color 98")
-COLOR_ALIAS(SilenceText,"silence text","color 99")
-COLOR_ALIAS(SoloButtonFill,"solo button: fill active","color 12")
-COLOR_ALIAS(SoloButtonLED,"solo button: led","color 4")
-COLOR_ALIAS(SoloButtonLEDActive,"solo button: led active","color 4")
-COLOR_ALIAS(SoloIsolateButtonFillActive,"solo isolate: fill active","color 42")
-COLOR_ALIAS(SoloIsolateButtonLED,"solo isolate: led","color 69")
-COLOR_ALIAS(SoloIsolateButtonLEDActive,"solo isolate: led active","color 9")
-COLOR_ALIAS(SoloSafeButtonFill,"solo safe: fill active","color 42")
-COLOR_ALIAS(SoloSafeButtonLED,"solo safe: led","color 69")
-COLOR_ALIAS(SoloSafeButtonLEDActive,"solo safe: led active","color 9")
-COLOR_ALIAS(StereoPannerBackground,"stereo panner bg","color 61")
-COLOR_ALIAS(StereoPannerFill,"stereo panner fill","color 74")
-COLOR_ALIAS(StereoPannerInvertedBackground,"stereo panner inverted bg","color 61")
-COLOR_ALIAS(StereoPannerInvertedFill,"stereo panner inverted fill","color 100")
-COLOR_ALIAS(StereoPannerInvertedOutline,"stereo panner inverted outline","color 83")
-COLOR_ALIAS(StereoPannerInvertedText,"stereo panner inverted text","color 4")
-COLOR_ALIAS(StereoPannerMonoBackground,"stereo panner mono bg","color 61")
-COLOR_ALIAS(StereoPannerMonoFill,"stereo panner mono fill","color 54")
-COLOR_ALIAS(StereoPannerMonoOutline,"stereo panner mono outline","color 101")
-COLOR_ALIAS(StereoPannerMonoText,"stereo panner mono text","color 4")
-COLOR_ALIAS(StereoPannerOutline,"stereo panner outline","color 70")
-COLOR_ALIAS(StereoPannerRule,"stereo panner rule","color 70")
-COLOR_ALIAS(StereoPannerText,"stereo panner text","color 4")
-COLOR_ALIAS(TempoBar,"tempo bar","color 102")
-COLOR_ALIAS(TempoMarker,"tempo marker","color 19")
-COLOR_ALIAS(TimeAxisFrame,"time axis frame","color 4")
-COLOR_ALIAS(TimeStretchFill,"time stretch fill","color 26")
-COLOR_ALIAS(TimeStretchOutline,"time stretch outline","color 94")
-COLOR_ALIAS(TrackNumberLabelFill,"tracknumber label: fill","color 34")
-COLOR_ALIAS(TrackNumberLabelFillActive,"tracknumber label: fill active","color 46")
-COLOR_ALIAS(TrackNumberLabelLED,"tracknumber label: led","color 9")
-COLOR_ALIAS(TrackNumberLabelLEDActive,"tracknumber label: led active","color 9")
-COLOR_ALIAS(TrackNumberLabelText,"tracknumber label: text","color 26")
-COLOR_ALIAS(TrackNumberLabelTextActive,"tracknumber label: text active","color 9")
-COLOR_ALIAS(TransportActiveOptionButtonFillActive,"transport active option button: fill active","color 48")
-COLOR_ALIAS(TransportActiveOptionButtonLED,"transport active option button: led","color 66")
-COLOR_ALIAS(TransportActiveOptionButtonLEDActive,"transport active option button: led active","color 8")
-COLOR_ALIAS(TransportButtonFillActive,"transport button: fill active","color 48")
-COLOR_ALIAS(TransportButtonLED,"transport button: led","color 4")
-COLOR_ALIAS(TransportButtonLEDActive,"transport button: led active","color 4")
-COLOR_ALIAS(TransportClockBackground,"transport clock: background","color 7")
-COLOR_ALIAS(TransportClockCursor,"transport clock: cursor","color 8")
-COLOR_ALIAS(TransportClockEditedText,"transport clock: edited text","color 8")
-COLOR_ALIAS(TransportClockText,"transport clock: text","color 91")
-COLOR_ALIAS(TransportDeltaClockBackground,"transport delta clock: background","color 4")
-COLOR_ALIAS(TransportDeltaClockCursor,"transport delta clock: cursor","color 9")
-COLOR_ALIAS(TransportDeltaClockEditedText,"transport delta clock: edited text","color 9")
-COLOR_ALIAS(TransportDeltaClockText,"transport delta clock: text","color 92")
-COLOR_ALIAS(TransportDragRect,"transport drag rect","color 21")
-COLOR_ALIAS(TransportLoopRect,"transport loop rect","color 103")
-COLOR_ALIAS(TransportMarkerBar,"transport marker bar","color 11")
-COLOR_ALIAS(TransportOptionButtonFillActive,"transport option button: fill active","color 42")
-COLOR_ALIAS(TransportOptionButtonLED,"transport option button: led","color 66")
-COLOR_ALIAS(TransportOptionButtonLEDActive,"transport option button: led active","color 8")
-COLOR_ALIAS(TransportPunchRect,"transport punch rect","color 80")
-COLOR_ALIAS(TransportRecenableButtonFill,"transport recenable button: fill","color 20")
-COLOR_ALIAS(TransportRecenableButtonFillActive,"transport recenable button: fill active","color 83")
-COLOR_ALIAS(TransportRecenableButtonLED,"transport recenable button: led","color 4")
-COLOR_ALIAS(TransportRecenableButtonLEDActive,"transport recenable button: led active","color 4")
-COLOR_ALIAS(TrimHandle,"trim handle","color 18")
-COLOR_ALIAS(TrimHandleLocked,"trim handle locked","color 86")
-COLOR_ALIAS(VerboseCanvasCursor,"verbose canvas cursor","color 32")
-COLOR_ALIAS(VestigialFrame,"vestigial frame","color 4")
-COLOR_ALIAS(VideoBar,"video timeline bar","color 46")
-COLOR_ALIAS(WaveFormFill,"waveform fill","color 13")
-COLOR_ALIAS(WaveForm,"waveform outline","color 4")
-COLOR_ALIAS(ZeroLine,"zero line","color 104")
-COLOR_ALIAS(ZoomButtonFillActive,"zoom button: fill active","color 48")
-COLOR_ALIAS(ZoomButtonLED,"zoom button: led","color 66")
-COLOR_ALIAS(ZoomButtonLEDActive,"zoom button: led active","color 8")
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index be4a34f3ff..204740c9ec 100644
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -172,16 +172,12 @@
<ColorAlias name="entered marker" alias="color 19"/>
<ColorAlias name="feedback alert: fill" alias="color 20"/>
<ColorAlias name="feedback alert: fill active" alias="color 9"/>
- <ColorAlias name="feedback alert: led" alias="color 4"/>
<ColorAlias name="feedback alert: led active" alias="color 4"/>
- <ColorAlias name="feedback alert: text" alias="color 21"/>
- <ColorAlias name="feedback alert: text active" alias="color 22"/>
<ColorAlias name="frame handle" alias="color 23"/>
<ColorAlias name="gain line" alias="color 6"/>
<ColorAlias name="gain line inactive" alias="color 24"/>
<ColorAlias name="generic button: fill" alias="color 25"/>
<ColorAlias name="generic button: fill active" alias="color 9"/>
- <ColorAlias name="generic button: led" alias="color 15"/>
<ColorAlias name="generic button: led active" alias="color 18"/>
<ColorAlias name="ghost track base" alias="color 28"/>
<ColorAlias name="ghost track midi outline" alias="color 4"/>
@@ -234,7 +230,6 @@
<ColorAlias name="inactive fade handle" alias="color 33"/>
<ColorAlias name="inactive group tab" alias="color 34"/>
<ColorAlias name="invert button: fill active" alias="color 35"/>
- <ColorAlias name="invert button: led" alias="color 36"/>
<ColorAlias name="invert button: led active" alias="color 37"/>
<ColorAlias name="location cd marker" alias="color 38"/>
<ColorAlias name="location loop" alias="color 39"/>
@@ -242,7 +237,6 @@
<ColorAlias name="location punch" alias="color 40"/>
<ColorAlias name="location range" alias="color 41"/>
<ColorAlias name="lock button: fill active" alias="color 42"/>
- <ColorAlias name="lock button: led" alias="color 4"/>
<ColorAlias name="lock button: led active" alias="color 4"/>
<ColorAlias name="marker bar" alias="color 11"/>
<ColorAlias name="marker bar separator" alias="color 2"/>
@@ -274,13 +268,9 @@
<ColorAlias name="midi bus base" alias="color 4"/>
<ColorAlias name="midi device: fill" alias="color 25"/>
<ColorAlias name="midi device: fill active" alias="color 42"/>
- <ColorAlias name="midi device: led" alias="color 49"/>
<ColorAlias name="midi device: led active" alias="color 17"/>
- <ColorAlias name="midi device: text" alias="color 26"/>
- <ColorAlias name="midi device: text active" alias="color 50"/>
<ColorAlias name="midi frame base" alias="color 51"/>
<ColorAlias name="midi input button: fill active" alias="color 48"/>
- <ColorAlias name="midi input button: led" alias="color 4"/>
<ColorAlias name="midi input button: led active" alias="color 4"/>
<ColorAlias name="midi meter fill: 0" alias="color 52"/>
<ColorAlias name="midi meter fill: 1" alias="color 53"/>
@@ -308,65 +298,38 @@
<ColorAlias name="midi sysex outline" alias="color 64"/>
<ColorAlias name="midi track base" alias="color 65"/>
<ColorAlias name="mixer strip button: fill active" alias="color 8"/>
- <ColorAlias name="mixer strip button: led" alias="color 66"/>
<ColorAlias name="mixer strip button: led active" alias="color 8"/>
<ColorAlias name="mixer strip name button: fill active" alias="color 67"/>
- <ColorAlias name="mixer strip name button: led" alias="color 66"/>
<ColorAlias name="mixer strip name button: led active" alias="color 8"/>
<ColorAlias name="monitor button: fill active" alias="color 68"/>
- <ColorAlias name="monitor button: led" alias="color 69"/>
<ColorAlias name="monitor button: led active" alias="color 9"/>
<ColorAlias name="monitor knob" alias="color 60"/>
<ColorAlias name="monitor knob: arc end" alias="color 70"/>
<ColorAlias name="monitor knob: arc start" alias="color 16"/>
<ColorAlias name="monitor section cut: fill" alias="color 71"/>
<ColorAlias name="monitor section cut: fill active" alias="color 8"/>
- <ColorAlias name="monitor section cut: led" alias="color 36"/>
<ColorAlias name="monitor section cut: led active" alias="color 37"/>
- <ColorAlias name="monitor section cut: text" alias="color 26"/>
- <ColorAlias name="monitor section cut: text active" alias="color 4"/>
<ColorAlias name="monitor section dim: fill" alias="color 71"/>
<ColorAlias name="monitor section dim: fill active" alias="color 72"/>
- <ColorAlias name="monitor section dim: led" alias="color 4"/>
<ColorAlias name="monitor section dim: led active" alias="color 37"/>
- <ColorAlias name="monitor section dim: text" alias="color 26"/>
- <ColorAlias name="monitor section dim: text active" alias="color 26"/>
<ColorAlias name="monitor section invert: fill" alias="color 71"/>
<ColorAlias name="monitor section invert: fill active" alias="color 35"/>
- <ColorAlias name="monitor section invert: led" alias="color 36"/>
<ColorAlias name="monitor section invert: led active" alias="color 37"/>
- <ColorAlias name="monitor section invert: text" alias="color 4"/>
- <ColorAlias name="monitor section invert: text active" alias="color 4"/>
<ColorAlias name="monitor section mono: fill" alias="color 71"/>
<ColorAlias name="monitor section mono: fill active" alias="color 73"/>
- <ColorAlias name="monitor section mono: led" alias="color 36"/>
<ColorAlias name="monitor section mono: led active" alias="color 37"/>
- <ColorAlias name="monitor section mono: text" alias="color 26"/>
- <ColorAlias name="monitor section mono: text active" alias="color 26"/>
<ColorAlias name="monitor section solo model: fill" alias="color 71"/>
<ColorAlias name="monitor section solo model: fill active" alias="color 42"/>
- <ColorAlias name="monitor section solo model: led" alias="color 66"/>
<ColorAlias name="monitor section solo model: led active" alias="color 8"/>
- <ColorAlias name="monitor section solo model: text" alias="color 26"/>
- <ColorAlias name="monitor section solo model: text active" alias="color 26"/>
<ColorAlias name="monitor section solo: fill" alias="color 71"/>
<ColorAlias name="monitor section solo: fill active" alias="color 12"/>
- <ColorAlias name="monitor section solo: led" alias="color 36"/>
<ColorAlias name="monitor section solo: led active" alias="color 8"/>
- <ColorAlias name="monitor section solo: text" alias="color 4"/>
- <ColorAlias name="monitor section solo: text active" alias="color 4"/>
<ColorAlias name="monitor solo exclusive: fill" alias="color 71"/>
<ColorAlias name="monitor solo exclusive: fill active" alias="color 20"/>
- <ColorAlias name="monitor solo exclusive: led" alias="color 66"/>
<ColorAlias name="monitor solo exclusive: led active" alias="color 8"/>
- <ColorAlias name="monitor solo exclusive: text" alias="color 26"/>
- <ColorAlias name="monitor solo exclusive: text active" alias="color 26"/>
<ColorAlias name="monitor solo override: fill" alias="color 71"/>
<ColorAlias name="monitor solo override: fill active" alias="color 42"/>
- <ColorAlias name="monitor solo override: led" alias="color 66"/>
<ColorAlias name="monitor solo override: led active" alias="color 8"/>
- <ColorAlias name="monitor solo override: text" alias="color 26"/>
- <ColorAlias name="monitor solo override: text active" alias="color 26"/>
<ColorAlias name="mono panner bg" alias="color 67"/>
<ColorAlias name="mono panner fill" alias="color 74"/>
<ColorAlias name="mono panner outline" alias="color 70"/>
@@ -374,16 +337,13 @@
<ColorAlias name="mono panner position outline" alias="color 70"/>
<ColorAlias name="mono panner text" alias="color 4"/>
<ColorAlias name="mouse mode button: fill active" alias="color 12"/>
- <ColorAlias name="mouse mode button: led" alias="color 66"/>
<ColorAlias name="mouse mode button: led active" alias="color 8"/>
<ColorAlias name="mute button: fill active" alias="color 75"/>
- <ColorAlias name="mute button: led" alias="color 4"/>
<ColorAlias name="mute button: led active" alias="color 4"/>
<ColorAlias name="name highlight fill" alias="color 18"/>
<ColorAlias name="name highlight outline" alias="color 23"/>
<ColorAlias name="nudge button: fill" alias="color 20"/>
<ColorAlias name="nudge button: fill active" alias="color 42"/>
- <ColorAlias name="nudge button: led" alias="color 66"/>
<ColorAlias name="nudge button: led active" alias="color 8"/>
<ColorAlias name="nudge clock: background" alias="color 67"/>
<ColorAlias name="nudge clock: cursor" alias="color 8"/>
@@ -395,34 +355,22 @@
<ColorAlias name="play head" alias="color 9"/>
<ColorAlias name="plugin bypass button: fill" alias="color 71"/>
<ColorAlias name="plugin bypass button: fill active" alias="color 42"/>
- <ColorAlias name="plugin bypass button: led" alias="color 69"/>
<ColorAlias name="plugin bypass button: led active" alias="color 9"/>
<ColorAlias name="processor automation line" alias="color 77"/>
<ColorAlias name="processor control button: fill" alias="color 29"/>
<ColorAlias name="processor control button: fill active" alias="color 46"/>
- <ColorAlias name="processor control button: led" alias="color 67"/>
<ColorAlias name="processor control button: led active" alias="color 16"/>
<ColorAlias name="processor fader: fill" alias="color 16"/>
<ColorAlias name="processor fader: fill active" alias="color 78"/>
- <ColorAlias name="processor fader: led" alias="color 44"/>
<ColorAlias name="processor fader: led active" alias="color 37"/>
- <ColorAlias name="processor fader: text" alias="color 45"/>
- <ColorAlias name="processor fader: text active" alias="color 50"/>
<ColorAlias name="processor postfader: fill" alias="color 58"/>
<ColorAlias name="processor postfader: fill active" alias="color 79"/>
- <ColorAlias name="processor postfader: led" alias="color 44"/>
<ColorAlias name="processor postfader: led active" alias="color 37"/>
- <ColorAlias name="processor postfader: text" alias="color 45"/>
- <ColorAlias name="processor postfader: text active" alias="color 50"/>
<ColorAlias name="processor prefader: fill" alias="color 40"/>
<ColorAlias name="processor prefader: fill active" alias="color 80"/>
- <ColorAlias name="processor prefader: led" alias="color 44"/>
<ColorAlias name="processor prefader: led active" alias="color 37"/>
- <ColorAlias name="processor prefader: text" alias="color 45"/>
- <ColorAlias name="processor prefader: text active" alias="color 50"/>
<ColorAlias name="punch button: fill" alias="color 20"/>
<ColorAlias name="punch button: fill active" alias="color 9"/>
- <ColorAlias name="punch button: led" alias="color 4"/>
<ColorAlias name="punch button: led active" alias="color 4"/>
<ColorAlias name="punch clock: background" alias="color 67"/>
<ColorAlias name="punch clock: cursor" alias="color 9"/>
@@ -433,7 +381,6 @@
<ColorAlias name="range drag rect" alias="color 56"/>
<ColorAlias name="range marker bar" alias="color 3"/>
<ColorAlias name="record enable button: fill active" alias="color 83"/>
- <ColorAlias name="record enable button: led" alias="color 84"/>
<ColorAlias name="record enable button: led active" alias="color 85"/>
<ColorAlias name="recorded waveform fill" alias="color 13"/>
<ColorAlias name="recorded waveform outline" alias="color 43"/>
@@ -444,28 +391,24 @@
<ColorAlias name="region area covered by another region" alias="color 87"/>
<ColorAlias name="region base" alias="color 11"/>
<ColorAlias name="route button: fill active" alias="color 67"/>
- <ColorAlias name="route button: led" alias="color 66"/>
<ColorAlias name="route button: led active" alias="color 8"/>
<ColorAlias name="rubber band rect" alias="color 88"/>
<ColorAlias name="rude audition: fill" alias="color 20"/>
<ColorAlias name="rude audition: fill active" alias="color 86"/>
- <ColorAlias name="rude audition: led" alias="color 4"/>
<ColorAlias name="rude audition: led active" alias="color 4"/>
- <ColorAlias name="rude audition: text" alias="color 21"/>
- <ColorAlias name="rude audition: text active" alias="color 13"/>
<ColorAlias name="rude isolate: fill" alias="color 42"/>
<ColorAlias name="rude isolate: fill active" alias="color 89"/>
- <ColorAlias name="rude isolate: led" alias="color 4"/>
<ColorAlias name="rude isolate: led active" alias="color 4"/>
- <ColorAlias name="rude isolate: text" alias="color 21"/>
- <ColorAlias name="rude isolate: text active" alias="color 4"/>
<ColorAlias name="rude solo: fill" alias="color 20"/>
<ColorAlias name="rude solo: fill active" alias="color 86"/>
- <ColorAlias name="rude solo: led" alias="color 4"/>
<ColorAlias name="rude solo: led active" alias="color 4"/>
+<<<<<<< Updated upstream
<ColorAlias name="rude solo: text" alias="color 21"/>
<ColorAlias name="rude solo: text active" alias="color 22"/>
<ColorAlias name="ruler base" alias="color 67"/>
+=======
+ <ColorAlias name="ruler base" alias="color 90"/>
+>>>>>>> Stashed changes
<ColorAlias name="ruler text" alias="color 22"/>
<ColorAlias name="secondary clock: background" alias="color 67"/>
<ColorAlias name="secondary clock: cursor" alias="color 8"/>
@@ -494,27 +437,25 @@
<ColorAlias name="send bg" alias="color 38"/>
<ColorAlias name="send alert button: fill" alias="color 71"/>
<ColorAlias name="send alert button: fill active" alias="color 38"/>
- <ColorAlias name="send alert button: led" alias="color 4"/>
<ColorAlias name="send alert button: led active" alias="color 4"/>
<ColorAlias name="shuttle" alias="color 12"/>
<ColorAlias name="silence" alias="color 98"/>
<ColorAlias name="silence text" alias="color 99"/>
<ColorAlias name="solo button: fill active" alias="color 12"/>
- <ColorAlias name="solo button: led" alias="color 4"/>
<ColorAlias name="solo button: led active" alias="color 4"/>
<ColorAlias name="solo isolate: fill" alias="color 25"/>
<ColorAlias name="solo isolate: fill active" alias="color 42"/>
- <ColorAlias name="solo isolate: led" alias="color 69"/>
<ColorAlias name="solo isolate: led active" alias="color 9"/>
- <ColorAlias name="solo isolate: text" alias="color 26"/>
- <ColorAlias name="solo isolate: text active" alias="color 26"/>
<ColorAlias name="solo safe: fill" alias="color 25"/>
<ColorAlias name="solo safe: fill active" alias="color 42"/>
- <ColorAlias name="solo safe: led" alias="color 69"/>
<ColorAlias name="solo safe: led active" alias="color 9"/>
+<<<<<<< Updated upstream
<ColorAlias name="solo safe: text" alias="color 26"/>
<ColorAlias name="solo safe: text active" alias="color 26"/>
<ColorAlias name="stereo panner bg" alias="color 67"/>
+=======
+ <ColorAlias name="stereo panner bg" alias="color 61"/>
+>>>>>>> Stashed changes
<ColorAlias name="stereo panner fill" alias="color 74"/>
<ColorAlias name="stereo panner inverted bg" alias="color 61"/>
<ColorAlias name="stereo panner inverted fill" alias="color 100"/>
@@ -534,15 +475,10 @@
<ColorAlias name="time stretch outline" alias="color 94"/>
<ColorAlias name="tracknumber label: fill" alias="color 34"/>
<ColorAlias name="tracknumber label: fill active" alias="color 46"/>
- <ColorAlias name="tracknumber label: led" alias="color 9"/>
<ColorAlias name="tracknumber label: led active" alias="color 9"/>
- <ColorAlias name="tracknumber label: text" alias="color 26"/>
- <ColorAlias name="tracknumber label: text active" alias="color 9"/>
<ColorAlias name="transport active option button: fill active" alias="color 48"/>
- <ColorAlias name="transport active option button: led" alias="color 66"/>
<ColorAlias name="transport active option button: led active" alias="color 8"/>
<ColorAlias name="transport button: fill active" alias="color 48"/>
- <ColorAlias name="transport button: led" alias="color 4"/>
<ColorAlias name="transport button: led active" alias="color 4"/>
<ColorAlias name="transport clock: background" alias="color 67"/>
<ColorAlias name="transport clock: cursor" alias="color 8"/>
@@ -556,12 +492,10 @@
<ColorAlias name="transport loop rect" alias="color 103"/>
<ColorAlias name="transport marker bar" alias="color 11"/>
<ColorAlias name="transport option button: fill active" alias="color 42"/>
- <ColorAlias name="transport option button: led" alias="color 66"/>
<ColorAlias name="transport option button: led active" alias="color 8"/>
<ColorAlias name="transport punch rect" alias="color 80"/>
<ColorAlias name="transport recenable button: fill" alias="color 20"/>
<ColorAlias name="transport recenable button: fill active" alias="color 83"/>
- <ColorAlias name="transport recenable button: led" alias="color 4"/>
<ColorAlias name="transport recenable button: led active" alias="color 4"/>
<ColorAlias name="trim handle" alias="color 18"/>
<ColorAlias name="trim handle locked" alias="color 86"/>
@@ -572,7 +506,6 @@
<ColorAlias name="waveform outline" alias="color 4"/>
<ColorAlias name="zero line" alias="color 104"/>
<ColorAlias name="zoom button: fill active" alias="color 48"/>
- <ColorAlias name="zoom button: led" alias="color 66"/>
<ColorAlias name="zoom button: led active" alias="color 8"/>
</ColorAliases>
</Ardour>