<Option name="destructive-xfade-msecs" value="20"/>
<Option name="periodic-safety-backups" value="1"/>
<Option name="periodic-safety-backup-interval" value="120"/>
- <Option name="ui-rc-file" value="ardour2_ui_dark.rc"/>
</Config>
- <Canvas>
- <Option name="waveform" value="000000cc"/>
- <Option name="clipped waveform" value="ff0000e5"/>
- <Option name="region base" value="bfbfc1aa"/>
- <Option name="selected region base" value="b591a8ff"/>
- <Option name="audio track base" value="c6d3d868"/>
- <Option name="audio bus base" value="dbd1ea68"/>
- <Option name="midi track base" value="ff8f8f3d"/>
- <Option name="midi bus base" value="ff0000ee"/>
- <Option name="time-stretch-fill" value="e2b5b596"/>
- <Option name="time-stretch-outline" value="63636396"/>
- <Option name="automation line" value="44bc59ff"/>
- <Option name="processor automation line" value="7aa3f9ff"/>
- <Option name="control point fill" value="000000ff"/>
- <Option name="control point outline" value="000000ff"/>
- <Option name="entered control point outline" value="ff0000ee"/>
- <Option name="entered control point selected" value="ff3535ff"/>
- <Option name="entered control point" value="000000cc"/>
- <Option name="control point selected" value="00ff00ff"/>
- <Option name="control point" value="ff0000ff"/>
- <Option name="automation track fill" value="a0a0ce68"/>
- <Option name="automation track outline" value="282828ff"/>
- <Option name="crossfade editor base" value="282d49ff"/>
- <Option name="crossfade editor line" value="000000ff"/>
- <Option name="selected crossfade editor line" value="00dbdbff"/>
- <Option name="crossfade editor line shading" value="00a0d154"/>
- <Option name="crossfade editor point fill" value="00ff00ff"/>
- <Option name="crossfade editor point outline" value="0000ffff"/>
- <Option name="crossfade editor wave" value="ffffff28"/>
- <Option name="selected crossfade editor wave" value="f9ea14a0"/>
- <Option name="crossfade line" value="000000ff"/>
- <Option name="active crossfade" value="e8ed3d77"/>
- <Option name="inactive crossfade" value="e8ed3d77"/>
- <Option name="location marker" value="c4f411ff"/>
- <Option name="location range" value="497a59ff"/>
- <Option name="location cd marker" value="1ee8c4ff"/>
- <Option name="location loop" value="35964fff"/>
- <Option name="location punch" value="7c3a3aff"/>
- <Option name="verbose canvas cursor" value="f4f214bc"/>
- <Option name="marker label" value="000000ff"/>
- <Option name="marker bar separator" value="30303088"/>
- <Option name="tempo bar" value="72727fff"/>
- <Option name="meterbar" value="666672ff"/>
- <Option name="markerbar" value="7f7f8cff"/>
- <Option name="rangemarker bar" value="8c8c96ff"/>
- <Option name="TransportMarkerBar" value="9898a3ff"/>
- <Option name="RangeDragBarRect" value="969696c6"/>
- <Option name="RangeDragRect" value="82c696c6"/>
- <Option name="TransportDragRect" value="969696c6"/>
- <Option name="MarkerDragLine" value="004f00f9"/>
- <Option name="TransportLoopRect" value="1e7728f9"/>
- <Option name="TransportPunchRect" value="6d2828e5"/>
- <Option name="PunchLine" value="a80000ff"/>
- <Option name="ZoomRect" value="c6d1b26d"/>
- <Option name="RubberBandRect" value="c6c6c659"/>
- <Option name="EnteredGainLine" value="dd6363ff"/>
- <Option name="EnteredAutomationLine" value="dd6363ff"/>
- <Option name="EnteredMarker" value="dd6363ff"/>
- <Option name="MeterMarker" value="f2425bff"/>
- <Option name="TempoMarker" value="f2425bff"/>
- <Option name="MeasureLineBeat" value="72727266"/>
- <Option name="MeasureLineBar" value="8c8c988c"/>
- <Option name="GhostTrackBase" value="44007c7f"/>
- <Option name="GhostTrackWave" value="02fd004c"/>
- <Option name="GhostTrackWaveClip" value="ff000000"/>
- <Option name="GhostTrackZeroLine" value="e500e566"/>
- <Option name="ImageTrack" value="ddddd8ff"/>
- <Option name="MarkerTrack" value="ddddd8ff"/>
- <Option name="ZeroLine" value="b5b5b5ff"/>
- <Option name="GainLine" value="ff00ff00"/>
- <Option name="GainLineInactive" value="f0f0ffff"/>
- <Option name="RecordingRect" value="e5c6c6ff"/>
- <Option name="SelectionRect" value="e8f4d377"/>
- <Option name="Selection" value="636363b2"/>
- <Option name="VestigialFrame" value="44007c0f"/>
- <Option name="TimeAxisFrame" value="44007c0f"/>
- <Option name="NameHighlightFill" value="0000ffff"/>
- <Option name="NameHighlightOutline" value="7c00ff96"/>
- <Option name="FrameHandle" value="7c00ff96"/>
- <Option name="TrimHandleLocked" value="ea0f0f28"/>
- <Option name="TrimHandle" value="1900ff44"/>
- <Option name="EditCursor" value="0000ffff"/>
- <Option name="PlayHead" value="ff0000ff"/>
- </Canvas>
<extra>
<Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>
</extra>
time_axis_view_item.cc
route_time_axis.cc
time_selection.cc
+ui_config.cc
utils.cc
version.cc
waveview.cc
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_light.rc'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
-#env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.colors'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf'))
# data files
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png'))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files))
'ardev_common.sh.in',
'ardev', 'ardbg',
'ardour2_ui_dark.rc', 'ardour2_ui_light.rc', 'splash.png',
- 'ardour.menus', 'ardour.bindings.in',# 'ardour.colors',
+ 'ardour.menus', 'ardour.bindings.in', 'ardour2_ui_default.conf',
'editor_xpms'
] +
gtkardour_files +
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<Ardour>
+ <Canvas>
+ <Option name="waveform" value="000000cc"/>
+ <Option name="clipped waveform" value="ff0000e5"/>
+ <Option name="region base" value="bfbfc1aa"/>
+ <Option name="selected region base" value="b591a8ff"/>
+ <Option name="audio track base" value="c6d3d868"/>
+ <Option name="audio bus base" value="dbd1ea68"/>
+ <Option name="midi track base" value="ff8f8f3d"/>
+ <Option name="midi bus base" value="ff0000ee"/>
+ <Option name="time-stretch-fill" value="e2b5b596"/>
+ <Option name="time-stretch-outline" value="63636396"/>
+ <Option name="automation line" value="44bc59ff"/>
+ <Option name="processor automation line" value="7aa3f9ff"/>
+ <Option name="control point fill" value="000000ff"/>
+ <Option name="control point outline" value="000000ff"/>
+ <Option name="entered control point outline" value="ff0000ee"/>
+ <Option name="entered control point selected" value="ff3535ff"/>
+ <Option name="entered control point" value="000000cc"/>
+ <Option name="control point selected" value="00ff00ff"/>
+ <Option name="control point" value="ff0000ff"/>
+ <Option name="automation track fill" value="a0a0ce68"/>
+ <Option name="automation track outline" value="282828ff"/>
+ <Option name="crossfade editor base" value="282d49ff"/>
+ <Option name="crossfade editor line" value="000000ff"/>
+ <Option name="selected crossfade editor line" value="00dbdbff"/>
+ <Option name="crossfade editor line shading" value="00a0d154"/>
+ <Option name="crossfade editor point fill" value="00ff00ff"/>
+ <Option name="crossfade editor point outline" value="0000ffff"/>
+ <Option name="crossfade editor wave" value="ffffff28"/>
+ <Option name="selected crossfade editor wave" value="f9ea14a0"/>
+ <Option name="crossfade line" value="000000ff"/>
+ <Option name="active crossfade" value="e8ed3d77"/>
+ <Option name="inactive crossfade" value="e8ed3d77"/>
+ <Option name="location marker" value="c4f411ff"/>
+ <Option name="location range" value="497a59ff"/>
+ <Option name="location cd marker" value="1ee8c4ff"/>
+ <Option name="location loop" value="35964fff"/>
+ <Option name="location punch" value="7c3a3aff"/>
+ <Option name="verbose canvas cursor" value="f4f214bc"/>
+ <Option name="marker label" value="000000ff"/>
+ <Option name="marker bar separator" value="30303088"/>
+ <Option name="tempo bar" value="72727fff"/>
+ <Option name="meterbar" value="666672ff"/>
+ <Option name="markerbar" value="7f7f8cff"/>
+ <Option name="rangemarker bar" value="8c8c96ff"/>
+ <Option name="TransportMarkerBar" value="9898a3ff"/>
+ <Option name="RangeDragBarRect" value="969696c6"/>
+ <Option name="RangeDragRect" value="82c696c6"/>
+ <Option name="TransportDragRect" value="969696c6"/>
+ <Option name="MarkerDragLine" value="004f00f9"/>
+ <Option name="TransportLoopRect" value="1e7728f9"/>
+ <Option name="TransportPunchRect" value="6d2828e5"/>
+ <Option name="PunchLine" value="a80000ff"/>
+ <Option name="ZoomRect" value="c6d1b26d"/>
+ <Option name="RubberBandRect" value="c6c6c659"/>
+ <Option name="EnteredGainLine" value="dd6363ff"/>
+ <Option name="EnteredAutomationLine" value="dd6363ff"/>
+ <Option name="EnteredMarker" value="dd6363ff"/>
+ <Option name="MeterMarker" value="f2425bff"/>
+ <Option name="TempoMarker" value="f2425bff"/>
+ <Option name="MeasureLineBeat" value="72727266"/>
+ <Option name="MeasureLineBar" value="8c8c988c"/>
+ <Option name="GhostTrackBase" value="44007c7f"/>
+ <Option name="GhostTrackWave" value="02fd004c"/>
+ <Option name="GhostTrackWaveClip" value="ff000000"/>
+ <Option name="GhostTrackZeroLine" value="e500e566"/>
+ <Option name="ImageTrack" value="ddddd8ff"/>
+ <Option name="MarkerTrack" value="ddddd8ff"/>
+ <Option name="ZeroLine" value="b5b5b5ff"/>
+ <Option name="GainLine" value="ff00ff00"/>
+ <Option name="GainLineInactive" value="f0f0ffff"/>
+ <Option name="RecordingRect" value="e5c6c6ff"/>
+ <Option name="SelectionRect" value="e8f4d377"/>
+ <Option name="Selection" value="636363b2"/>
+ <Option name="VestigialFrame" value="44007c0f"/>
+ <Option name="TimeAxisFrame" value="44007c0f"/>
+ <Option name="NameHighlightFill" value="0000ffff"/>
+ <Option name="NameHighlightOutline" value="7c00ff96"/>
+ <Option name="FrameHandle" value="7c00ff96"/>
+ <Option name="TrimHandleLocked" value="ea0f0f28"/>
+ <Option name="TrimHandle" value="1900ff44"/>
+ <Option name="EditCursor" value="0000ffff"/>
+ <Option name="PlayHead" value="ff0000ff"/>
+ </Canvas>
+</Ardour>
+
#include "gui_thread.h"
#include "theme_manager.h"
+
#include "i18n.h"
using namespace ARDOUR;
using namespace sigc;
ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
+UIConfiguration *ARDOUR_UI::ui_config = 0;
sigc::signal<void,bool> ARDOUR_UI::Blink;
sigc::signal<void> ARDOUR_UI::RapidScreenUpdate;
theArdourUI = this;
}
- /* load colors */
-
+ ui_config = new UIConfiguration();
theme_manager = new ThemeManager();
-
- //std::string color_file = ARDOUR::find_config_file("ardour.colors");
-
- //theme_manager->load (color_file);
-
+
editor = 0;
mixer = 0;
session = 0;
}
engine->stop (true);
Config->save_state();
+ ARDOUR_UI::config()->save_state();
quit ();
}
#include "audio_clock.h"
#include "ardour_dialog.h"
#include "editing.h"
+#include "ui_config.h"
class AudioClock;
class PublicEditor;
#define FRAME_NAME "BaseFrame"
+extern sigc::signal<void> ColorsChanged;
+
class ARDOUR_UI : public Gtkmm2ext::UI
{
public:
static ARDOUR::gain_t slider_position_to_gain (double pos);
static ARDOUR_UI *instance () { return theArdourUI; }
+ static UIConfiguration *config () { return ui_config; }
PublicEditor& the_editor(){return *editor;}
Mixer_UI* the_mixer() { return mixer; }
int create_location_ui ();
void handle_locations_change (ARDOUR::Location*);
- ThemeManager* theme_manager;
+ static UIConfiguration *ui_config;
+ ThemeManager *theme_manager;
/* Options window */
#include "utils.h"
#include "rgb_macros.h"
#include "gui_thread.h"
+#include "ardour_ui.h"
#include "i18n.h"
for (uint32_t n=0; n < waves.size(); ++n) {
if (_region->muted()) {
- waves[n]->property_wave_color() = UINT_RGBA_CHANGE_A(Config->canvasvar_WaveForm.get(), MUTED_ALPHA);
+ waves[n]->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
} else {
- waves[n]->property_wave_color() = Config->canvasvar_WaveForm.get();
+ waves[n]->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
}
}
}
RegionView::set_colors();
if (gain_line) {
- gain_line->set_line_color (audio_region()->envelope_active() ? Config->canvasvar_GainLine.get() : Config->canvasvar_GainLineInactive.get());
+ gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->canvasvar_GainLine.get() : ARDOUR_UI::config()->canvasvar_GainLineInactive.get());
}
for (uint32_t n=0; n < waves.size(); ++n) {
if (_region->muted()) {
- waves[n]->property_wave_color() = UINT_RGBA_CHANGE_A(Config->canvasvar_WaveForm.get(), MUTED_ALPHA);
+ waves[n]->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA);
} else {
- waves[n]->property_wave_color() = Config->canvasvar_WaveForm.get();
+ waves[n]->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
}
- waves[n]->property_clip_color() = Config->canvasvar_WaveFormClip.get();
- waves[n]->property_zero_color() = Config->canvasvar_ZeroLine.get();
+ waves[n]->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get();
+ waves[n]->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
}
}
wave->property_height() = (double) ht;
wave->property_samples_per_unit() = samples_per_unit;
wave->property_amplitude_above_axis() = _amplitude_above_axis;
- wave->property_wave_color() = _region->muted() ? UINT_RGBA_CHANGE_A(Config->canvasvar_WaveForm.get(), MUTED_ALPHA) : Config->canvasvar_WaveForm.get();
- wave->property_clip_color() = Config->canvasvar_WaveFormClip.get();
- wave->property_zero_color() = Config->canvasvar_ZeroLine.get();
+ wave->property_wave_color() = _region->muted() ? UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA) : ARDOUR_UI::config()->canvasvar_WaveForm.get();
+ wave->property_clip_color() = ARDOUR_UI::config()->canvasvar_WaveFormClip.get();
+ wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_ZeroLine.get();
wave->property_region_start() = _region->start();
wave->property_rectified() = (bool) (_flags & WaveformRectified);
wave->property_logscaled() = (bool) (_flags & WaveformLogScaled);
zero_line = new ArdourCanvas::SimpleLine (*group);
zero_line->property_x1() = (gdouble) 1.0;
zero_line->property_x2() = (gdouble) (_region->length() / samples_per_unit) - 1.0;
- zero_line->property_color_rgba() = (guint) Config->canvasvar_ZeroLine.get();
+ zero_line->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
manage_zero_line ();
}
}
wave->property_x() = 0.0;
wave->property_samples_per_unit() = samples_per_unit;
wave->property_amplitude_above_axis() = _amplitude_above_axis;
- wave->property_wave_color() = Config->canvasvar_GhostTrackWave.get();
- wave->property_clip_color() = Config->canvasvar_GhostTrackWaveClip.get();
- wave->property_zero_color() = Config->canvasvar_GhostTrackZeroLine.get();
+ wave->property_wave_color() = ARDOUR_UI::config()->canvasvar_GhostTrackWave.get();
+ wave->property_clip_color() = ARDOUR_UI::config()->canvasvar_GhostTrackWaveClip.get();
+ wave->property_zero_color() = ARDOUR_UI::config()->canvasvar_GhostTrackZeroLine.get();
wave->property_region_start() = _region->start();
ghost->waves.push_back(wave);
AudioRegionView::envelope_active_changed ()
{
if (gain_line) {
- gain_line->set_line_color (audio_region()->envelope_active() ? Config->canvasvar_GainLine.get() : Config->canvasvar_GainLineInactive.get());
+ gain_line->set_line_color (audio_region()->envelope_active() ? ARDOUR_UI::config()->canvasvar_GainLine.get() : ARDOUR_UI::config()->canvasvar_GainLineInactive.get());
}
}
_waveform_shape = Traditional;
if (tv.is_track())
- stream_base_color = Config->canvasvar_AudioTrackBase.get();
+ stream_base_color = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get();
else
- stream_base_color = Config->canvasvar_AudioBusBase.get();
+ stream_base_color = ARDOUR_UI::config()->canvasvar_AudioBusBase.get();
canvas_rect->property_fill_color_rgba() = stream_base_color;
canvas_rect->property_outline_color_rgba() = RGBA_BLACK;
switch (_trackview.audio_track()->mode()) {
case Normal:
xend = xstart;
- fill_color = Config->canvasvar_RecordingRect.get();
+ fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
break;
case Destructive:
xend = xstart + 2;
- fill_color = Config->canvasvar_RecordingRect.get();
+ fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
/* make the recording rect translucent to allow
the user to see the peak data coming in, etc.
*/
rec_rect->property_y1() = 1.0;
rec_rect->property_x2() = xend;
rec_rect->property_y2() = (double) _trackview.height - 1;
- rec_rect->property_outline_color_rgba() = Config->canvasvar_RecordingRect.get();
+ rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
rec_rect->property_fill_color_rgba() = fill_color;
rec_rect->lower_to_bottom();
{
//case cAudioTrackBase:
if (_trackview.is_track()) {
- canvas_rect->property_fill_color_rgba() = Config->canvasvar_AudioTrackBase.get();
+ canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get();
}
//case cAudioBusBase:
if (!_trackview.is_track()) {
- canvas_rect->property_fill_color_rgba() = Config->canvasvar_AudioBusBase.get();
+ canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioBusBase.get();
}
}
*gain_track->canvas_display,
c->list());
- line->set_line_color (Config->canvasvar_AutomationLine.get());
+ line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
gain_track->add_line (*line);
if (p == _route->panner().begin()) {
/* first line is a nice orange */
- line->set_line_color (Config->canvasvar_AutomationLine.get());
+ line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
} else {
/* second line is a nice blue */
- line->set_line_color (Config->canvasvar_AutomationLine.get());
+ line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
}
pan_track->add_line (*line);
item = new Canvas::SimpleRect (line.canvas_group());
item->property_draw() = true;
item->property_fill() = false;
- item->property_fill_color_rgba() = Config->canvasvar_ControlPointFill.get();
- item->property_outline_color_rgba() = Config->canvasvar_ControlPointOutline.get();
+ item->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ControlPointFill.get();
+ item->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ControlPointOutline.get();
item->property_outline_pixels() = 1;
item->set_data ("control_point", this);
item->signal_event().connect (mem_fun (this, &ControlPoint::event_handler));
item = new Canvas::SimpleRect (line.canvas_group());
item->property_fill() = false;
- item->property_outline_color_rgba() = Config->canvasvar_EnteredControlPointOutline.get();
+ item->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredControlPointOutline.get();
item->property_outline_pixels() = 1;
/* NOTE: no event handling in copied ControlPoints */
{
if (entered) {
if (selected) {
- item->property_outline_color_rgba() = Config->canvasvar_EnteredControlPointSelected.get();
+ item->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredControlPointSelected.get();
set_visible(true);
} else {
- item->property_outline_color_rgba() = Config->canvasvar_EnteredControlPoint.get();
+ item->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredControlPoint.get();
if (hide_too) {
set_visible(false);
}
} else {
if (selected) {
- item->property_outline_color_rgba() = Config->canvasvar_ControlPointSelected.get();
+ item->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ControlPointSelected.get();
set_visible(true);
} else {
- item->property_outline_color_rgba() = Config->canvasvar_ControlPoint.get();
+ item->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ControlPoint.get();
if (hide_too) {
set_visible(false);
}
}
void AutomationLine::set_colors() {
- set_line_color( Config->canvasvar_AutomationLine.get() );
+ set_line_color( ARDOUR_UI::config()->canvasvar_AutomationLine.get() );
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
(*i)->show_color (false, !points_visible);
}
base_rect->property_x1() = 0.0;
base_rect->property_y1() = 0.0;
base_rect->property_x2() = editor.frame_to_pixel (max_frames);
- base_rect->property_outline_color_rgba() = Config->canvasvar_AutomationTrackOutline.get();
+ base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get();
/* outline ends and bottom */
base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);
- base_rect->property_fill_color_rgba() = Config->canvasvar_AutomationTrackFill.get();
- //base_rect->property_fill_color_rgba() = Config->canvasvar_EnteredControlPoint.get();
+ base_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackFill.get();
+ //base_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredControlPoint.get();
base_rect->set_data ("trackview", this);
--- /dev/null
+CANVAS_VARIABLE(canvasvar_WaveForm, "waveform")
+CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
+CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
+CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
+CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base")
+CANVAS_VARIABLE(canvasvar_AudioBusBase, "audio bus base")
+CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")
+CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
+CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time-stretch-fill")
+CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time-stretch-outline")
+CANVAS_VARIABLE(canvasvar_AutomationLine, "automation line")
+CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
+CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill")
+CANVAS_VARIABLE(canvasvar_ControlPointOutline, "control point outline")
+CANVAS_VARIABLE(canvasvar_EnteredControlPointOutline, "entered control point outline")
+CANVAS_VARIABLE(canvasvar_EnteredControlPointSelected, "entered control point selected")
+CANVAS_VARIABLE(canvasvar_EnteredControlPoint, "entered control point")
+CANVAS_VARIABLE(canvasvar_ControlPointSelected, "control point selected")
+CANVAS_VARIABLE(canvasvar_ControlPoint, "control point")
+CANVAS_VARIABLE(canvasvar_AutomationTrackFill, "automation track fill")
+CANVAS_VARIABLE(canvasvar_AutomationTrackOutline, "automation track outline")
+CANVAS_VARIABLE(canvasvar_CrossfadeEditorBase, "crossfade editor base")
+CANVAS_VARIABLE(canvasvar_CrossfadeEditorLine, "crossfade editor line")
+CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
+CANVAS_VARIABLE(canvasvar_CrossfadeEditorLineShading, "crossfade editor line shading")
+CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointFill, "crossfade editor point fill")
+CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointOutline, "crossfade editor point outline")
+CANVAS_VARIABLE(canvasvar_CrossfadeEditorWave, "crossfade editor wave")
+CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
+CANVAS_VARIABLE(canvasvar_CrossfadeLine, "crossfade line")
+CANVAS_VARIABLE(canvasvar_ActiveCrossfade, "active crossfade")
+CANVAS_VARIABLE(canvasvar_InactiveCrossfade, "inactive crossfade")
+CANVAS_VARIABLE(canvasvar_LocationMarker, "location marker")
+CANVAS_VARIABLE(canvasvar_LocationRange, "location range")
+CANVAS_VARIABLE(canvasvar_LocationCDMarker, "location cd marker")
+CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop")
+CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch")
+CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
+CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
+CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
+CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
+CANVAS_VARIABLE(canvasvar_MeterBar, "meterbar")
+CANVAS_VARIABLE(canvasvar_MarkerBar, "markerbar")
+CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "rangemarker bar")
+CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "TransportMarkerBar")
+CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "RangeDragBarRect")
+CANVAS_VARIABLE(canvasvar_RangeDragRect, "RangeDragRect")
+CANVAS_VARIABLE(canvasvar_TransportDragRect, "TransportDragRect")
+CANVAS_VARIABLE(canvasvar_MarkerDragLine, "MarkerDragLine")
+CANVAS_VARIABLE(canvasvar_TransportLoopRect, "TransportLoopRect")
+CANVAS_VARIABLE(canvasvar_TransportPunchRect, "TransportPunchRect")
+CANVAS_VARIABLE(canvasvar_PunchLine, "PunchLine")
+CANVAS_VARIABLE(canvasvar_ZoomRect, "ZoomRect")
+CANVAS_VARIABLE(canvasvar_RubberBandRect, "RubberBandRect")
+CANVAS_VARIABLE(canvasvar_EnteredGainLine, "EnteredGainLine")
+CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "EnteredAutomationLine")
+CANVAS_VARIABLE(canvasvar_EnteredMarker, "EnteredMarker")
+CANVAS_VARIABLE(canvasvar_MeterMarker, "MeterMarker")
+CANVAS_VARIABLE(canvasvar_TempoMarker, "TempoMarker")
+CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "MeasureLineBeat")
+CANVAS_VARIABLE(canvasvar_MeasureLineBar, "MeasureLineBar")
+CANVAS_VARIABLE(canvasvar_GhostTrackBase, "GhostTrackBase")
+CANVAS_VARIABLE(canvasvar_GhostTrackWave, "GhostTrackWave")
+CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "GhostTrackWaveClip")
+CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "GhostTrackZeroLine")
+CANVAS_VARIABLE(canvasvar_ImageTrack, "ImageTrack")
+CANVAS_VARIABLE(canvasvar_MarkerTrack, "MarkerTrack")
+CANVAS_VARIABLE(canvasvar_ZeroLine, "ZeroLine")
+CANVAS_VARIABLE(canvasvar_GainLine, "GainLine")
+CANVAS_VARIABLE(canvasvar_GainLineInactive, "GainLineInactive")
+CANVAS_VARIABLE(canvasvar_RecordingRect, "RecordingRect")
+CANVAS_VARIABLE(canvasvar_SelectionRect, "SelectionRect")
+CANVAS_VARIABLE(canvasvar_Selection, "Selection")
+CANVAS_VARIABLE(canvasvar_VestigialFrame, "VestigialFrame")
+CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "TimeAxisFrame")
+CANVAS_VARIABLE(canvasvar_NameHighlightFill, "NameHighlightFill")
+CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "NameHighlightOutline")
+CANVAS_VARIABLE(canvasvar_FrameHandle, "FrameHandle")
+CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "TrimHandleLocked")
+CANVAS_VARIABLE(canvasvar_TrimHandle, "TrimHandle")
+CANVAS_VARIABLE(canvasvar_EditCursor, "EditCursor")
+CANVAS_VARIABLE(canvasvar_PlayHead, "PlayHead")
toplevel->property_x2() = 10.0;
toplevel->property_y2() = 10.0;
toplevel->property_fill() = true;
- toplevel->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorBase.get();
+ toplevel->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorBase.get();
toplevel->property_outline_pixels() = 0;
toplevel->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event));
fade[Out].line = new ArdourCanvas::Line (*(canvas->root()));
fade[Out].line->property_width_pixels() = 1;
- fade[Out].line->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLine.get();
+ fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get();
fade[Out].shading = new ArdourCanvas::Polygon (*(canvas->root()));
- fade[Out].shading->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLineShading.get();
+ fade[Out].shading->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get();
fade[In].line = new ArdourCanvas::Line (*(canvas->root()));
fade[In].line->property_width_pixels() = 1;
- fade[In].line->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLine.get();
+ fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get();
fade[In].shading = new ArdourCanvas::Polygon (*(canvas->root()));
- fade[In].shading->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLineShading.get();
+ fade[In].shading->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLineShading.get();
fade[In].shading->signal_event().connect (mem_fun (*this, &CrossfadeEditor::canvas_event));
fade[In].line->signal_event().connect (mem_fun (*this, &CrossfadeEditor::curve_event));
p->box = new ArdourCanvas::SimpleRect (*(canvas->root()));
p->box->property_fill() = true;
- p->box->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorPointFill.get();
- p->box->property_outline_color_rgba() = Config->canvasvar_CrossfadeEditorPointOutline.get();
+ p->box->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorPointFill.get();
+ p->box->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorPointOutline.get();
p->box->property_outline_pixels() = 1;
p->curve = fade[current].line;
if (wf == In) {
for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
- (*i)->property_wave_color() = Config->canvasvar_SelectedCrossfadeEditorWave.get();
+ (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
}
for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
- (*i)->property_wave_color() = Config->canvasvar_CrossfadeEditorWave.get();
+ (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
}
- fade[In].line->property_fill_color_rgba() = Config->canvasvar_SelectedCrossfadeEditorLine.get();
- fade[Out].line->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLine.get();
+ fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorLine.get();
+ fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get();
fade[Out].shading->hide();
fade[In].shading->show();
} else {
for (vector<ArdourCanvas::WaveView*>::iterator i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i) {
- (*i)->property_wave_color() = Config->canvasvar_CrossfadeEditorWave.get();
+ (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
}
for (vector<ArdourCanvas::WaveView*>::iterator i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i) {
- (*i)->property_wave_color() = Config->canvasvar_SelectedCrossfadeEditorWave.get();
+ (*i)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
}
- fade[Out].line->property_fill_color_rgba() = Config->canvasvar_SelectedCrossfadeEditorLine.get();
- fade[In].line->property_fill_color_rgba() = Config->canvasvar_CrossfadeEditorLine.get();
+ fade[Out].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorLine.get();
+ fade[In].line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeEditorLine.get();
fade[In].shading->hide();
fade[Out].shading->show();
double spu;
if (which == In) {
- color = Config->canvasvar_SelectedCrossfadeEditorWave.get();
+ color = ARDOUR_UI::config()->canvasvar_SelectedCrossfadeEditorWave.get();
} else {
- color = Config->canvasvar_CrossfadeEditorWave.get();
+ color = ARDOUR_UI::config()->canvasvar_CrossfadeEditorWave.get();
}
ht = canvas->get_allocation().get_height() / (double) nchans;
#include "audio_region_view.h"
#include "utils.h"
#include "canvas_impl.h"
+#include "ardour_ui.h"
using namespace sigc;
using namespace ARDOUR;
_visible = true;
fade_in = new Line (*group);
- fade_in->property_fill_color_rgba() = Config->canvasvar_CrossfadeLine.get();
+ fade_in->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
fade_in->property_width_pixels() = 1;
fade_out = new Line (*group);
- fade_out->property_fill_color_rgba() = Config->canvasvar_CrossfadeLine.get();
+ fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
fade_out->property_width_pixels() = 1;
set_y_position_and_height (0, get_time_axis_view().height);
CrossfadeView::active_changed ()
{
if (crossfade->active()) {
- frame->property_fill_color_rgba() = Config->canvasvar_ActiveCrossfade.get();
+ frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get();
} else {
- frame->property_fill_color_rgba() = Config->canvasvar_InactiveCrossfade.get();
+ frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_InactiveCrossfade.get();
}
redraw_curves ();
_dragging_playhead = false;
_dragging_hscrollbar = false;
- location_marker_color = Config->canvasvar_LocationMarker.get();
- location_range_color = Config->canvasvar_LocationRange.get();
- location_cd_marker_color = Config->canvasvar_LocationCDMarker.get();
- location_loop_color = Config->canvasvar_LocationLoop.get();
- location_punch_color = Config->canvasvar_LocationPunch.get();
+ location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get();
+ location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get();
+ location_cd_marker_color = ARDOUR_UI::config()->canvasvar_LocationCDMarker.get();
+ location_loop_color = ARDOUR_UI::config()->canvasvar_LocationLoop.get();
+ location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get();
range_marker_drag_rect = 0;
marker_drag_line = 0;
void
Editor::color_handler()
{
- edit_cursor->canvas_item.property_fill_color_rgba() = Config->canvasvar_EditCursor.get();
- playhead_cursor->canvas_item.property_fill_color_rgba() = Config->canvasvar_PlayHead.get();
- verbose_canvas_cursor->property_fill_color_rgba() = Config->canvasvar_VerboseCanvasCursor.get();
+ edit_cursor->canvas_item.property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EditCursor.get();
+ playhead_cursor->canvas_item.property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_PlayHead.get();
+ verbose_canvas_cursor->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VerboseCanvasCursor.get();
- meter_bar->property_fill_color_rgba() = Config->canvasvar_MeterBar.get();
- meter_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
+ meter_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MeterBar.get();
+ meter_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
- tempo_bar->property_fill_color_rgba() = Config->canvasvar_TempoBar.get();
- tempo_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
+ tempo_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TempoBar.get();
+ tempo_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
- marker_bar->property_fill_color_rgba() = Config->canvasvar_MarkerBar.get();
- marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
+ marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBar.get();
+ marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
- range_marker_bar->property_fill_color_rgba() = Config->canvasvar_RangeMarkerBar.get();
- range_marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
+ range_marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeMarkerBar.get();
+ range_marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
- transport_marker_bar->property_fill_color_rgba() = Config->canvasvar_TransportMarkerBar.get();
- transport_marker_bar->property_outline_color_rgba() = Config->canvasvar_MarkerBarSeparator.get();
+ transport_marker_bar->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportMarkerBar.get();
+ transport_marker_bar->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerBarSeparator.get();
- range_bar_drag_rect->property_fill_color_rgba() = Config->canvasvar_RangeDragBarRect.get();
- range_bar_drag_rect->property_outline_color_rgba() = Config->canvasvar_RangeDragBarRect.get();
+ range_bar_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get();
+ range_bar_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragBarRect.get();
- transport_bar_drag_rect->property_fill_color_rgba() = Config->canvasvar_TransportDragRect.get();
- transport_bar_drag_rect->property_outline_color_rgba() = Config->canvasvar_TransportDragRect.get();
+ transport_bar_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportDragRect.get();
+ transport_bar_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportDragRect.get();
- marker_drag_line->property_fill_color_rgba() = Config->canvasvar_MarkerDragLine.get();
+ marker_drag_line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerDragLine.get();
- range_marker_drag_rect->property_fill_color_rgba() = Config->canvasvar_RangeDragRect.get();
- range_marker_drag_rect->property_outline_color_rgba() = Config->canvasvar_RangeDragRect.get();
+ range_marker_drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragRect.get();
+ range_marker_drag_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragRect.get();
- transport_loop_range_rect->property_fill_color_rgba() = Config->canvasvar_TransportLoopRect.get();
- transport_loop_range_rect->property_outline_color_rgba() = Config->canvasvar_TransportLoopRect.get();
+ transport_loop_range_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportLoopRect.get();
+ transport_loop_range_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportLoopRect.get();
- transport_punch_range_rect->property_fill_color_rgba() = Config->canvasvar_TransportPunchRect.get();
- transport_punch_range_rect->property_outline_color_rgba() = Config->canvasvar_TransportPunchRect.get();
+ transport_punch_range_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportPunchRect.get();
+ transport_punch_range_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TransportPunchRect.get();
- transport_punchin_line->property_color_rgba() = Config->canvasvar_PunchLine.get();
- transport_punchout_line->property_color_rgba() = Config->canvasvar_PunchLine.get();
+ transport_punchin_line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_PunchLine.get();
+ transport_punchout_line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_PunchLine.get();
- zoom_rect->property_fill_color_rgba() = Config->canvasvar_ZoomRect.get();
- zoom_rect->property_outline_color_rgba() = Config->canvasvar_ZoomRect.get();
+ zoom_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ZoomRect.get();
+ zoom_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ZoomRect.get();
- rubberband_rect->property_outline_color_rgba() = Config->canvasvar_RubberBandRect.get();
- rubberband_rect->property_fill_color_rgba() = (guint32) Config->canvasvar_RubberBandRect.get();
+ rubberband_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RubberBandRect.get();
+ rubberband_rect->property_fill_color_rgba() = (guint32) ARDOUR_UI::config()->canvasvar_RubberBandRect.get();
- location_marker_color = Config->canvasvar_LocationMarker.get();
- location_range_color = Config->canvasvar_LocationRange.get();
- location_cd_marker_color = Config->canvasvar_LocationCDMarker.get();
- location_loop_color = Config->canvasvar_LocationLoop.get();
- location_punch_color = Config->canvasvar_LocationPunch.get();
+ location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get();
+ location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get();
+ location_cd_marker_color = ARDOUR_UI::config()->canvasvar_LocationCDMarker.get();
+ location_loop_color = ARDOUR_UI::config()->canvasvar_LocationLoop.get();
+ location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get();
refresh_location_display ();
redisplay_tempo (true);
if (mouse_mode == MouseGain) {
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
if (line)
- line->property_fill_color_rgba() = Config->canvasvar_EnteredGainLine.get();
+ line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredGainLine.get();
if (is_drawable()) {
track_canvas.get_window()->set_cursor (*fader_cursor);
}
{
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
if (line)
- line->property_fill_color_rgba() = Config->canvasvar_EnteredAutomationLine.get();
+ line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredAutomationLine.get();
}
if (is_drawable()) {
track_canvas.get_window()->set_cursor (*fader_cursor);
if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) {
break;
}
- marker->set_color_rgba (Config->canvasvar_EnteredMarker.get());
+ marker->set_color_rgba (ARDOUR_UI::config()->canvasvar_EnteredMarker.get());
// fall through
case MeterMarkerItem:
case TempoMarkerItem:
// The actual copying is not done before we reach the finish callback.
char name[64];
snprintf (name, sizeof(name), "%g/%g", meter_marker->meter().beats_per_bar(), meter_marker->meter().note_divisor ());
- MeterMarker* new_marker = new MeterMarker(*this, *meter_group, Config->canvasvar_MeterMarker.get(), name,
+ MeterMarker* new_marker = new MeterMarker(*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), name,
*new MeterSection(meter_marker->meter()));
drag_info.item = &new_marker->the_item();
// The actual copying is not done before we reach the finish callback.
char name[64];
snprintf (name, sizeof (name), "%.2f", tempo_marker->tempo().beats_per_minute());
- TempoMarker* new_marker = new TempoMarker(*this, *tempo_group, Config->canvasvar_TempoMarker.get(), name,
+ TempoMarker* new_marker = new TempoMarker(*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), name,
*new TempoSection(tempo_marker->tempo()));
drag_info.item = &new_marker->the_item();
#include "gui_thread.h"
#include "color.h"
#include "time_axis_view.h"
+#include "ardour_ui.h"
#include "i18n.h"
if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
- metric_marks.push_back (new MeterMarker (*this, *meter_group, Config->canvasvar_MeterMarker.get(), buf,
+ metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
*(const_cast<MeterSection*>(ms))));
} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
- metric_marks.push_back (new TempoMarker (*this, *tempo_group, Config->canvasvar_TempoMarker.get(), buf,
+ metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
*(const_cast<TempoSection*>(ts))));
}
case TempoMap::Beat:
if ((*i).beat == 1) {
- color = Config->canvasvar_MeasureLineBar.get();
+ color = ARDOUR_UI::config()->canvasvar_MeasureLineBar.get();
} else {
- color = Config->canvasvar_MeasureLineBeat.get();
+ color = ARDOUR_UI::config()->canvasvar_MeasureLineBeat.get();
if (beat_density > 2.0) {
/* only draw beat lines if the gaps between beats are large.
#include "ghostregion.h"
#include "automation_time_axis.h"
#include "rgb_macros.h"
+#include "ardour_ui.h"
using namespace Editing;
using namespace ArdourCanvas;
base_rect->property_y1() = (double) 0.0;
base_rect->property_y2() = (double) trackview.height;
base_rect->property_outline_what() = (guint32) 0;
- base_rect->property_outline_color_rgba() = Config->canvasvar_GhostTrackBase.get();
- base_rect->property_fill_color_rgba() = Config->canvasvar_GhostTrackBase.get();
+ base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackBase.get();
+ base_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackBase.get();
group->lower_to_bottom ();
atv.add_ghost (this);
void
GhostRegion::set_colors ()
{
- base_rect->property_outline_color_rgba() = Config->canvasvar_GhostTrackBase.get();
- base_rect->property_fill_color_rgba() = Config->canvasvar_GhostTrackBase.get();
+ base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackBase.get();
+ base_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackBase.get();
for (uint32_t n=0; n < waves.size(); ++n) {
- waves[n]->property_wave_color() = Config->canvasvar_GhostTrackWave.get();
+ waves[n]->property_wave_color() = ARDOUR_UI::config()->canvasvar_GhostTrackWave.get();
- waves[n]->property_clip_color() = Config->canvasvar_GhostTrackWaveClip.get();
- waves[n]->property_zero_color() = Config->canvasvar_GhostTrackZeroLine.get();
+ waves[n]->property_clip_color() = ARDOUR_UI::config()->canvasvar_GhostTrackWaveClip.get();
+ waves[n]->property_zero_color() = ARDOUR_UI::config()->canvasvar_GhostTrackZeroLine.get();
}
}
#include "public_editor.h"
#include "rgb_macros.h"
#include "gui_thread.h"
+#include "ardour_ui.h"
#include "i18n.h"
canvas_rect (canvas_group, 0.0, 0.0, 1000000.0, tv.height)
{
region_color = _trackview.color() ;
- stream_base_color = Config->canvasvar_ImageTrack.get() ;
+ stream_base_color = ARDOUR_UI::config()->canvasvar_ImageTrack.get() ;
- canvas_rect.property_outline_color_rgba() = Config->canvasvar_ImageTrack.get();
+ canvas_rect.property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ImageTrack.get();
canvas_rect.property_fill_color_rgba() = stream_base_color;
canvas_rect.signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_imageframe_view_event), (ArdourCanvas::Item*) &canvas_rect, &tv));
return -1;
}
- ui->setup_theme ();
ui->start_engine ();
if (maybe_load_session ()) {
#include "utils.h"
#include "canvas_impl.h"
#include "color.h"
+#include "ardour_ui.h"
#include "i18n.h"
}
text->property_y() = 0.0;
text->property_anchor() = Gtk::ANCHOR_NW;
- text->property_fill_color_rgba() = Config->canvasvar_MarkerLabel.get();
+ text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerLabel.get();
editor.ZoomChanged.connect (mem_fun (*this, &Marker::reposition));
#include "public_editor.h"
#include "rgb_macros.h"
#include "gui_thread.h"
+#include "ardour_ui.h"
#include "i18n.h"
: _trackview (tv)
{
region_color = _trackview.color();
- stream_base_color = Config->canvasvar_MarkerTrack.get();
+ stream_base_color = ARDOUR_UI::config()->canvasvar_MarkerTrack.get();
canvas_group = new ArdourCanvas::Group (*_trackview.canvas_display);
canvas_rect->property_y1() = 0.0;
canvas_rect->property_x2() = max_frames;
canvas_rect->property_y2() = (double)20;
- canvas_rect->property_outline_color_rgba() = Config->canvasvar_MarkerTrack.get();
+ canvas_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerTrack.get();
canvas_rect->property_fill_color_rgba() = stream_base_color;
canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview));
: StreamView (tv)
{
if (tv.is_track())
- stream_base_color = Config->canvasvar_MidiTrackBase.get();
+ stream_base_color = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
else
- stream_base_color = Config->canvasvar_MidiBusBase.get();
+ stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();
canvas_rect->property_fill_color_rgba() = stream_base_color;
canvas_rect->property_outline_color_rgba() = RGBA_BLACK;
assert(_trackview.midi_track()->mode() == Normal);
xend = xstart;
- fill_color = Config->canvasvar_RecordingRect.get();
+ fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
rec_rect->property_x1() = xstart;
rec_rect->property_y1() = 1.0;
rec_rect->property_x2() = xend;
rec_rect->property_y2() = (double) _trackview.height - 1;
- rec_rect->property_outline_color_rgba() = Config->canvasvar_RecordingRect.get();
+ rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
rec_rect->property_fill_color_rgba() = fill_color;
rec_rect->lower_to_bottom();
//case cMidiTrackBase:
if (_trackview.is_midi_track()) {
- canvas_rect->property_fill_color_rgba() = Config->canvasvar_MidiTrackBase.get();
+ canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
}
//case cMidiBusBase:
if (!_trackview.is_midi_track()) {
- canvas_rect->property_fill_color_rgba() = Config->canvasvar_MidiBusBase.get();;
+ canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
}
}
*track->canvas_display,
c->list());
- line->set_line_color (Config->canvasvar_AutomationLine.get());
+ line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
track->add_line(*line);
timestretch_rect->property_y1() = 0.0;
timestretch_rect->property_x2() = 0.0;
timestretch_rect->property_y2() = 0.0;
- timestretch_rect->property_fill_color_rgba() = Config->canvasvar_TimeStretchFill.get();
- timestretch_rect->property_outline_color_rgba() = Config->canvasvar_TimeStretchOutline.get();
+ timestretch_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
+ timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
}
timestretch_rect->show ();
{
//case cTimeStretchOutline:
if (timestretch_rect) {
- timestretch_rect->property_outline_color_rgba() = Config->canvasvar_TimeStretchOutline.get();
+ timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
}
//case cTimeStretchFill:
if (timestretch_rect) {
- timestretch_rect->property_fill_color_rgba() = Config->canvasvar_TimeStretchFill.get();
+ timestretch_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
}
}
*processor, *ran->view, *ran->view->canvas_display,
processor->control (what, true)->list());
- ral->set_line_color (Config->canvasvar_ProcessorAutomationLine.get());
+ ral->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
ral->queue_reset ();
ran->view->add_line (*ral);
#include "theme_manager.h"
#include "rgb_macros.h"
+#include "ardour_ui.h"
#include "i18n.h"
light_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_light_theme_button_toggled));
set_size_request (-1, 400);
+ setup_theme ();
}
ThemeManager::~ThemeManager()
int cellx;
int celly;
- ARDOUR::ConfigVariable<uint32_t> *ccvar;
+ UIConfigVariable<uint32_t> *ccvar;
if (!color_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
return false;
UINT_TO_RGBA (rgba, &r, &g, &b, &a);
color.set_rgb_p (r / 255.0, g / 255.0, b / 255.0);
- color_dialog.get_colorsel()->set_current_color (color);
color_dialog.get_colorsel()->set_previous_color (color);
- color_dialog.get_colorsel()->set_current_alpha (a * 256);
+ color_dialog.get_colorsel()->set_current_color (color);
color_dialog.get_colorsel()->set_previous_alpha (a * 256);
+ color_dialog.get_colorsel()->set_current_alpha (a * 256);
+
ResponseType result = (ResponseType) color_dialog.run();
switch (result) {
rgba = RGBA_TO_UINT(r,g,b,a>>8);
//cerr << (*iter)[columns.name] << " == " << hex << rgba << endl;
+ //cerr << "a = " << a << endl;
(*iter)[columns.rgba] = rgba;
(*iter)[columns.gdkcolor] = color;
{
if (!dark_button.get_active()) return;
- Config->set_ui_rc_file("ardour2_ui_dark.rc");
- load_rc_file (Config->get_ui_rc_file());
+ ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_light.rc");
+ load_rc_file (ARDOUR_UI::config()->ui_rc_file.get());
}
void
{
if (!light_button.get_active()) return;
- Config->set_ui_rc_file("ardour2_ui_light.rc");
- load_rc_file (Config->get_ui_rc_file());
+ ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_light.rc");
+ load_rc_file (ARDOUR_UI::config()->ui_rc_file.get());
}
void
ThemeManager::setup_theme ()
{
int r, g, b, a;
- for (std::vector<ConfigVariable<uint32_t> *>::iterator i = Config->canvas_colors.begin(); i != Config->canvas_colors.end(); i++) {
+ for (std::vector<UIConfigVariable<uint32_t> *>::iterator i = ARDOUR_UI::config()->canvas_colors.begin(); i != ARDOUR_UI::config()->canvas_colors.end(); i++) {
TreeModel::Row row = *(color_list->append());
row[columns.rgba] = rgba;
row[columns.gdkcolor] = col;
- //cerr << (*i)->name() << " == " << rgba << endl;
}
ColorsChanged.emit();
string rcfile = Glib::getenv("ARDOUR2_UI_RC", env_defined);
if(!env_defined) {
- rcfile = Config->get_ui_rc_file();
+ rcfile = ARDOUR_UI::config()->ui_rc_file.get();
}
if (rcfile == "ardour2_ui_dark.rc") {
#include <gtkmm/colorselection.h>
#include <gtkmm/radiobutton.h>
#include <gtkmm/rc.h>
-#include <ardour/configuration.h>
#include "ardour_dialog.h"
-
+#include "ui_config.h"
class ThemeManager : public ArdourDialog
{
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<Glib::ustring> color;
Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
- Gtk::TreeModelColumn<ARDOUR::ConfigVariable<uint32_t> *> pVar;
+ Gtk::TreeModelColumn<UIConfigVariable<uint32_t> *> pVar;
Gtk::TreeModelColumn<uint32_t> rgba;
};
bool button_press_event (GdkEventButton*);
};
-
#endif /* __ardour_gtk_color_manager_h__ */
rect->rect->property_y1() = 0.0;
rect->rect->property_x2() = 0.0;
rect->rect->property_y2() = 0.0;
- rect->rect->property_fill_color_rgba() = Config->canvasvar_SelectionRect.get();
- rect->rect->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ rect->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get();
+ rect->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
rect->start_trim = new SimpleRect (*selection_group);
rect->start_trim->property_x1() = 0.0;
rect->start_trim->property_x2() = 0.0;
- rect->start_trim->property_fill_color_rgba() = Config->canvasvar_Selection.get();
- rect->start_trim->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ rect->start_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
+ rect->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
rect->end_trim = new SimpleRect (*selection_group);
rect->end_trim->property_x1() = 0.0;
rect->end_trim->property_x2() = 0.0;
- rect->end_trim->property_fill_color_rgba() = Config->canvasvar_Selection.get();
- rect->end_trim->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ rect->end_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
+ rect->end_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
free_selection_rects.push_front (rect);
for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
- (*i)->rect->property_fill_color_rgba() = Config->canvasvar_SelectionRect.get();
- (*i)->rect->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ (*i)->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get();
+ (*i)->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
- (*i)->start_trim->property_fill_color_rgba() = Config->canvasvar_Selection.get();
- (*i)->start_trim->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ (*i)->start_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
+ (*i)->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
- (*i)->end_trim->property_fill_color_rgba() = Config->canvasvar_Selection.get();
- (*i)->end_trim->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ (*i)->end_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
+ (*i)->end_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
}
for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
- (*i)->rect->property_fill_color_rgba() = Config->canvasvar_SelectionRect.get();
- (*i)->rect->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ (*i)->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get();
+ (*i)->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
- (*i)->start_trim->property_fill_color_rgba() = Config->canvasvar_Selection.get();
- (*i)->start_trim->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ (*i)->start_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
+ (*i)->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
- (*i)->end_trim->property_fill_color_rgba() = Config->canvasvar_Selection.get();
- (*i)->end_trim->property_outline_color_rgba() = Config->canvasvar_Selection.get();
+ (*i)->end_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
+ (*i)->end_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get();
}
}
#include "utils.h"
#include "canvas_impl.h"
#include "rgb_macros.h"
+#include "ardour_ui.h"
#include "i18n.h"
vestigial_frame->property_y1() = (double) 1.0;
vestigial_frame->property_x2() = 2.0;
vestigial_frame->property_y2() = (double) trackview.height;
- vestigial_frame->property_outline_color_rgba() = Config->canvasvar_VestigialFrame.get();
- vestigial_frame->property_fill_color_rgba() = Config->canvasvar_VestigialFrame.get();
+ vestigial_frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get();
+ vestigial_frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get();
vestigial_frame->hide ();
if (visibility & ShowFrame) {
frame->property_y1() = (double) 1.0;
frame->property_x2() = (double) trackview.editor.frame_to_pixel(duration);
frame->property_y2() = (double) trackview.height;
- frame->property_outline_color_rgba() = Config->canvasvar_TimeAxisFrame.get();
- frame->property_fill_color_rgba() = Config->canvasvar_TimeAxisFrame.get();
+ frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
+ frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
/* by default draw all 4 edges */
}
name_highlight->property_y1() = (double) (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE);
name_highlight->property_y2() = (double) (trackview.height - 1);
- name_highlight->property_outline_color_rgba() = Config->canvasvar_NameHighlightFill.get();
- name_highlight->property_fill_color_rgba() = Config->canvasvar_NameHighlightOutline.get();
+ name_highlight->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_NameHighlightFill.get();
+ name_highlight->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_NameHighlightOutline.get();
name_highlight->set_data ("timeaxisviewitem", this);
frame_handle_start->property_x2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH;
frame_handle_start->property_y1() = (double) 1.0;
frame_handle_start->property_y2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH+1;
- frame_handle_start->property_outline_color_rgba() = Config->canvasvar_FrameHandle.get();
- frame_handle_start->property_fill_color_rgba() = Config->canvasvar_FrameHandle.get();
+ frame_handle_start->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get();
+ frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get();
frame_handle_end = new ArdourCanvas::SimpleRect (*group);
frame_handle_end->property_x1() = (double) (trackview.editor.frame_to_pixel(get_duration())) - (TimeAxisViewItem::GRAB_HANDLE_LENGTH);
frame_handle_end->property_x2() = (double) trackview.editor.frame_to_pixel(get_duration());
frame_handle_end->property_y1() = (double) 1;
frame_handle_end->property_y2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH + 1;
- frame_handle_end->property_outline_color_rgba() = Config->canvasvar_FrameHandle.get();
- frame_handle_end->property_fill_color_rgba() = Config->canvasvar_FrameHandle.get();
+ frame_handle_end->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get();
+ frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get();
} else {
frame_handle_start = 0;
uint32_t r,g,b,a;
if (_selected && should_show_selection) {
- UINT_TO_RGBA(Config->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a);
+ UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a);
frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
} else {
- UINT_TO_RGBA(Config->canvasvar_FrameBase.get(), &r, &g, &b, &a);
+ UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a);
frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
}
}
{
if (frame_handle_start) {
if (position_locked) {
- frame_handle_start->property_fill_color_rgba() = Config->canvasvar_TrimHandleLocked.get();
- frame_handle_end->property_fill_color_rgba() = Config->canvasvar_TrimHandleLocked.get();
+ frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get();
+ frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get();
} else {
- frame_handle_start->property_fill_color_rgba() = Config->canvasvar_TrimHandle.get();
- frame_handle_end->property_fill_color_rgba() = Config->canvasvar_TrimHandle.get();
+ frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandle.get();
+ frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandle.get();
}
}
}
--- /dev/null
+UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "ardour2_ui_dark.rc")
+
+++ /dev/null
-CANVAS_VARIABLE(canvasvar_WaveForm, "waveform")
-CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
-CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
-CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
-CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base")
-CANVAS_VARIABLE(canvasvar_AudioBusBase, "audio bus base")
-CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")
-CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
-CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time-stretch-fill")
-CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time-stretch-outline")
-CANVAS_VARIABLE(canvasvar_AutomationLine, "automation line")
-CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
-CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill")
-CANVAS_VARIABLE(canvasvar_ControlPointOutline, "control point outline")
-CANVAS_VARIABLE(canvasvar_EnteredControlPointOutline, "entered control point outline")
-CANVAS_VARIABLE(canvasvar_EnteredControlPointSelected, "entered control point selected")
-CANVAS_VARIABLE(canvasvar_EnteredControlPoint, "entered control point")
-CANVAS_VARIABLE(canvasvar_ControlPointSelected, "control point selected")
-CANVAS_VARIABLE(canvasvar_ControlPoint, "control point")
-CANVAS_VARIABLE(canvasvar_AutomationTrackFill, "automation track fill")
-CANVAS_VARIABLE(canvasvar_AutomationTrackOutline, "automation track outline")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorBase, "crossfade editor base")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorLine, "crossfade editor line")
-CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorLineShading, "crossfade editor line shading")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointFill, "crossfade editor point fill")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointOutline, "crossfade editor point outline")
-CANVAS_VARIABLE(canvasvar_CrossfadeEditorWave, "crossfade editor wave")
-CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
-CANVAS_VARIABLE(canvasvar_CrossfadeLine, "crossfade line")
-CANVAS_VARIABLE(canvasvar_ActiveCrossfade, "active crossfade")
-CANVAS_VARIABLE(canvasvar_InactiveCrossfade, "inactive crossfade")
-CANVAS_VARIABLE(canvasvar_LocationMarker, "location marker")
-CANVAS_VARIABLE(canvasvar_LocationRange, "location range")
-CANVAS_VARIABLE(canvasvar_LocationCDMarker, "location cd marker")
-CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop")
-CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch")
-CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
-CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
-CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
-CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
-CANVAS_VARIABLE(canvasvar_MeterBar, "meterbar")
-CANVAS_VARIABLE(canvasvar_MarkerBar, "markerbar")
-CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "rangemarker bar")
-CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "TransportMarkerBar")
-CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "RangeDragBarRect")
-CANVAS_VARIABLE(canvasvar_RangeDragRect, "RangeDragRect")
-CANVAS_VARIABLE(canvasvar_TransportDragRect, "TransportDragRect")
-CANVAS_VARIABLE(canvasvar_MarkerDragLine, "MarkerDragLine")
-CANVAS_VARIABLE(canvasvar_TransportLoopRect, "TransportLoopRect")
-CANVAS_VARIABLE(canvasvar_TransportPunchRect, "TransportPunchRect")
-CANVAS_VARIABLE(canvasvar_PunchLine, "PunchLine")
-CANVAS_VARIABLE(canvasvar_ZoomRect, "ZoomRect")
-CANVAS_VARIABLE(canvasvar_RubberBandRect, "RubberBandRect")
-CANVAS_VARIABLE(canvasvar_EnteredGainLine, "EnteredGainLine")
-CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "EnteredAutomationLine")
-CANVAS_VARIABLE(canvasvar_EnteredMarker, "EnteredMarker")
-CANVAS_VARIABLE(canvasvar_MeterMarker, "MeterMarker")
-CANVAS_VARIABLE(canvasvar_TempoMarker, "TempoMarker")
-CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "MeasureLineBeat")
-CANVAS_VARIABLE(canvasvar_MeasureLineBar, "MeasureLineBar")
-CANVAS_VARIABLE(canvasvar_GhostTrackBase, "GhostTrackBase")
-CANVAS_VARIABLE(canvasvar_GhostTrackWave, "GhostTrackWave")
-CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "GhostTrackWaveClip")
-CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "GhostTrackZeroLine")
-CANVAS_VARIABLE(canvasvar_ImageTrack, "ImageTrack")
-CANVAS_VARIABLE(canvasvar_MarkerTrack, "MarkerTrack")
-CANVAS_VARIABLE(canvasvar_ZeroLine, "ZeroLine")
-CANVAS_VARIABLE(canvasvar_GainLine, "GainLine")
-CANVAS_VARIABLE(canvasvar_GainLineInactive, "GainLineInactive")
-CANVAS_VARIABLE(canvasvar_RecordingRect, "RecordingRect")
-CANVAS_VARIABLE(canvasvar_SelectionRect, "SelectionRect")
-CANVAS_VARIABLE(canvasvar_Selection, "Selection")
-CANVAS_VARIABLE(canvasvar_VestigialFrame, "VestigialFrame")
-CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "TimeAxisFrame")
-CANVAS_VARIABLE(canvasvar_NameHighlightFill, "NameHighlightFill")
-CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "NameHighlightOutline")
-CANVAS_VARIABLE(canvasvar_FrameHandle, "FrameHandle")
-CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "TrimHandleLocked")
-CANVAS_VARIABLE(canvasvar_TrimHandle, "TrimHandle")
-CANVAS_VARIABLE(canvasvar_EditCursor, "EditCursor")
-CANVAS_VARIABLE(canvasvar_PlayHead, "PlayHead")
std::map<std::string,MidiPortDescriptor *> midi_ports;
- std::vector<ConfigVariable<uint32_t> *> canvas_colors;
-
void map_parameters (sigc::slot<void,const char*> theSlot);
int load_state ();
XMLNode& get_state (void);
XMLNode& get_variables (sigc::slot<bool,ConfigVariableBase::Owner>, std::string which_node = "Config");
void set_variables (const XMLNode&, ConfigVariableBase::Owner owner);
- void pack_canvasvars ();
void set_current_owner (ConfigVariableBase::Owner);
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
- public: /* ugh */
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,name) ConfigVariable<uint32_t> var; // <-- is this really so bad?
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
-
- private:
ConfigVariableBase::Owner current_owner;
XMLNode* _control_protocol_state;
void add_to_node (XMLNode& node) {
std::stringstream ss;
- if (node.name() == "Canvas") {
- ss << std::hex;
- ss.fill('0');
- ss.width(8);
- }
ss << value;
show_stored_value (ss.str());
XMLNode* child = new XMLNode ("Option");
bool set_from_node (const XMLNode& node, Owner owner) {
- if (node.name() == "Config" || node.name() == "Canvas") {
+ if (node.name() == "Config") {
/* ardour.rc */
if (prop->value() == _name) {
if ((prop = child->property ("value")) != 0) {
std::stringstream ss;
- if (node.name() == "Canvas")
- ss << std::hex;
ss << prop->value();
ss >> value;
_owner = (ConfigVariableBase::Owner)(_owner |owner);
CONFIG_VARIABLE (uint32_t, periodic_safety_backup_interval, "periodic-safety-backup-interval", 120)
CONFIG_VARIABLE (string, possible_audio_file_regexp, "possible-audio-file-regexp", "\\.(wav|aiff|caf|w64|L|R)$")
-/* Theme */
-
-CONFIG_VARIABLE (string, ui_rc_file, "ui-rc-file", "ardour2_ui_dark.rc")
-
/* denormal management */
CONFIG_VARIABLE (bool, denormal_protection, "denormal-protection", false)
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,name) var (name), // <-- is this really so bad?
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
current_owner (ConfigVariableBase::Default)
{
if (!found)
error << "Ardour: could not find configuration file (ardour.rc), canvas will look broken." << endmsg;
- pack_canvasvars();
return 0;
}
}
root->add_child_nocopy (get_variables (sigc::mem_fun (*this, &Configuration::save_config_options_predicate), "Config"));
- root->add_child_nocopy (get_variables (sigc::mem_fun (*this, &Configuration::save_config_options_predicate), "Canvas"));
if (_extra_xml) {
root->add_child_copy (*_extra_xml);
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,Name) if (node->name() == "Canvas") { if (predicate (ConfigVariableBase::Config)) { var.add_to_node (*node); }}
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
-
return *node;
}
warning << _("ill-formed MIDI port specification in ardour rcfile (ignored)") << endmsg;
}
- } else if (node->name() == "Config" || node->name() == "Canvas" ) {
+ } else if (node->name() == "Config") {
set_variables (*node, ConfigVariableBase::Config);
#include "ardour/configuration_vars.h"
#undef CONFIG_VARIABLE
-#undef CONFIG_VARIABLE_SPECIAL
-
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,name) \
- if (var.set_from_node (node, owner)) { \
- ParameterChanged (name); \
- }
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
-
-}
-
-void
-Configuration::pack_canvasvars ()
-{
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,name) canvas_colors.push_back(&var);
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
- cerr << "Configuration::pack_canvasvars () called, canvas_colors.size() = " << canvas_colors.size() << endl;
+#undef CONFIG_VARIABLE_SPECIAL
}
projects / ardour.git / commitdiff