smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

initial pass to replace all UIConfiguration::get_XXXXXX() calls with UIConfiguration::color(name).

Browse source 
IMPORTANT: names have not been downcased and spaced yet, so many colors are not found
This commit is contained in:
Paul Davis 2014-12-14 12:27:07 -05:00
parent 0fa5643d20
commit 48a7a11974
31 changed files with 201 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gtk2_ardour/audio_region_view.cc
View file

@ -160,21 +160,21 @@ AudioRegionView::init (bool wfd)
fade_out_handle = new ArdourCanvas::Rectangle (group); fade_out_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out handle for %1", region()->name())); 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_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
fade_out_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle")()); fade_out_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
fade_out_handle->set_data ("regionview", this); fade_out_handle->set_data ("regionview", this);
fade_out_handle->hide (); fade_out_handle->hide ();
fade_in_trim_handle = new ArdourCanvas::Rectangle (group); fade_in_trim_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in trim handle for %1", region()->name())); 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_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle")()); 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->set_data ("regionview", this);
fade_in_trim_handle->hide (); fade_in_trim_handle->hide ();
fade_out_trim_handle = new ArdourCanvas::Rectangle (group); fade_out_trim_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out trim handle for %1", region()->name())); 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_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle")()); 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->set_data ("regionview", this);
fade_out_trim_handle->hide (); fade_out_trim_handle->hide ();
} }
@ -315,7 +315,7 @@ AudioRegionView::fade_in_active_changed ()
if (audio_region()->fade_in_active()) { if (audio_region()->fade_in_active()) {
start_xfade_rect->set_fill (false); start_xfade_rect->set_fill (false);
} else { } else {
start_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade"); start_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade"));
start_xfade_rect->set_fill (true); start_xfade_rect->set_fill (true);
} }
} }
@ -328,7 +328,7 @@ AudioRegionView::fade_out_active_changed ()
if (audio_region()->fade_out_active()) { if (audio_region()->fade_out_active()) {
end_xfade_rect->set_fill (false); end_xfade_rect->set_fill (false);
} else { } else {
end_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade"); end_xfade_rect->set_fill_color (ARDOUR_UI::config()->color ("inactive crossfade"));
end_xfade_rect->set_fill (true); end_xfade_rect->set_fill (true);
} }
} }
@ -1405,24 +1405,24 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& wave
if (_selected) { if (_selected) {
if (_region->muted()) { if (_region->muted()) {
/* hide outline with zero alpha */ /* hide outline with zero alpha */
outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveForm(), 0); outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("SelectedWaveForm"), 0);
fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveFormFill(), MUTED_ALPHA); fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("SelectedWaveFormFill"), MUTED_ALPHA);
} else { } else {
outline = ARDOUR_UI::config()->get_SelectedWaveForm(); outline = ARDOUR_UI::config()->color ("SelectedWaveForm");
fill = ARDOUR_UI::config()->get_SelectedWaveFormFill(); fill = ARDOUR_UI::config()->color ("SelectedWaveFormFill");
} }
} else { } else {
if (_recregion) { if (_recregion) {
outline = ARDOUR_UI::config()->get_RecWaveForm(); outline = ARDOUR_UI::config()->color ("RecWaveForm");
fill = ARDOUR_UI::config()->get_RecWaveFormFill(); fill = ARDOUR_UI::config()->color ("RecWaveFormFill");
} else { } else {
if (_region->muted()) { if (_region->muted()) {
/* hide outline with zero alpha */ /* hide outline with zero alpha */
outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveForm(), 0); outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("WaveForm"), 0);
fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveFormFill(), MUTED_ALPHA); fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("WaveFormFill"), MUTED_ALPHA);
} else { } else {
outline = ARDOUR_UI::config()->get_WaveForm(); outline = ARDOUR_UI::config()->color ("WaveForm");
fill = ARDOUR_UI::config()->get_WaveFormFill(); fill = ARDOUR_UI::config()->color ("WaveFormFill");
} }
} }
} }

12
gtk2_ardour/audio_streamview.cc
View file

@ -249,12 +249,12 @@ AudioStreamView::setup_rec_box ()
case Normal: case Normal:
case NonLayered: case NonLayered:
xend = xstart; xend = xstart;
fill_color = ARDOUR_UI::config()->get_RecordingRect(); fill_color = ARDOUR_UI::config()->color ("RecordingRect");
break; break;
case Destructive: case Destructive:
xend = xstart + 2; xend = xstart + 2;
fill_color = ARDOUR_UI::config()->get_RecordingRect(); fill_color = ARDOUR_UI::config()->color ("RecordingRect");
/* make the recording rect translucent to allow /* make the recording rect translucent to allow
the user to see the peak data coming in, etc. the user to see the peak data coming in, etc.
*/ */
@ -273,7 +273,7 @@ AudioStreamView::setup_rec_box ()
rec_rect->set_x1 (xend); rec_rect->set_x1 (xend);
rec_rect->set_y1 (child_height ()); rec_rect->set_y1 (child_height ());
rec_rect->set_outline_what (ArdourCanvas::Rectangle::What (0)); rec_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
rec_rect->set_outline_color (ARDOUR_UI::config()->get_TimeAxisFrame()); rec_rect->set_outline_color (ARDOUR_UI::config()->color ("TimeAxisFrame"));
rec_rect->set_fill_color (fill_color); rec_rect->set_fill_color (fill_color);
RecBoxInfo recbox; RecBoxInfo recbox;
@ -516,15 +516,15 @@ AudioStreamView::color_handler ()
{ {
//case cAudioTrackBase: //case cAudioTrackBase:
if (_trackview.is_track()) { if (_trackview.is_track()) {
canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioTrackBase()); canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("AudioTrackBase"));
} }
//case cAudioBusBase: //case cAudioBusBase:
if (!_trackview.is_track()) { if (!_trackview.is_track()) {
if (Profile->get_sae() && _trackview.route()->is_master()) { if (Profile->get_sae() && _trackview.route()->is_master()) {
canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioMasterBusBase()); canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("AudioMasterBusBase"));
} else { } else {
canvas_rect->set_fill_color (ARDOUR_UI::config()->get_AudioBusBase()); canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("AudioBusBase"));
} }
} }
} }

4
gtk2_ardour/automation_time_axis.cc
View file

