Fix unused variable warning.

Consistently name canvas colours (was very messy and user exposed).


git-svn-id: svn://localhost/ardour2/trunk@2713 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 105 insertions, 105 deletions

diff --git a/gtk2_ardour/ardour2_ui_default.conf b/gtk2_ardour/ardour2_ui_default.conf
index 4f41d5b03b..2d2c0fb73c 100644
--- a/gtk2_ardour/ardour2_ui_default.conf
+++ b/gtk2_ardour/ardour2_ui_default.conf
@@ -9,8 +9,8 @@
     <Option name="audio bus base" value="dbd1ea68"/>
     <Option name="midi track base" value="c67e7e5f"/>
 	<Option name="midi bus base" value="ffceea40"/>
-    <Option name="time-stretch-fill" value="e2b5b596"/>
-    <Option name="time-stretch-outline" value="63636396"/>
+    <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="ffffff66"/>
@@ -41,57 +41,57 @@
     <Option name="verbose canvas cursor" value="f4f214bc"/>
     <Option name="marker label" value="000000ff"/>
     <Option name="marker bar separator" value="aaaaaa77"/>
-	<Option name="meterbar" value="666672ff"/>
+	<Option name="meter  bar" value="666672ff"/>
     <Option name="tempo bar" value="72727fff"/>
