Sort various things to reduce merge hell. No functional changes.

git-svn-id: svn://localhost/ardour2/branches/3.0@2992 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 77 insertions, 77 deletions

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 8085ec0227..5f2f5ca2c6 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -1,103 +1,103 @@
-CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
-CANVAS_VARIABLE(canvasvar_WaveFormFill, "waveform fill")
-CANVAS_VARIABLE(canvasvar_SelectedWaveForm, "selected waveform outline")
-CANVAS_VARIABLE(canvasvar_SelectedWaveFormFill, "selected waveform fill")
-CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
-CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
-CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
-CANVAS_VARIABLE(canvasvar_MidiFrameBase, "midi frame base")
-CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base")
+CANVAS_VARIABLE(canvasvar_ActiveCrossfade, "active crossfade")
 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_AudioTrackBase, "audio track base")
 CANVAS_VARIABLE(canvasvar_AutomationLine, "automation line")
-CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
+CANVAS_VARIABLE(canvasvar_AutomationTrackFill, "automation track fill")
+CANVAS_VARIABLE(canvasvar_AutomationTrackOutline, "automation track outline")
+CANVAS_VARIABLE(canvasvar_CDMarkerBar, "cd marker bar")
+CANVAS_VARIABLE(canvasvar_ControlPoint, "control point")
 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_EditPoint, "edit point")
+CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "entered automation line")
+CANVAS_VARIABLE(canvasvar_EnteredControlPoint, "entered control point")
+CANVAS_VARIABLE(canvasvar_EnteredControlPointOutline, "entered control point outline")
+CANVAS_VARIABLE(canvasvar_EnteredControlPointSelected, "entered control point selected")
+CANVAS_VARIABLE(canvasvar_EnteredGainLine, "entered gain line")
+CANVAS_VARIABLE(canvasvar_EnteredMarker, "entered marker")
+CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
+CANVAS_VARIABLE(canvasvar_FrameHandle, "frame handle")
+CANVAS_VARIABLE(canvasvar_GainLine, "gain line")
+CANVAS_VARIABLE(canvasvar_GainLineInactive, "gain line inactive")
+CANVAS_VARIABLE(canvasvar_GhostTrackBase, "ghost track base")
+CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "ghost track wave clip")
+CANVAS_VARIABLE(canvasvar_GhostTrackWave, "ghost track wave")
+CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "ghost track zero line")
+CANVAS_VARIABLE(canvasvar_ImageTrack, "image track")
 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_LocationMarker, "location marker")
 CANVAS_VARIABLE(canvasvar_LocationPunch, "location punch")
-CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
-CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
+CANVAS_VARIABLE(canvasvar_LocationRange, "location range")
+CANVAS_VARIABLE(canvasvar_MarkerBar, "marker bar")
 CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
-CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
+CANVAS_VARIABLE(canvasvar_MarkerDragLine, "marker drag line")
+CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
+CANVAS_VARIABLE(canvasvar_MarkerTrack, "marker track")
+CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar")
+CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat")
 CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar")
-CANVAS_VARIABLE(canvasvar_MarkerBar, "marker bar")
-CANVAS_VARIABLE(canvasvar_CDMarkerBar, "cd marker bar")
-CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "range marker bar")
-CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "transport marker bar")
+CANVAS_VARIABLE(canvasvar_MeterColorBase, "meter fill min")
+CANVAS_VARIABLE(canvasvar_MeterColorClip, "meter fill clip")
+CANVAS_VARIABLE(canvasvar_MeterColorMid, "meter fill mid")
+CANVAS_VARIABLE(canvasvar_MeterColorTop, "meter fill max")
+CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker")
+CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
+CANVAS_VARIABLE(canvasvar_MidiFrameBase, "midi frame base")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMax, "midi note fill max")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMid, "midi note fill mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteFillMin, "midi note fill min")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMax, "midi note outline max")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "midi note outline mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")
+CANVAS_VARIABLE(canvasvar_MidiNoteSelectedOutline, "midi note selected outline")
+CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
+CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
+CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")
+CANVAS_VARIABLE(canvasvar_NameHighlightFill, "name highlight fill")
+CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "name highlight outline")
+CANVAS_VARIABLE(canvasvar_PianoRollBlackOutline, "piano roll black outline")
+CANVAS_VARIABLE(canvasvar_PianoRollBlack, "piano roll black")
+CANVAS_VARIABLE(canvasvar_PianoRollWhite, "piano roll white")
+CANVAS_VARIABLE(canvasvar_PlayHead, "play head")
+CANVAS_VARIABLE(canvasvar_ProcessorAutomationLine, "processor automation line")
+CANVAS_VARIABLE(canvasvar_PunchLine, "punch line")
 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_RangeMarkerBar, "range marker bar")
 CANVAS_VARIABLE(canvasvar_RecordingRect, "recording rect")
+CANVAS_VARIABLE(canvasvar_RubberBandRect, "rubber band rect")
+CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
+CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
+CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
+CANVAS_VARIABLE(canvasvar_SelectedWaveFormFill, "selected waveform fill")
+CANVAS_VARIABLE(canvasvar_SelectedWaveForm, "selected waveform outline")
 CANVAS_VARIABLE(canvasvar_SelectionRect, "selection rect")
 CANVAS_VARIABLE(canvasvar_Selection, "selection")
-CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
+CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
+CANVAS_VARIABLE(canvasvar_TempoMarker, "tempo marker")
 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_TimeStretchFill, "time stretch fill")
+CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time stretch outline")
+CANVAS_VARIABLE(canvasvar_TransportDragRect, "transport drag rect")
+CANVAS_VARIABLE(canvasvar_TransportLoopRect, "transport loop rect")
+CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "transport marker bar")
+CANVAS_VARIABLE(canvasvar_TransportPunchRect, "transport punch rect")
 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_MeterColorBase, "meter fill min")
-CANVAS_VARIABLE(canvasvar_MeterColorMid, "meter fill mid")
-CANVAS_VARIABLE(canvasvar_MeterColorTop, "meter fill max")
-CANVAS_VARIABLE(canvasvar_MeterColorClip, "meter fill clip")
-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")
-CANVAS_VARIABLE(canvasvar_PianoRollWhite, "piano roll white")
-CANVAS_VARIABLE(canvasvar_PianoRollBlack, "piano roll black")
-CANVAS_VARIABLE(canvasvar_PianoRollBlackOutline, "piano roll black outline")
+CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
+CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
+CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
+CANVAS_VARIABLE(canvasvar_WaveFormFill, "waveform fill")
+CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
+CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
+CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")