@ -124,7 +124,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name)); CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name));
_base_rect->set_x1 (ArdourCanvas::COORD_MAX); _base_rect->set_x1 (ArdourCanvas::COORD_MAX);
_base_rect->set_outline (false); _base_rect->set_outline (false);
_base_rect->set_fill_color (ARDOUR_UI::config()->get_AutomationTrackFill()); _base_rect->set_fill_color (ARDOUR_UI::config()->color ("AutomationTrackFill"));
_base_rect->set_data ("trackview", this); _base_rect->set_data ("trackview", this);
_base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this)); _base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this));
if (!a) { if (!a) {
@ -257,7 +257,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
) )
); );
line->set_line_color (ARDOUR_UI::config()->get_ProcessorAutomationLine()); line->set_line_color (ARDOUR_UI::config()->color ("ProcessorAutomationLine"));
line->queue_reset (); line->queue_reset ();
add_line (line); add_line (line);
} }

12
gtk2_ardour/control_point.cc
View file

@ -45,8 +45,8 @@ ControlPoint::ControlPoint (AutomationLine& al)
_item = new ArdourCanvas::Rectangle (&_line.canvas_group()); _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true); _item->set_fill (true);
_item->set_fill_color (ARDOUR_UI::config()->get_ControlPointFill()); _item->set_fill_color (ARDOUR_UI::config()->color ("ControlPointFill"));
_item->set_outline_color (ARDOUR_UI::config()->get_ControlPointOutline()); _item->set_outline_color (ARDOUR_UI::config()->color ("ControlPointOutline"));
_item->set_data ("control_point", this); _item->set_data ("control_point", this);
_item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler)); _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 = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true); _item->set_fill (true);
_item->set_outline_color (ARDOUR_UI::config()->get_ControlPointOutline()); _item->set_outline_color (ARDOUR_UI::config()->color ("ControlPointOutline"));
/* NOTE: no event handling in copied ControlPoints */ /* NOTE: no event handling in copied ControlPoints */
@ -122,13 +122,13 @@ ControlPoint::set_color ()
uint32_t color = 0; uint32_t color = 0;
if (_selected) { if (_selected) {
color = ARDOUR_UI::config()->get_ControlPointSelected(); color = ARDOUR_UI::config()->color ("ControlPointSelected");
} else { } else {
color = ARDOUR_UI::config()->get_ControlPointOutline(); color = ARDOUR_UI::config()->color ("ControlPointOutline");
} }
_item->set_outline_color (color); _item->set_outline_color (color);
_item->set_fill_color (ARDOUR_UI::config()->get_ControlPointFill()); _item->set_fill_color (ARDOUR_UI::config()->color ("ControlPointFill"));
} }
void void

10
gtk2_ardour/editor.cc
View file

@ -390,11 +390,11 @@ Editor::Editor ()
sfbrowser = 0; sfbrowser = 0;
location_marker_color = ARDOUR_UI::config()->get_LocationMarker(); location_marker_color = ARDOUR_UI::config()->color ("LocationMarker");
location_range_color = ARDOUR_UI::config()->get_LocationRange(); location_range_color = ARDOUR_UI::config()->color ("LocationRange");
location_cd_marker_color = ARDOUR_UI::config()->get_LocationCDMarker(); location_cd_marker_color = ARDOUR_UI::config()->color ("LocationCDMarker");
location_loop_color = ARDOUR_UI::config()->get_LocationLoop(); location_loop_color = ARDOUR_UI::config()->color ("LocationLoop");
location_punch_color = ARDOUR_UI::config()->get_LocationPunch(); location_punch_color = ARDOUR_UI::config()->color ("LocationPunch");
zoom_focus = ZoomFocusLeft; zoom_focus = ZoomFocusLeft;
_edit_point = EditAtMouse; _edit_point = EditAtMouse;

70
gtk2_ardour/editor_canvas.cc
View file

