diff options
| -rw-r--r-- | ardour.rc.in | 83 | ||||
| -rw-r--r-- | gtk2_ardour/ardev_common.sh.in | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/canvas_vars.h | 162 | ||||
| -rw-r--r-- | libs/ardour/ardour/configuration.h | 18 | ||||
| -rw-r--r-- | libs/ardour/ardour/configuration_variable.h | 9 | ||||
| -rw-r--r-- | libs/ardour/configuration.cc | 15 |
6 files changed, 193 insertions, 96 deletions
diff --git a/ardour.rc.in b/ardour.rc.in index 340cd730ad..89a737aae7 100644 --- a/ardour.rc.in +++ b/ardour.rc.in @@ -39,6 +39,89 @@ <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="bfbfc1ff"/> + <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="00000033"/> + <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="redirect 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="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> diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 00d4998eb6..235607163c 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -2,7 +2,7 @@ cd `dirname "$0"`/.. #export G_DEBUG=fatal_criticals -export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour +export ARDOUR_PATH=.:gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour export GTK_PATH=libs/clearlooks diff --git a/libs/ardour/ardour/canvas_vars.h b/libs/ardour/ardour/canvas_vars.h index 96bad47d25..4e83131920 100644 --- a/libs/ardour/ardour/canvas_vars.h +++ b/libs/ardour/ardour/canvas_vars.h @@ -1,81 +1,81 @@ -CANVAS_VARIABLE(canvasvar_WaveForm, "waveform", 0x000000cc) -CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped aveform", 0xff0000e5) -CANVAS_VARIABLE(canvasvar_FrameBase, "region base", 0xbfbfc1ff) -CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base", 0xb591a8ff) -CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base", 0xc6d3d868) -CANVAS_VARIABLE(canvasvar_AudioBusBase, "audio bus base", 0xdbd1ea68) -CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base", 0x00000033) -CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base", 0xff0000ee) -CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time-stretch-fill", 0xe2b5b596) -CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time-stretch-outline", 0x63636396) -CANVAS_VARIABLE(canvasvar_AutomationLine, "automation line", 0x44bc59ff) -CANVAS_VARIABLE(canvasvar_RedirectAutomationLine, "redirect automation line", 0x7aa3f9ff) -CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill", 0x000000ff) -CANVAS_VARIABLE(canvasvar_ControlPointOutline, "control point outline", 0x000000ff) -CANVAS_VARIABLE(canvasvar_EnteredControlPointOutline, "entered control point outline", 0xff0000ee) -CANVAS_VARIABLE(canvasvar_EnteredControlPointSelected, "entered control point selected", 0xff3535ff) -CANVAS_VARIABLE(canvasvar_EnteredControlPoint, "entered control point", 0x000000cc) -CANVAS_VARIABLE(canvasvar_ControlPointSelected, "control point selected", 0x00ff00ff) -CANVAS_VARIABLE(canvasvar_ControlPoint, "control point", 0xff0000ff) -CANVAS_VARIABLE(canvasvar_AutomationTrackFill, "automation track fill", 0xa0a0ce68) -CANVAS_VARIABLE(canvasvar_AutomationTrackOutline, "automation track outline", 0x282828ff) -CANVAS_VARIABLE(canvasvar_CrossfadeEditorBase, "crossfade editor base", 0x282d49ff) -CANVAS_VARIABLE(canvasvar_CrossfadeEditorLine, "crossfade editor line", 0x000000ff) -CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line", 0x00dbdbff) -CANVAS_VARIABLE(canvasvar_CrossfadeEditorLineShading, "crossfade editor line shading", 0x00a0d154) -CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointFill, "crossfade editor point fill", 0x00ff00ff) -CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointOutline, "crossfade editor point outline", 0x0000ffff) -CANVAS_VARIABLE(canvasvar_CrossfadeEditorWave, "crossfade editor wave", 0xffffff28) -CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave", 0xf9ea14a0) -CANVAS_VARIABLE(canvasvar_CrossfadeLine, "crossfade line", 0x000000ff) -CANVAS_VARIABLE(canvasvar_ActiveCrossfade, "active crossfade", 0xe8ed3d77) -CANVAS_VARIABLE(canvasvar_InactiveCrossfade, "inactive crossfade", 0xe8ed3d77) -CANVAS_VARIABLE(canvasvar_LocationMarker, "location marker", 0xc4f411ff) -CANVAS_VARIABLE(canvasvar_LocationRange, "location range", 0x497a59ff) -CANVAS_VARIABLE(canvasvar_LocationCDMarker, "location cd marker", 0x1ee8c4ff) -CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop", 0x35964fff) -CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch", 0x7c3a3aff) -CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor", 0xf4f214bc) -CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label", 0x000000ff) -CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar", 0x72727fff) -CANVAS_VARIABLE(canvasvar_MeterBar, "meterbar", 0x666672ff) -CANVAS_VARIABLE(canvasvar_MarkerBar, "markerbar", 0x7f7f8cff) -CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "rangemarker bar", 0x8c8c96ff) -CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "TransportMarkerBar", 0x9898a3ff) -CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "RangeDragBarRect", 0x969696c6) -CANVAS_VARIABLE(canvasvar_RangeDragRect, "RangeDragRect", 0x82c696c6) -CANVAS_VARIABLE(canvasvar_TransportDragRect, "TransportDragRect", 0x969696c6) -CANVAS_VARIABLE(canvasvar_MarkerDragLine, "MarkerDragLine", 0x004f00f9) -CANVAS_VARIABLE(canvasvar_TransportLoopRect, "TransportLoopRect", 0x1e7728f9) -CANVAS_VARIABLE(canvasvar_TransportPunchRect, "TransportPunchRect", 0x6d2828e5) -CANVAS_VARIABLE(canvasvar_PunchLine, "PunchLine", 0xa80000ff) -CANVAS_VARIABLE(canvasvar_ZoomRect, "ZoomRect", 0xc6d1b26d) -CANVAS_VARIABLE(canvasvar_RubberBandRect, "RubberBandRect", 0xc6c6c659) -CANVAS_VARIABLE(canvasvar_EnteredGainLine, "EnteredGainLine", 0xdd6363ff) -CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "EnteredAutomationLine", 0xdd6363ff) -CANVAS_VARIABLE(canvasvar_EnteredMarker, "EnteredMarker", 0xdd6363ff) -CANVAS_VARIABLE(canvasvar_MeterMarker, "MeterMarker", 0xf2425bff) -CANVAS_VARIABLE(canvasvar_TempoMarker, "TempoMarker", 0xf2425bff) -CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "MeasureLineBeat", 0x72727266) -CANVAS_VARIABLE(canvasvar_MeasureLineBar, "MeasureLineBar", 0x8c8c988c) -CANVAS_VARIABLE(canvasvar_GhostTrackBase, "GhostTrackBase", 0x44007c7f) -CANVAS_VARIABLE(canvasvar_GhostTrackWave, "GhostTrackWave", 0x02fd004c) -CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "GhostTrackWaveClip", 0xff000000) -CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "GhostTrackZeroLine", 0xe500e566) -CANVAS_VARIABLE(canvasvar_ImageTrack, "ImageTrack", 0xddddd8ff) -CANVAS_VARIABLE(canvasvar_MarkerTrack, "MarkerTrack", 0xddddd8ff) -CANVAS_VARIABLE(canvasvar_ZeroLine, "ZeroLine", 0xb5b5b5ff) -CANVAS_VARIABLE(canvasvar_GainLine, "GainLine", 0xff00ff00) -CANVAS_VARIABLE(canvasvar_GainLineInactive, "GainLineInactive", 0xf0f0fff) -CANVAS_VARIABLE(canvasvar_RecordingRect, "RecordingRect", 0xe5c6c6ff) -CANVAS_VARIABLE(canvasvar_SelectionRect, "SelectionRect", 0xe8f4d377) -CANVAS_VARIABLE(canvasvar_Selection, "Selection", 0x636363b2) -CANVAS_VARIABLE(canvasvar_VestigialFrame, "VestigialFrame", 0x44007c0f) -CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "TimeAxisFrame", 0x44007c0f) -CANVAS_VARIABLE(canvasvar_NameHighlightFill, "NameHighlightFill", 0x0000ffff) -CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "NameHighlightOutline", 0x7c00ff96) -CANVAS_VARIABLE(canvasvar_FrameHandle, "FrameHandle", 0x7c00ff96) -CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "TrimHandleLocked", 0xea0f0f28) -CANVAS_VARIABLE(canvasvar_TrimHandle, "TrimHandle", 0x1900ff44) -CANVAS_VARIABLE(canvasvar_EditCursor, "EditCursor", 0x0000ffff) -CANVAS_VARIABLE(canvasvar_PlayHead, "PlayHead", 0xff0000ff) +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_RedirectAutomationLine, "redirect 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_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") diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index ecc5494690..07d4bb8db3 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -43,13 +43,13 @@ class Configuration : public Stateful virtual ~Configuration(); struct MidiPortDescriptor { - std::string tag; - std::string device; - std::string type; - std::string mode; + std::string tag; + std::string device; + std::string type; + std::string mode; - MidiPortDescriptor (const XMLNode&); - XMLNode& get_state(); + MidiPortDescriptor (const XMLNode&); + XMLNode& get_state(); }; std::map<std::string,MidiPortDescriptor *> midi_ports; @@ -73,7 +73,7 @@ class Configuration : public Stateful sigc::signal<void,const char*> ParameterChanged; - /* define accessor methods */ + /* define accessor methods */ #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL @@ -88,13 +88,13 @@ class Configuration : public Stateful #undef CONFIG_VARIABLE_SPECIAL #undef CANVAS_VARIABLE -#define CANVAS_VARIABLE(var,name,value) ConfigVariable<uint32_t> var; // <-- is this really so bad? +#define CANVAS_VARIABLE(var,name) ConfigVariable<uint32_t> var; // <-- is this really so bad? #include "ardour/canvas_vars.h" #undef CANVAS_VARIABLE private: - /* declare variables */ + /* declare variables */ #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL diff --git a/libs/ardour/ardour/configuration_variable.h b/libs/ardour/ardour/configuration_variable.h index fa6701250a..501673e968 100644 --- a/libs/ardour/ardour/configuration_variable.h +++ b/libs/ardour/ardour/configuration_variable.h @@ -82,6 +82,11 @@ class ConfigVariable : public ConfigVariableBase 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"); @@ -89,7 +94,7 @@ class ConfigVariable : public ConfigVariableBase child->add_property ("value", ss.str()); node.add_child_nocopy (*child); } - + bool set_from_node (const XMLNode& node, Owner owner) { if (node.name() == "Config" || node.name() == "Canvas") { @@ -112,6 +117,8 @@ class ConfigVariable : public ConfigVariableBase 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); diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc index 58d702e3d9..9baa525cb7 100644 --- a/libs/ardour/configuration.cc +++ b/libs/ardour/configuration.cc @@ -54,7 +54,7 @@ Configuration::Configuration () #undef CONFIG_VARIABLE_SPECIAL #undef CANVAS_VARIABLE -#define CANVAS_VARIABLE(var,name,value) var (name,value), // <-- is this really so bad? +#define CANVAS_VARIABLE(var,name) var (name), // <-- is this really so bad? #include "ardour/canvas_vars.h" #undef CANVAS_VARIABLE @@ -76,6 +76,8 @@ Configuration::set_current_owner (ConfigVariableBase::Owner owner) int Configuration::load_state () { + bool found = false; + string rcfile; /* load system configuration first */ @@ -85,6 +87,7 @@ Configuration::load_state () if (rcfile.length()) { XMLTree tree; + found = true; cerr << string_compose (_("loading system configuration file %1"), rcfile) << endl; @@ -109,6 +112,7 @@ Configuration::load_state () if (rcfile.length()) { XMLTree tree; + found = true; cerr << string_compose (_("loading user configuration file %1"), rcfile) << endl; @@ -125,6 +129,9 @@ Configuration::load_state () } } + if (!found) + error << "Ardour: could not find configuration file (ardour.rc), canvas will look broken." << endmsg; + pack_canvasvars(); return 0; } @@ -199,7 +206,7 @@ Configuration::get_variables (sigc::slot<bool,ConfigVariableBase::Owner> predica #undef CONFIG_VARIABLE_SPECIAL #undef CANVAS_VARIABLE -#define CANVAS_VARIABLE(var,Name,value) if (node->name() == "Canvas") { if (predicate (ConfigVariableBase::Config)) { var.add_to_node (*node); }} +#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 @@ -270,7 +277,7 @@ Configuration::set_variables (const XMLNode& node, ConfigVariableBase::Owner own #undef CONFIG_VARIABLE_SPECIAL #undef CANVAS_VARIABLE -#define CANVAS_VARIABLE(var,name,value) \ +#define CANVAS_VARIABLE(var,name) \ if (var.set_from_node (node, owner)) { \ ParameterChanged (name); \ } @@ -283,7 +290,7 @@ void Configuration::pack_canvasvars () { #undef CANVAS_VARIABLE -#define CANVAS_VARIABLE(var,name,value) canvas_colors.push_back(&var); +#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; |