-	<Option name="rangemarker bar" value="7f7f8cff"/>
-    <Option name="TransportMarkerBar" value="8c8c96ff"/>
-	<Option name="markerbar" 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="b5b5b576"/>
-    <Option name="MeasureLineBar" value="d9d9d99c"/>
-    <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="00bc20ff"/>
-    <Option name="GainLineInactive" value="9fbca4c5"/>
-    <Option name="RecordingRect" value="e5c6c6ff"/>
-    <Option name="SelectionRect" value="e8f4d377"/>
-    <Option name="Selection" value="636363b2"/>
-    <Option name="VestigialFrame" value="0000000f"/>
-    <Option name="TimeAxisFrame" value="0000000f"/>
-    <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="EditPoint" value="0000ffff"/>
-    <Option name="PlayHead" value="ff0000ff"/>
-    <Option name="MidiSelectRectOutline" value="5555ffff"/>
-    <Option name="MidiSelectRectFill" value="8888ff88"/>
-    <Option name="MidiNoteOutlineMin" value="22ff22b0"/>
-    <Option name="MidiNoteOutlineMid" value="ffff22b0"/>
-    <Option name="MidiNoteOutlineMax" value="ff2222b0"/>
-    <Option name="MidiNoteFillMin" value="33ee338a"/>
-    <Option name="MidiNoteFillMid" value="eeee338a"/>
-    <Option name="MidiNoteFillMax" value="ee33338a"/>
-    <Option name="MidiNoteSelectedOutline" value="5566ffee"/>
+	<Option name="range marker bar" value="7f7f8cff"/>
+    <Option name="transport marker bar" value="8c8c96ff"/>
+	<Option name="marker bar" value="9898a3ff"/>
+    <Option name="range drag bar rect" value="969696c6"/>
+    <Option name="range drag rect" value="82c696c6"/>
+    <Option name="transport drag rect" value="969696c6"/>
+    <Option name="marker drag line" value="004f00f9"/>
+    <Option name="transport loop rect" value="1e7728f9"/>
+    <Option name="transport punch rect" value="6d2828e5"/>
+    <Option name="punch line" value="a80000ff"/>
+    <Option name="zoom rect" value="c6d1b26d"/>
+    <Option name="rubber band rect" value="c6c6c659"/>
+    <Option name="entered gain line" value="dd6363ff"/>
+    <Option name="entered automation line" value="dd6363ff"/>
+    <Option name="entered marker" value="dd6363ff"/>
+    <Option name="meter marker" value="f2425bff"/>
+    <Option name="tempo marker" value="f2425bff"/>
+    <Option name="measure line beat" value="b5b5b576"/>
+    <Option name="measure line bar" value="d9d9d99c"/>
+    <Option name="ghost track base" value="44007c7f"/>
+    <Option name="ghost track wave" value="02fd004c"/>
+    <Option name="ghost track wave clip" value="ff000000"/>
+    <Option name="ghost track zero line" value="e500e566"/>
+    <Option name="image track" value="ddddd8ff"/>
+    <Option name="marker track" value="ddddd8ff"/>
+    <Option name="zero line" value="b5b5b5ff"/>
+    <Option name="gain line" value="00bc20ff"/>
+    <Option name="gain line inactive" value="9fbca4c5"/>
+    <Option name="recording rect" value="e5c6c6ff"/>
+    <Option name="selection rect" value="e8f4d377"/>
+    <Option name="selection" value="636363b2"/>
+    <Option name="vestigial frame" value="0000000f"/>
+    <Option name="time axis frame" value="0000000f"/>
+    <Option name="name highlight fill" value="0000ffff"/>
+    <Option name="name highlight outline" value="7c00ff96"/>
+    <Option name="frame handle" value="7c00ff96"/>
+    <Option name="trim handle locked" value="ea0f0f28"/>
+    <Option name="trim handle" value="1900ff44"/>
+    <Option name="edit point" value="0000ffff"/>
+    <Option name="play head" value="ff0000ff"/>
+    <Option name="midi select rect outline" value="5555ffff"/>
+    <Option name="midi select rect fill" value="8888ff88"/>
+    <Option name="midi note outline min" value="22ff22b0"/>
+    <Option name="midi note outline mid" value="ffff22b0"/>
+    <Option name="midi note outline max" value="ff2222b0"/>
+    <Option name="midi note fill min" value="33ee338a"/>
+    <Option name="midi note fill mid" value="eeee338a"/>
+    <Option name="midi note fill max" value="ee33338a"/>
+    <Option name="midi note selected outline" value="5566ffee"/>
   </Canvas>
 </Ardour>
 
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index d3a4d18557..c0822d8e9c 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -6,8 +6,8 @@ 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_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")
@@ -39,53 +39,53 @@ 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_EditPoint, "EditPoint")
-CANVAS_VARIABLE(canvasvar_PlayHead, "PlayHead")
-CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "MidiSelectRectOutline")
-CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "MidiSelectRectFill")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "MidiNoteOutlineMin")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "MidiNoteOutlineMid")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMax, "MidiNoteOutlineMax")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMin, "MidiNoteFillMin")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMid, "MidiNoteFillMid")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMax, "MidiNoteFillMax")
-CANVAS_VARIABLE(canvasvar_MidiNoteSelectedOutline, "MidiNoteSelectedOutline")
+CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar")
+CANVAS_VARIABLE(canvasvar_MarkerBar, "marker bar")
+CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "range marker bar")
+CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "transport marker bar")
+CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "range drag bar rect")
+CANVAS_VARIABLE(canvasvar_RangeDragRect, "range drag rect")
+CANVAS_VARIABLE(canvasvar_TransportDragRect, "transport drag rect")
+CANVAS_VARIABLE(canvasvar_MarkerDragLine, "marker drag line")
+CANVAS_VARIABLE(canvasvar_TransportLoopRect, "transport loop rect")
+CANVAS_VARIABLE(canvasvar_TransportPunchRect, "transport punch rect")
+CANVAS_VARIABLE(canvasvar_PunchLine, "punch line")
+CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")
+CANVAS_VARIABLE(canvasvar_RubberBandRect, "rubber band rect")
+CANVAS_VARIABLE(canvasvar_EnteredGainLine, "entered gain line")
+CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "entered automation line")
+CANVAS_VARIABLE(canvasvar_EnteredMarker, "entered marker")
+CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker")
+CANVAS_VARIABLE(canvasvar_TempoMarker, "tempo marker")
+CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat")
+CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar")
+CANVAS_VARIABLE(canvasvar_GhostTrackBase, "ghost track base")
+CANVAS_VARIABLE(canvasvar_GhostTrackWave, "ghost track wave")
+CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "ghost track wave clip")
+CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "ghost track zero line")
+CANVAS_VARIABLE(canvasvar_ImageTrack, "image track")
+CANVAS_VARIABLE(canvasvar_MarkerTrack, "marker track")
+CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
+CANVAS_VARIABLE(canvasvar_GainLine, "gain line")
+CANVAS_VARIABLE(canvasvar_GainLineInactive, "gain line inactive")
+CANVAS_VARIABLE(canvasvar_RecordingRect, "recording rect")
+CANVAS_VARIABLE(canvasvar_SelectionRect, "selection rect")
+CANVAS_VARIABLE(canvasvar_Selection, "selection")
+CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
+CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "time axis frame")
+CANVAS_VARIABLE(canvasvar_NameHighlightFill, "name highlight fill")
+CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "name highlight outline")
+CANVAS_VARIABLE(canvasvar_FrameHandle, "frame handle")
+CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
+CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
+CANVAS_VARIABLE(canvasvar_EditPoint, "edit point")
+CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
+CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
+CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "midi note outline mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMax, "midi note outline max")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMin, "midi note fill min")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMid, "midi note fill mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMax, "midi note fill max")
+CANVAS_VARIABLE(canvasvar_MidiNoteSelectedOutline, "midi note selected outline")
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 30577e11ef..8315b3c88a 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1101,7 +1101,7 @@ Editor::edit_cursor_backward ()
 void
 Editor::edit_cursor_forward ()
 {
-	nframes_t pos;
+	//nframes_t pos;
 	nframes_t cnt;
 	bool was_floating;
 	float prefix;