@ -69,7 +69,7 @@ Editor::initialize_canvas ()
_track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, vertical_adjustment); _track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, vertical_adjustment);
_track_canvas = _track_canvas_viewport->canvas (); _track_canvas = _track_canvas_viewport->canvas ();
_track_canvas->set_background_color (ARDOUR_UI::config()->get_ArrangeBase()); _track_canvas->set_background_color (ARDOUR_UI::config()->color ("ArrangeBase"));
/* scroll group for items that should not automatically scroll /* scroll group for items that should not automatically scroll
* (e.g verbose cursor). It shares the canvas coordinate space. * (e.g verbose cursor). It shares the canvas coordinate space.
@ -871,8 +871,8 @@ Editor::set_horizontal_position (double p)
void void
Editor::color_handler() Editor::color_handler()
{ {
ArdourCanvas::Color base = ARDOUR_UI::config()->get_RulerBase(); ArdourCanvas::Color base = ARDOUR_UI::config()->color ("RulerBase");
ArdourCanvas::Color text = ARDOUR_UI::config()->get_RulerText(); ArdourCanvas::Color text = ARDOUR_UI::config()->color ("RulerText");
timecode_ruler->set_fill_color (base); timecode_ruler->set_fill_color (base);
timecode_ruler->set_outline_color (text); timecode_ruler->set_outline_color (text);
minsec_ruler->set_fill_color (base); minsec_ruler->set_fill_color (base);
@ -882,52 +882,52 @@ Editor::color_handler()
bbt_ruler->set_fill_color (base); bbt_ruler->set_fill_color (base);
bbt_ruler->set_outline_color (text); bbt_ruler->set_outline_color (text);
playhead_cursor->set_color (ARDOUR_UI::config()->get_PlayHead()); playhead_cursor->set_color (ARDOUR_UI::config()->color ("PlayHead"));
meter_bar->set_fill_color (ARDOUR_UI::config()->get_MeterBar()); meter_bar->set_fill_color (ARDOUR_UI::config()->color ("MeterBar"));
meter_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator()); meter_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
tempo_bar->set_fill_color (ARDOUR_UI::config()->get_TempoBar()); tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("TempoBar"));
tempo_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator()); tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
marker_bar->set_fill_color (ARDOUR_UI::config()->get_MarkerBar()); marker_bar->set_fill_color (ARDOUR_UI::config()->color ("MarkerBar"));
marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator()); marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
cd_marker_bar->set_fill_color (ARDOUR_UI::config()->get_CDMarkerBar()); cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("CDMarkerBar"));
cd_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator()); cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
range_marker_bar->set_fill_color (ARDOUR_UI::config()->get_RangeMarkerBar()); range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("RangeMarkerBar"));
range_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator()); range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
transport_marker_bar->set_fill_color (ARDOUR_UI::config()->get_TransportMarkerBar()); transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("TransportMarkerBar"));
transport_marker_bar->set_outline_color (ARDOUR_UI::config()->get_MarkerBarSeparator()); transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_RangeDragBarRect()); cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_RangeDragBarRect()); cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_RangeDragBarRect()); range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_RangeDragBarRect()); range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->get_TransportDragRect()); transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportDragRect"));
transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->get_TransportDragRect()); transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportDragRect"));
transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->get_TransportLoopRect()); transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportLoopRect"));
transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->get_TransportLoopRect()); transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportLoopRect"));
transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->get_TransportPunchRect()); transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportPunchRect"));
transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->get_TransportPunchRect()); transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportPunchRect"));
transport_punchin_line->set_outline_color (ARDOUR_UI::config()->get_PunchLine()); transport_punchin_line->set_outline_color (ARDOUR_UI::config()->color ("PunchLine"));
transport_punchout_line->set_outline_color (ARDOUR_UI::config()->get_PunchLine()); transport_punchout_line->set_outline_color (ARDOUR_UI::config()->color ("PunchLine"));
rubberband_rect->set_outline_color (ARDOUR_UI::config()->get_RubberBandRect()); rubberband_rect->set_outline_color (ARDOUR_UI::config()->color ("RubberBandRect"));
rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->get_RubberBandRect()); rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->color ("RubberBandRect"));
location_marker_color = ARDOUR_UI::config()->get_LocationMarker(); location_marker_color = ARDOUR_UI::config()->color ("LocationMarker");
location_range_color = ARDOUR_UI::config()->get_LocationRange(); location_range_color = ARDOUR_UI::config()->color ("LocationRange");
location_cd_marker_color = ARDOUR_UI::config()->get_LocationCDMarker(); location_cd_marker_color = ARDOUR_UI::config()->color ("LocationCDMarker");
location_loop_color = ARDOUR_UI::config()->get_LocationLoop(); location_loop_color = ARDOUR_UI::config()->color ("LocationLoop");
location_punch_color = ARDOUR_UI::config()->get_LocationPunch(); location_punch_color = ARDOUR_UI::config()->color ("LocationPunch");
refresh_location_display (); refresh_location_display ();

8
gtk2_ardour/editor_drag.cc
View file

@ -2592,7 +2592,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
_marker = new MeterMarker ( _marker = new MeterMarker (
*_editor, *_editor,
*_editor->meter_group, *_editor->meter_group,
ARDOUR_UI::config()->get_MeterMarker(), ARDOUR_UI::config()->color ("MeterMarker"),
name, name,
*new MeterSection (_marker->meter()) *new MeterSection (_marker->meter())
); );
@ -2723,7 +2723,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
_marker = new TempoMarker ( _marker = new TempoMarker (
*_editor, *_editor,
*_editor->tempo_group, *_editor->tempo_group,
ARDOUR_UI::config()->get_TempoMarker(), ARDOUR_UI::config()->color ("TempoMarker"),
name, name,
*new TempoSection (_marker->tempo()) *new TempoSection (_marker->tempo())
); );
@ -4453,8 +4453,8 @@ RangeMarkerBarDrag::RangeMarkerBarDrag (Editor* e, ArdourCanvas::Item* i, Operat
physical_screen_height (_editor->get_window()))); physical_screen_height (_editor->get_window())));
_drag_rect->hide (); _drag_rect->hide ();
_drag_rect->set_fill_color (ARDOUR_UI::config()->get_RangeDragRect()); _drag_rect->set_fill_color (ARDOUR_UI::config()->color ("RangeDragRect"));
_drag_rect->set_outline_color (ARDOUR_UI::config()->get_RangeDragRect()); _drag_rect->set_outline_color (ARDOUR_UI::config()->color ("RangeDragRect"));
} }
void void

2
gtk2_ardour/editor_group_tabs.cc
View file

@ -95,7 +95,7 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
if (tab.group && tab.group->is_active()) { if (tab.group && tab.group->is_active()) {
ArdourCanvas::color_to_rgba (tab.color, r, g, b, a); ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
} else { } else {
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->get_InactiveGroupTab(), r, g, b, a); ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("InactiveGroupTab"), r, g, b, a);
} }
a = 1.0; a = 1.0;

10
gtk2_ardour/editor_mouse.cc
View file

@ -1632,7 +1632,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
if (mouse_mode == MouseDraw) { if (mouse_mode == MouseDraw) {
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item); ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
if (line) { if (line) {
line->set_outline_color (ARDOUR_UI::config()->get_EnteredGainLine()); line->set_outline_color (ARDOUR_UI::config()->color ("EnteredGainLine"));
} }
} }
break; break;
@ -1641,7 +1641,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
if (mouse_mode == MouseDraw || mouse_mode == MouseObject) { if (mouse_mode == MouseDraw || mouse_mode == MouseObject) {
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item); ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
if (line) { if (line) {
line->set_outline_color (ARDOUR_UI::config()->get_EnteredAutomationLine()); line->set_outline_color (ARDOUR_UI::config()->color ("EnteredAutomationLine"));
} }
} }
break; break;
@ -1659,7 +1659,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
break; break;
} }
entered_marker = marker; entered_marker = marker;
marker->set_color_rgba (ARDOUR_UI::config()->get_EnteredMarker()); marker->set_color_rgba (ARDOUR_UI::config()->color ("EnteredMarker"));
// fall through // fall through
case MeterMarkerItem: case MeterMarkerItem:
case TempoMarkerItem: case TempoMarkerItem:
@ -1771,7 +1771,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
{ {
ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item); ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
if (rect) { if (rect) {
rect->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle()); rect->set_fill_color (ARDOUR_UI::config()->color ("InactiveFadeHandle"));
} }
} }
break; break;
@ -1782,7 +1782,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
case FeatureLineItem: case FeatureLineItem:
{ {
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item); ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
line->set_outline_color (ARDOUR_UI::config()->get_ZeroLine()); line->set_outline_color (ARDOUR_UI::config()->color ("ZeroLine"));
} }
break; break;

4
gtk2_ardour/editor_tempodisplay.cc
View file

@ -85,7 +85,7 @@ Editor::draw_metric_marks (const Metrics& metrics)
if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) { if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ()); 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_MeterMarker(), buf, metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->color ("MeterMarker"), buf,
*(const_cast<MeterSection*>(ms)))); *(const_cast<MeterSection*>(ms))));
} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) { } else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
if (Config->get_allow_non_quarter_pulse()) { if (Config->get_allow_non_quarter_pulse()) {
@ -93,7 +93,7 @@ Editor::draw_metric_marks (const Metrics& metrics)
} else { } else {
snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute()); snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
} }
metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->get_TempoMarker(), buf, metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->color ("TempoMarker"), buf,
*(const_cast<TempoSection*>(ts)))); *(const_cast<TempoSection*>(ts))));
} }

4
gtk2_ardour/generic_pluginui.cc
View file

@ -763,8 +763,8 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param,
0xcccc00ff, 0xcccc00ff, 0xcccc00ff, 0xcccc00ff,
0xffaa00ff, 0xffaa00ff, 0xffaa00ff, 0xffaa00ff,
0xff0000ff, 0xff0000ff,
ARDOUR_UI::config()->get_MeterBackgroundBot(), ARDOUR_UI::config()->color ("MeterBackgroundBot"),
ARDOUR_UI::config()->get_MeterBackgroundTop() ARDOUR_UI::config()->color ("MeterBackgroundTop")
); );
info->min_unbound = desc.min_unbound; info->min_unbound = desc.min_unbound;

14
gtk2_ardour/ghostregion.cc
View file

@ -87,7 +87,7 @@ void
GhostRegion::set_colors () GhostRegion::set_colors ()
{ {
if (is_automation_ghost()) { if (is_automation_ghost()) {
base_rect->set_fill_color (ARDOUR_UI::config()->get_GhostTrackBase()); base_rect->set_fill_color (ARDOUR_UI::config()->color ("GhostTrackBase"));
} }
} }
@ -141,17 +141,17 @@ AudioGhostRegion::set_colors ()
guint fill_color; guint fill_color;
if (is_automation_ghost()) { if (is_automation_ghost()) {
fill_color = ARDOUR_UI::config()->get_GhostTrackWaveFill(); fill_color = ARDOUR_UI::config()->color ("GhostTrackWaveFill");
} }
else { else {
fill_color = source_track_color(200); fill_color = source_track_color(200);
} }
for (uint32_t n=0; n < waves.size(); ++n) { for (uint32_t n=0; n < waves.size(); ++n) {
waves[n]->set_outline_color (ARDOUR_UI::config()->get_GhostTrackWave()); waves[n]->set_outline_color (ARDOUR_UI::config()->color ("GhostTrackWave"));
waves[n]->set_fill_color (fill_color); waves[n]->set_fill_color (fill_color);
waves[n]->set_clip_color (ARDOUR_UI::config()->get_GhostTrackWaveClip()); waves[n]->set_clip_color (ARDOUR_UI::config()->color ("GhostTrackWaveClip"));
waves[n]->set_zero_color (ARDOUR_UI::config()->get_GhostTrackZeroLine()); waves[n]->set_zero_color (ARDOUR_UI::config()->color ("GhostTrackZeroLine"));
} }
} }
@ -236,7 +236,7 @@ MidiGhostRegion::set_colors()
for (EventList::iterator it = events.begin(); it != events.end(); ++it) { for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
(*it)->rect->set_fill_color (fill); (*it)->rect->set_fill_color (fill);
(*it)->rect->set_outline_color (ARDOUR_UI::config()->get_GhostTrackMidiOutline()); (*it)->rect->set_outline_color (ARDOUR_UI::config()->color ("GhostTrackMidiOutline"));
} }
} }
@ -273,7 +273,7 @@ MidiGhostRegion::add_note (NoteBase* n)
events.push_back (event); events.push_back (event);
event->rect->set_fill_color (source_track_color(200)); event->rect->set_fill_color (source_track_color(200));
event->rect->set_outline_color (ARDOUR_UI::config()->get_GhostTrackMidiOutline()); event->rect->set_outline_color (ARDOUR_UI::config()->color ("GhostTrackMidiOutline"));
MidiStreamView* mv = midi_view(); MidiStreamView* mv = midi_view();

44
gtk2_ardour/level_meter.cc
View file

@ -273,36 +273,36 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
uint32_t b[4]; uint32_t b[4];
float stp[4]; float stp[4];
int styleflags = Config->get_meter_style_led() ? 3 : 1; int styleflags = Config->get_meter_style_led() ? 3 : 1;
b[0] = ARDOUR_UI::config()->get_MeterBackgroundBot(); b[0] = ARDOUR_UI::config()->color ("MeterBackgroundBot");
b[1] = ARDOUR_UI::config()->get_MeterBackgroundTop(); b[1] = ARDOUR_UI::config()->color ("MeterBackgroundTop");
b[2] = 0x991122ff; // red highlight gradient Bot b[2] = 0x991122ff; // red highlight gradient Bot
b[3] = 0x551111ff; // red highlight gradient Top b[3] = 0x551111ff; // red highlight gradient Top
if (n < nmidi) { if (n < nmidi) {
c[0] = ARDOUR_UI::config()->get_MidiMeterColor0(); c[0] = ARDOUR_UI::config()->color ("MidiMeterColor0");
c[1] = ARDOUR_UI::config()->get_MidiMeterColor1(); c[1] = ARDOUR_UI::config()->color ("MidiMeterColor1");
c[2] = ARDOUR_UI::config()->get_MidiMeterColor2(); c[2] = ARDOUR_UI::config()->color ("MidiMeterColor2");
c[3] = ARDOUR_UI::config()->get_MidiMeterColor3(); c[3] = ARDOUR_UI::config()->color ("MidiMeterColor3");
c[4] = ARDOUR_UI::config()->get_MidiMeterColor4(); c[4] = ARDOUR_UI::config()->color ("MidiMeterColor4");
c[5] = ARDOUR_UI::config()->get_MidiMeterColor5(); c[5] = ARDOUR_UI::config()->color ("MidiMeterColor5");
c[6] = ARDOUR_UI::config()->get_MidiMeterColor6(); c[6] = ARDOUR_UI::config()->color ("MidiMeterColor6");
c[7] = ARDOUR_UI::config()->get_MidiMeterColor7(); c[7] = ARDOUR_UI::config()->color ("MidiMeterColor7");
c[8] = ARDOUR_UI::config()->get_MidiMeterColor8(); c[8] = ARDOUR_UI::config()->color ("MidiMeterColor8");
c[9] = ARDOUR_UI::config()->get_MidiMeterColor9(); c[9] = ARDOUR_UI::config()->color ("MidiMeterColor9");
stp[0] = 115.0 * 32.0 / 128.0; stp[0] = 115.0 * 32.0 / 128.0;
stp[1] = 115.0 * 64.0 / 128.0; stp[1] = 115.0 * 64.0 / 128.0;
stp[2] = 115.0 * 100.0 / 128.0; stp[2] = 115.0 * 100.0 / 128.0;
stp[3] = 115.0 * 112.0 / 128.0; stp[3] = 115.0 * 112.0 / 128.0;
} else { } else {
c[0] = ARDOUR_UI::config()->get_MeterColor0(); c[0] = ARDOUR_UI::config()->color ("MeterColor0");
c[1] = ARDOUR_UI::config()->get_MeterColor1(); c[1] = ARDOUR_UI::config()->color ("MeterColor1");
c[2] = ARDOUR_UI::config()->get_MeterColor2(); c[2] = ARDOUR_UI::config()->color ("MeterColor2");
c[3] = ARDOUR_UI::config()->get_MeterColor3(); c[3] = ARDOUR_UI::config()->color ("MeterColor3");
c[4] = ARDOUR_UI::config()->get_MeterColor4(); c[4] = ARDOUR_UI::config()->color ("MeterColor4");
c[5] = ARDOUR_UI::config()->get_MeterColor5(); c[5] = ARDOUR_UI::config()->color ("MeterColor5");
c[6] = ARDOUR_UI::config()->get_MeterColor6(); c[6] = ARDOUR_UI::config()->color ("MeterColor6");
c[7] = ARDOUR_UI::config()->get_MeterColor7(); c[7] = ARDOUR_UI::config()->color ("MeterColor7");
c[8] = ARDOUR_UI::config()->get_MeterColor8(); c[8] = ARDOUR_UI::config()->color ("MeterColor8");
c[9] = ARDOUR_UI::config()->get_MeterColor9(); c[9] = ARDOUR_UI::config()->color ("MeterColor9");
switch (meter_type) { switch (meter_type) {
case MeterK20: case MeterK20:

4
gtk2_ardour/marker.cc
View file

@ -331,7 +331,7 @@ Marker::setup_line ()
if (_track_canvas_line == 0) { if (_track_canvas_line == 0) {
_track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group()); _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group());
_track_canvas_line->set_outline_color (ARDOUR_UI::config()->get_EditPoint()); _track_canvas_line->set_outline_color (ARDOUR_UI::config()->color ("EditPoint"));
_track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); _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_x1 (d.x);
_track_canvas_line->set_y0 (d.y); _track_canvas_line->set_y0 (d.y);
_track_canvas_line->set_y1 (ArdourCanvas::COORD_MAX); _track_canvas_line->set_y1 (ArdourCanvas::COORD_MAX);
_track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->get_EditPoint() : _color); _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->color ("EditPoint") : _color);
_track_canvas_line->raise_to_top (); _track_canvas_line->raise_to_top ();
_track_canvas_line->show (); _track_canvas_line->show ();

8
gtk2_ardour/midi_region_view.cc
View file

@ -2621,7 +2621,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
// calculate the colors: get the color settings // calculate the colors: get the color settings
uint32_t fill_color = UINT_RGBA_CHANGE_A( uint32_t fill_color = UINT_RGBA_CHANGE_A(
ARDOUR_UI::config()->get_MidiNoteSelected(), ARDOUR_UI::config()->color ("MidiNoteSelected"),
128); 128);
// make the resize preview notes more transparent and bright // make the resize preview notes more transparent and bright
@ -2634,7 +2634,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
0.85)); 0.85));
resize_rect->set_outline_color (NoteBase::calculate_outline ( resize_rect->set_outline_color (NoteBase::calculate_outline (
ARDOUR_UI::config()->get_MidiNoteSelected())); ARDOUR_UI::config()->color ("MidiNoteSelected")));
resize_data->resize_rect = resize_rect; resize_data->resize_rect = resize_rect;
_resize_data.push_back(resize_data); _resize_data.push_back(resize_data);
@ -3281,9 +3281,9 @@ MidiRegionView::set_frame_color()
} }
if (_selected) { if (_selected) {
f = ARDOUR_UI::config()->get_SelectedFrameBase(); f = ARDOUR_UI::config()->color ("SelectedFrameBase");
} else if (high_enough_for_name) { } else if (high_enough_for_name) {
f= ARDOUR_UI::config()->get_MidiFrameBase(); f= ARDOUR_UI::config()->color ("MidiFrameBase");
} else { } else {
f = fill_color; f = fill_color;
} }

14
gtk2_ardour/midi_streamview.cc
View file

@ -320,7 +320,7 @@ MidiStreamView::draw_note_lines()
*/ */
if (i <= highest_note()) { if (i <= highest_note()) {
_note_lines->add (y, 1.0, ARDOUR_UI::config()->get_PianoRollBlackOutline()); _note_lines->add (y, 1.0, ARDOUR_UI::config()->color ("PianoRollBlackOutline"));
} }
/* now add a thicker line/bar which covers the entire vertical /* now add a thicker line/bar which covers the entire vertical
@ -333,10 +333,10 @@ MidiStreamView::draw_note_lines()
case 6: case 6:
case 8: case 8:
case 10: case 10:
color = ARDOUR_UI::config()->get_PianoRollBlack(); color = ARDOUR_UI::config()->color ("PianoRollBlack");
break; break;
default: default:
color = ARDOUR_UI::config()->get_PianoRollWhite(); color = ARDOUR_UI::config()->color ("PianoRollWhite");
break; break;
} }
@ -511,11 +511,11 @@ MidiStreamView::setup_rec_box ()
gdouble const xend = xstart; gdouble const xend = xstart;
uint32_t fill_color; uint32_t fill_color;
fill_color = ARDOUR_UI::config()->get_RecordingRect(); fill_color = ARDOUR_UI::config()->color ("RecordingRect");
ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group); ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group);
rec_rect->set (ArdourCanvas::Rect (xstart, 1, xend, _trackview.current_height() - 1)); rec_rect->set (ArdourCanvas::Rect (xstart, 1, xend, _trackview.current_height() - 1));
rec_rect->set_outline_color (ARDOUR_UI::config()->get_RecordingRect()); rec_rect->set_outline_color (ARDOUR_UI::config()->color ("RecordingRect"));
rec_rect->set_fill_color (fill_color); rec_rect->set_fill_color (fill_color);
rec_rect->lower_to_bottom(); rec_rect->lower_to_bottom();
@ -588,9 +588,9 @@ MidiStreamView::color_handler ()
draw_note_lines (); draw_note_lines ();
if (_trackview.is_midi_track()) { if (_trackview.is_midi_track()) {
canvas_rect->set_fill_color (ARDOUR_UI::config()->get_MidiTrackBase()); canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("MidiTrackBase"));
} else { } else {
canvas_rect->set_fill_color (ARDOUR_UI::config()->get_MidiBusBase()); canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("MidiBusBase"));
} }
} }

2
gtk2_ardour/mixer_group_tabs.cc
View file

@ -103,7 +103,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
if (tab.group && tab.group->is_active()) { if (tab.group && tab.group->is_active()) {
ArdourCanvas::color_to_rgba (tab.color, r, g, b, a); ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
} else { } else {
ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->get_InactiveGroupTab(), r, g, b, a); ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("InactiveGroupTab"), r, g, b, a);
} }
a = 1.0; a = 1.0;

12
gtk2_ardour/mono_panner.cc
View file

@ -487,12 +487,12 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
void void
MonoPanner::set_colors () MonoPanner::set_colors ()
{ {
colors.fill = ARDOUR_UI::config()->get_MonoPannerFill(); colors.fill = ARDOUR_UI::config()->color ("MonoPannerFill");
colors.outline = ARDOUR_UI::config()->get_MonoPannerOutline(); colors.outline = ARDOUR_UI::config()->color ("MonoPannerOutline");
colors.text = ARDOUR_UI::config()->get_MonoPannerText(); colors.text = ARDOUR_UI::config()->color ("MonoPannerText");
colors.background = ARDOUR_UI::config()->get_MonoPannerBackground(); colors.background = ARDOUR_UI::config()->color ("MonoPannerBackground");
colors.pos_outline = ARDOUR_UI::config()->get_MonoPannerPositionOutline(); colors.pos_outline = ARDOUR_UI::config()->color ("MonoPannerPositionOutline");
colors.pos_fill = ARDOUR_UI::config()->get_MonoPannerPositionFill(); colors.pos_fill = ARDOUR_UI::config()->color ("MonoPannerPositionFill");
} }
void void

12
gtk2_ardour/note_base.cc
View file

@ -96,7 +96,7 @@ NoteBase::show_velocity()
if (!_text) { if (!_text) {
_text = new Text (_item->parent ()); _text = new Text (_item->parent ());
_text->set_ignore_events (true); _text->set_ignore_events (true);
_text->set_color (ARDOUR_UI::config()->get_MidiNoteVelocityText()); _text->set_color (ARDOUR_UI::config()->color ("MidiNoteVelocityText"));
_text->set_alignment (Pango::ALIGN_CENTER); _text->set_alignment (Pango::ALIGN_CENTER);
} }
@ -121,8 +121,8 @@ NoteBase::on_channel_selection_change(uint16_t selection)
{ {
// make note change its color if its channel is not marked active // make note change its color if its channel is not marked active
if ( (selection & (1 << _note->channel())) == 0 ) { if ( (selection & (1 << _note->channel())) == 0 ) {
set_fill_color(ARDOUR_UI::config()->get_MidiNoteInactiveChannel()); set_fill_color(ARDOUR_UI::config()->color ("MidiNoteInactiveChannel"));
set_outline_color(calculate_outline(ARDOUR_UI::config()->get_MidiNoteInactiveChannel())); set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("MidiNoteInactiveChannel")));
} else { } else {
// set the color according to the notes selection state // set the color according to the notes selection state
set_selected(_selected); set_selected(_selected);
@ -150,7 +150,7 @@ NoteBase::set_selected(bool selected)
set_fill_color (base_color()); set_fill_color (base_color());
if (_selected) { if (_selected) {
set_outline_color(calculate_outline(ARDOUR_UI::config()->get_MidiNoteSelected())); set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("MidiNoteSelected")));
} else { } else {
set_outline_color(calculate_outline(base_color())); set_outline_color(calculate_outline(base_color()));
} }
@ -174,13 +174,13 @@ NoteBase::base_color()
{ {
uint32_t color = _region.midi_stream_view()->get_region_color(); uint32_t color = _region.midi_stream_view()->get_region_color();
return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (color, opacity), return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (color, opacity),
ARDOUR_UI::config()->get_MidiNoteSelected(), ARDOUR_UI::config()->color ("MidiNoteSelected"),
0.5); 0.5);
} }
case ChannelColors: case ChannelColors:
return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity), return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity),
ARDOUR_UI::config()->get_MidiNoteSelected(), 0.5); ARDOUR_UI::config()->color ("MidiNoteSelected()"), 0.5);
default: default:
return meter_style_fill_color(_note->velocity(), selected()); return meter_style_fill_color(_note->velocity(), selected());

16
gtk2_ardour/note_base.h
View file

@ -106,25 +106,25 @@ class NoteBase : public sigc::trackable
if (selected) { if (selected) {
if (vel < 64) { if (vel < 64) {
return UINT_INTERPOLATE( return UINT_INTERPOLATE(
ARDOUR_UI::config()->get_SelectedMidiNoteColorBase(), ARDOUR_UI::config()->color ("SelectedMidiNoteColorBase"),
ARDOUR_UI::config()->get_SelectedMidiNoteColorMid(), ARDOUR_UI::config()->color ("SelectedMidiNoteColorMid"),
(vel / (double)63.0)); (vel / (double)63.0));
} else { } else {
return UINT_INTERPOLATE( return UINT_INTERPOLATE(
ARDOUR_UI::config()->get_SelectedMidiNoteColorMid(), ARDOUR_UI::config()->color ("SelectedMidiNoteColorMid"),
ARDOUR_UI::config()->get_SelectedMidiNoteColorTop(), ARDOUR_UI::config()->color ("SelectedMidiNoteColorTop"),
((vel-64) / (double)63.0)); ((vel-64) / (double)63.0));
} }
} else { } else {
if (vel < 64) { if (vel < 64) {
return UINT_INTERPOLATE( return UINT_INTERPOLATE(
ARDOUR_UI::config()->get_MidiNoteColorBase(), ARDOUR_UI::config()->color ("MidiNoteColorBase"),
ARDOUR_UI::config()->get_MidiNoteColorMid(), ARDOUR_UI::config()->color ("MidiNoteColorMid"),
(vel / (double)63.0)); (vel / (double)63.0));
} else { } else {
return UINT_INTERPOLATE( return UINT_INTERPOLATE(
ARDOUR_UI::config()->get_MidiNoteColorMid(), ARDOUR_UI::config()->color ("MidiNoteColorMid"),
ARDOUR_UI::config()->get_MidiNoteColorTop(), ARDOUR_UI::config()->color ("MidiNoteColorTop"),
((vel-64) / (double)63.0)); ((vel-64) / (double)63.0));
} }
} }

4
gtk2_ardour/patch_change.cc
View file

@ -58,8 +58,8 @@ PatchChange::PatchChange(
_flag = new ArdourCanvas::Flag ( _flag = new ArdourCanvas::Flag (
parent, parent,
height, height,
ARDOUR_UI::config()->get_MidiPatchChangeOutline(), ARDOUR_UI::config()->color ("MidiPatchChangeOutline"),
ARDOUR_UI::config()->get_MidiPatchChangeFill(), ARDOUR_UI::config()->color ("MidiPatchChangeFill"),
ArdourCanvas::Duple (x, y) ArdourCanvas::Duple (x, y)
); );

6
gtk2_ardour/region_view.cc
View file

@ -235,7 +235,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
return; return;
} }
uint32_t const color = ARDOUR_UI::config()->get_Silence(); uint32_t const color = ARDOUR_UI::config()->color ("Silence");
for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
@ -276,7 +276,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
_silence_text = new ArdourCanvas::Text (group); _silence_text = new ArdourCanvas::Text (group);
_silence_text->set_ignore_events (true); _silence_text->set_ignore_events (true);
_silence_text->set_font_description (get_font_for_style (N_("SilenceText"))); _silence_text->set_font_description (get_font_for_style (N_("SilenceText")));
_silence_text->set_color (ARDOUR_UI::config()->get_SilenceText()); _silence_text->set_color (ARDOUR_UI::config()->color ("SilenceText"));
/* both positions are relative to the region start offset in source */ /* both positions are relative to the region start offset in source */
@ -783,7 +783,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
bool me = false; bool me = false;
/* the color that will be used to show parts of regions that will not be heard */ /* 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_CoveredRegion (); uint32_t const non_playing_color = ARDOUR_UI::config()->color ("CoveredRegion");
while (t < end) { while (t < end) {

8
gtk2_ardour/route_time_axis.cc
View file

@ -915,8 +915,8 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layer
if (timestretch_rect == 0) { if (timestretch_rect == 0) {
timestretch_rect = new ArdourCanvas::Rectangle (canvas_display ()); timestretch_rect = new ArdourCanvas::Rectangle (canvas_display ());
timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_TimeStretchFill()); timestretch_rect->set_fill_color (ARDOUR_UI::config()->color ("TimeStretchFill"));
timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_TimeStretchOutline()); timestretch_rect->set_outline_color (ARDOUR_UI::config()->color ("TimeStretchOutline"));
} }
timestretch_rect->show (); timestretch_rect->show ();
@ -1813,11 +1813,11 @@ RouteTimeAxisView::color_handler ()
{ {
//case cTimeStretchOutline: //case cTimeStretchOutline:
if (timestretch_rect) { if (timestretch_rect) {
timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_TimeStretchOutline()); timestretch_rect->set_outline_color (ARDOUR_UI::config()->color ("TimeStretchOutline"));
} }
//case cTimeStretchFill: //case cTimeStretchFill:
if (timestretch_rect) { if (timestretch_rect) {
timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_TimeStretchFill()); timestretch_rect->set_fill_color (ARDOUR_UI::config()->color ("TimeStretchFill"));
} }
reset_meter(); reset_meter();

2
gtk2_ardour/shuttle_control.cc
View file

@ -113,7 +113,7 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc)
//background //background
pattern = cairo_pattern_create_linear (0, 0, 0, alloc.get_height()); pattern = cairo_pattern_create_linear (0, 0, 0, alloc.get_height());
uint32_t col = ARDOUR_UI::config()->get_Shuttle(); uint32_t col = ARDOUR_UI::config()->color ("Shuttle");
int r,b,g,a; int r,b,g,a;
UINT_TO_RGBA(col, &r, &g, &b, &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); cairo_pattern_add_color_stop_rgb (pattern, 0.0, r/400.0, g/400.0, b/400.0);

30
gtk2_ardour/stereo_panner.cc
View file

@ -670,24 +670,24 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
void void
StereoPanner::set_colors () StereoPanner::set_colors ()
{ {
colors[Normal].fill = ARDOUR_UI::config()->get_StereoPannerFill(); colors[Normal].fill = ARDOUR_UI::config()->color ("StereoPannerFill");
// colors[Normal].outline = ARDOUR_UI::config()->get_StereoPannerOutline(); // colors[Normal].outline = ARDOUR_UI::config()->color ("StereoPannerOutline");
colors[Normal].outline = ArdourCanvas::HSV (colors[Normal].fill).outline().color (); colors[Normal].outline = ArdourCanvas::HSV (colors[Normal].fill).outline().color ();
colors[Normal].text = ARDOUR_UI::config()->get_StereoPannerText(); colors[Normal].text = ARDOUR_UI::config()->color ("StereoPannerText");
colors[Normal].background = ARDOUR_UI::config()->get_StereoPannerBackground(); colors[Normal].background = ARDOUR_UI::config()->color ("StereoPannerBackground");
colors[Normal].rule = ARDOUR_UI::config()->get_StereoPannerRule(); colors[Normal].rule = ARDOUR_UI::config()->color ("StereoPannerRule");
colors[Mono].fill = ARDOUR_UI::config()->get_StereoPannerMonoFill(); colors[Mono].fill = ARDOUR_UI::config()->color ("StereoPannerMonoFill");
colors[Mono].outline = ARDOUR_UI::config()->get_StereoPannerMonoOutline(); colors[Mono].outline = ARDOUR_UI::config()->color ("StereoPannerMonoOutline");
colors[Mono].text = ARDOUR_UI::config()->get_StereoPannerMonoText(); colors[Mono].text = ARDOUR_UI::config()->color ("StereoPannerMonoText");
colors[Mono].background = ARDOUR_UI::config()->get_StereoPannerMonoBackground(); colors[Mono].background = ARDOUR_UI::config()->color ("StereoPannerMonoBackground");
colors[Mono].rule = ARDOUR_UI::config()->get_StereoPannerRule(); colors[Mono].rule = ARDOUR_UI::config()->color ("StereoPannerRule");
colors[Inverted].fill = ARDOUR_UI::config()->get_StereoPannerInvertedFill(); colors[Inverted].fill = ARDOUR_UI::config()->color ("StereoPannerInvertedFill");
colors[Inverted].outline = ARDOUR_UI::config()->get_StereoPannerInvertedOutline(); colors[Inverted].outline = ARDOUR_UI::config()->color ("StereoPannerInvertedOutline");
colors[Inverted].text = ARDOUR_UI::config()->get_StereoPannerInvertedText(); colors[Inverted].text = ARDOUR_UI::config()->color ("StereoPannerInvertedText");
colors[Inverted].background = ARDOUR_UI::config()->get_StereoPannerInvertedBackground(); colors[Inverted].background = ARDOUR_UI::config()->color ("StereoPannerInvertedBackground");
colors[Inverted].rule = ARDOUR_UI::config()->get_StereoPannerRule(); colors[Inverted].rule = ARDOUR_UI::config()->color ("StereoPannerRule");
} }
void void

4
gtk2_ardour/sys_ex.cc
View file

@ -35,8 +35,8 @@ SysEx::SysEx (
_flag = new ArdourCanvas::Flag ( _flag = new ArdourCanvas::Flag (
parent, parent,
height, height,
ARDOUR_UI::config()->get_MidiSysExOutline(), ARDOUR_UI::config()->color ("MidiSysExOutline"),
ARDOUR_UI::config()->get_MidiSysExFill(), ARDOUR_UI::config()->color ("MidiSysExFill"),
ArdourCanvas::Duple (x, y) ArdourCanvas::Duple (x, y)
); );

4
gtk2_ardour/tempo_lines.cc
View file

@ -83,12 +83,12 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
for (i = begin; i != end; ++i) { for (i = begin; i != end; ++i) {
if ((*i).is_bar()) { if ((*i).is_bar()) {
color = ARDOUR_UI::config()->get_MeasureLineBar(); color = ARDOUR_UI::config()->color ("MeasureLineBar");
} else { } else {
if (beat_density > 0.3) { if (beat_density > 0.3) {
continue; /* only draw beat lines if the gaps between beats are large. */ continue; /* only draw beat lines if the gaps between beats are large. */
} }
color = ARDOUR_UI::config()->get_MeasureLineBeat(); color = ARDOUR_UI::config()->color ("MeasureLineBeat");
} }
ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame); ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame);

26
gtk2_ardour/time_axis_view.cc
View file

@ -1025,7 +1025,7 @@ TimeAxisView::get_selection_rect (uint32_t id)
rect->rect = new ArdourCanvas::TimeRectangle (selection_group); rect->rect = new ArdourCanvas::TimeRectangle (selection_group);
CANVAS_DEBUG_NAME (rect->rect, "selection rect"); CANVAS_DEBUG_NAME (rect->rect, "selection rect");
rect->rect->set_outline (false); rect->rect->set_outline (false);
rect->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect()); rect->rect->set_fill_color (ARDOUR_UI::config()->color ("SelectionRect"));
rect->start_trim = new ArdourCanvas::Rectangle (selection_group); rect->start_trim = new ArdourCanvas::Rectangle (selection_group);
CANVAS_DEBUG_NAME (rect->start_trim, "selection rect start trim"); CANVAS_DEBUG_NAME (rect->start_trim, "selection rect start trim");
@ -1190,26 +1190,26 @@ TimeAxisView::color_handler ()
for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) { for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
(*i)->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect()); (*i)->rect->set_fill_color (ARDOUR_UI::config()->color ("SelectionRect"));
(*i)->rect->set_outline_color (ARDOUR_UI::config()->get_Selection()); (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
(*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_Selection()); (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("Selection"));
(*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_Selection()); (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
(*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_Selection()); (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("Selection"));
(*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_Selection()); (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
} }
for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) { for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
(*i)->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect()); (*i)->rect->set_fill_color (ARDOUR_UI::config()->color ("SelectionRect"));
(*i)->rect->set_outline_color (ARDOUR_UI::config()->get_Selection()); (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
(*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_Selection()); (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("Selection"));
(*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_Selection()); (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
(*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_Selection()); (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("Selection"));
(*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_Selection()); (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
} }
} }

20
gtk2_ardour/time_axis_view_item.cc
View file

@ -201,9 +201,9 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name())); CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
if (_recregion) { if (_recregion) {
frame->set_outline_color (ARDOUR_UI::config()->get_RecordingRect()); frame->set_outline_color (ARDOUR_UI::config()->color ("RecordingRect"));
} else { } else {
frame->set_outline_color (ARDOUR_UI::config()->get_TimeAxisFrame()); frame->set_outline_color (ARDOUR_UI::config()->color ("TimeAxisFrame"));
} }
} }
@ -537,7 +537,7 @@ TimeAxisViewItem::set_selected(bool yn)
if (!selection_frame) { if (!selection_frame) {
selection_frame = new ArdourCanvas::TimeRectangle (group); selection_frame = new ArdourCanvas::TimeRectangle (group);
selection_frame->set_fill (false); selection_frame->set_fill (false);
selection_frame->set_outline_color (ARDOUR_UI::config()->get_SelectedTimeAxisFrame()); selection_frame->set_outline_color (ARDOUR_UI::config()->color ("SelectedTimeAxisFrame"));
selection_frame->set_ignore_events (true); selection_frame->set_ignore_events (true);
} }
selection_frame->set (frame->get().shrink (1.0)); selection_frame->set (frame->get().shrink (1.0));
@ -729,7 +729,7 @@ TimeAxisViewItem::fill_opacity () const
return 130; return 130;
} }
uint32_t col = ARDOUR_UI::config()->get_FrameBase(); uint32_t col = ARDOUR_UI::config()->color ("FrameBase");
return UINT_RGBA_A (col); return UINT_RGBA_A (col);
} }
@ -743,7 +743,7 @@ TimeAxisViewItem::get_fill_color () const
if (_selected) { if (_selected) {
f = ARDOUR_UI::config()->get_SelectedFrameBase(); f = ARDOUR_UI::config()->color ("SelectedFrameBase");
if (o == 0) { if (o == 0) {
/* some condition of this item has set fill opacity to /* some condition of this item has set fill opacity to
@ -756,10 +756,10 @@ TimeAxisViewItem::get_fill_color () const
} else { } else {
if (_recregion) { if (_recregion) {
f = ARDOUR_UI::config()->get_RecordingRect(); f = ARDOUR_UI::config()->color ("RecordingRect");
} else { } else {
if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) { if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
f = ARDOUR_UI::config()->get_FrameBase(); f = ARDOUR_UI::config()->color ("FrameBase");
} else { } else {
f = fill_color; f = fill_color;
} }
@ -783,7 +783,7 @@ TimeAxisViewItem::set_frame_color()
set_frame_gradient (); set_frame_gradient ();
if (!_recregion) { if (!_recregion) {
uint32_t f = ARDOUR_UI::config()->get_TimeAxisFrame(); uint32_t f = ARDOUR_UI::config()->color ("TimeAxisFrame");
if (!rect_visible) { if (!rect_visible) {
/* make the frame outline be visible but rather transparent */ /* make the frame outline be visible but rather transparent */
@ -910,8 +910,8 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
if (!vestigial_frame) { if (!vestigial_frame) {
vestigial_frame = new ArdourCanvas::TimeRectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height())); vestigial_frame = new ArdourCanvas::TimeRectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name())); CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_VestigialFrame()); vestigial_frame->set_outline_color (ARDOUR_UI::config()->color ("VestigialFrame"));
vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_VestigialFrame()); vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("VestigialFrame"));
vestigial_frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT)); vestigial_frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
} }

2
gtk2_ardour/ui_config.cc
View file

@ -579,6 +579,8 @@ UIConfiguration::load_color_aliases (XMLNode const & node)
color_aliases.insert (make_pair (name->value(), alias->value())); color_aliases.insert (make_pair (name->value(), alias->value()));
} }
} }
cerr << "Color alias table contains " << color_aliases.size() << endl;
} }
void void

2
gtk2_ardour/verbose_cursor.cc
View file

@ -53,7 +53,7 @@ VerboseCursor::VerboseCursor (Editor* editor)
void void
VerboseCursor::color_handler () VerboseCursor::color_handler ()
{ {
_canvas_item->set_color (ARDOUR_UI::config()->get_VerboseCanvasCursor()); _canvas_item->set_color (ARDOUR_UI::config()->color ("VerboseCanvasCursor"));
} }
ArdourCanvas::Item * ArdourCanvas::Item *