Sort things to reduce merge hell. No functional changes.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2994 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 182 insertions, 182 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index f8d107a8a9..a011cbe27e 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -30,44 +30,44 @@ if gtkardour['IS_OSX']:
 gtkardour.Merge ([
     libraries['ardour'],
     libraries['ardour_cp'],
-    libraries['gtkmm2ext'],
-    libraries['midi++2'],
-    libraries['pbd'],
-    libraries['gtkmm2'],
+    libraries['atkmm'],
+    libraries['fftw3'],
+    libraries['fftw3f'],
+    libraries['flac'],
+    libraries['gdkmm2'],
     libraries['glib2'],
+    libraries['glibmm2'],
+    libraries['gtk2'],
+    libraries['gtkmm2'],
+    libraries['gtkmm2ext'],
+    libraries['jack'],
     libraries['libgnomecanvas2'],
     libraries['libgnomecanvasmm'],
-    libraries['sysmidi'],
-    libraries['sndfile-ardour'],
-    libraries['flac'],
     libraries['lrdf'],
-    libraries['glibmm2'],
+    libraries['midi++2'],
     libraries['pangomm'],
-    libraries['atkmm'],
-    libraries['gdkmm2'],
-    libraries['sigc2'],
-    libraries['gtk2'],
-    libraries['xml'],
-    libraries['xslt'],
+    libraries['pbd'],
     libraries['samplerate'],
+    libraries['sigc2'],
+    libraries['sndfile-ardour'],
+    libraries['sysmidi'],
     libraries['vamp'],
     libraries['vamphost'],
-    libraries['fftw3f'],
-    libraries['fftw3'],
-    libraries['jack']
+    libraries['xml'],
+    libraries['xslt']
 ])
 
 gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 
 gtkmmtests.Merge ([
-    libraries['gtkmm2'],
+    libraries['atkmm'],
+    libraries['gdkmm2'],
     libraries['glib2'],
     libraries['glibmm2'],
+    libraries['gtk2'],
+    libraries['gtkmm2'],
     libraries['pangomm'],
-    libraries['atkmm'],
-    libraries['gdkmm2'],
-    libraries['sigc2'],
-    libraries['gtk2']
+    libraries['sigc2']
 ])
 
 if gtkardour['DMALLOC']:
@@ -105,15 +105,17 @@ about.cc
 actions.cc
 add_route_dialog.cc
 ardour_dialog.cc
-ardour_ui.cc
 ardour_ui2.cc
+ardour_ui.cc
 ardour_ui_dependents.cc
 ardour_ui_dialogs.cc
 ardour_ui_ed.cc
 ardour_ui_mixer.cc
 ardour_ui_options.cc
 audio_clock.cc
-route_time_axis.cc
+audio_region_editor.cc
+audio_region_view.cc
+audio_streamview.cc
 audio_time_axis.cc
 automation_gain_line.cc
 automation_line.cc
@@ -123,21 +125,18 @@ axis_view.cc
 boolean_automation_line.cc
 canvas-imageframe.c
 canvas-simpleline.c
-simpleline.cc
 canvas-simplerect.c
-simplerect.cc
 canvas-waveview.c
 crossfade_edit.cc
 crossfade_view.cc
 curvetest.cc
-enums.cc
 editing.cc
-editor.cc
 editor_actions.cc
 editor_audio_import.cc
 editor_audiotrack.cc
 editor_canvas.cc
 editor_canvas_events.cc
+editor.cc
 editor_cursors.cc
 editor_edit_groups.cc
 editor_export_audio.cc
@@ -159,10 +158,11 @@ editor_selection_list.cc
 editor_tempodisplay.cc
 editor_timefx.cc
 engine_dialog.cc
+enums.cc
 export_dialog.cc
-export_session_dialog.cc
-export_region_dialog.cc
 export_range_markers_dialog.cc
+export_region_dialog.cc
+export_session_dialog.cc
 gain_automation_time_axis.cc
 gain_meter.cc
 generic_pluginui.cc
@@ -192,8 +192,8 @@ new_session_dialog.cc
 option_editor.cc
 opts.cc
 pan_automation_time_axis.cc
-panner.cc
 panner2d.cc
+panner.cc
 panner_ui.cc
 playlist_selector.cc
 plugin_selector.cc
@@ -203,21 +203,21 @@ public_editor.cc
 redirect_automation_line.cc
 redirect_automation_time_axis.cc
 redirect_box.cc
-rhythm_ferret.cc
-audio_region_editor.cc
 region_gain_line.cc
 region_selection.cc
 region_view.cc
-audio_region_view.cc
+rhythm_ferret.cc
 route_params_ui.cc
 route_redirect_selection.cc
+route_time_axis.cc
 route_ui.cc
 selection.cc
-sfdb_ui.cc
 send_ui.cc
+sfdb_ui.cc
+simpleline.cc
+simplerect.cc
 splash.cc
 streamview.cc
-audio_streamview.cc
 tape_region_view.cc
 tempo_dialog.cc
 theme_manager.cc
diff --git a/gtk2_ardour/ardour2_ui_default.conf b/gtk2_ardour/ardour2_ui_default.conf
index 8615d8e6d1..5559cd5b9b 100644
--- a/gtk2_ardour/ardour2_ui_default.conf
+++ b/gtk2_ardour/ardour2_ui_default.conf
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Ardour>
   <Canvas>
-    <Option name="waveform outline" value="0f0f0fc8"/>
-    <Option name="waveform fill" value="3d4753dc"/>
-    <Option name="selected waveform outline" value="0f0f0fcc"/>
-    <Option name="selected waveform fill" value="51518ac8"/>
-    <Option name="clipped waveform" value="ff0000e5"/>
-    <Option name="region base" value="99a7b584"/>
-    <Option name="selected region base" value="51518aff"/>
-    <Option name="audio track base" value="c6d3d868"/>
+    <Option name="active crossfade" value="e8ed3d77"/>
     <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="audio track base" value="c6d3d868"/>
     <Option name="automation line" value="44bc59ff"/>
-    <Option name="processor automation line" value="7aa3f9ff"/>
+    <Option name="automation track fill" value="a0a0ce68"/>
+    <Option name="automation track outline" value="282828ff"/>
+    <Option name="cdmarkerbar" value="9090a3ff"/>
+    <Option name="clipped waveform" value="ff0000e5"/>
     <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 line" value="000000ff"/>
     <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="EditPoint" value="0000ffff"/>
+    <Option name="EnteredAutomationLine" value="dd6363ff"/>
+    <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="EnteredGainLine" value="dd6363ff"/>
+    <Option name="EnteredMarker" value="dd6363ff"/>
+    <Option name="FrameHandle" value="7c00ff96"/>
+    <Option name="GainLineInactive" value="9fbca4c5"/>
+    <Option name="GainLine" value="00bc20ff"/>
+    <Option name="GhostTrackBase" value="44007c7f"/>
+    <Option name="GhostTrackWaveClip" value="ff000000"/>
+    <Option name="GhostTrackWave" value="02fd004c"/>
+    <Option name="GhostTrackZeroLine" value="e500e566"/>
+    <Option name="ImageTrack" value="ddddd8ff"/>
     <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 marker" value="c4f411ff"/>
     <Option name="location punch" value="7c3a3aff"/>
-    <Option name="verbose canvas cursor" value="f4f214bc"/>
-    <Option name="marker label" value="000000ff"/>
+    <Option name="location range" value="497a59ff"/>
     <Option name="marker bar separator" value="30303088"/>
-    <Option name="meterbar" value="666672ff"/>
-    <Option name="tempo bar" value="72727fff"/>
-    <Option name="rangemarker bar" value="7f7f8cff"/>
-    <Option name="TransportMarkerBar" value="8c8c96ff"/>
-    <Option name="cdmarkerbar" value="9090a3ff"/>
     <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="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="marker label" value="000000ff"/>
     <Option name="MarkerTrack" value="ddddd8ff"/>
-    <Option name="ZeroLine" value="bdbdbd8d"/>
-    <Option name="GainLine" value="00bc20ff"/>
-    <Option name="GainLineInactive" value="9fbca4c5"/>
+    <Option name="MeasureLineBar" value="8c8c988c"/>
+    <Option name="MeasureLineBeat" value="72727266"/>
+    <Option name="meterbar" value="666672ff"/>
+    <Option name="MeterColorBase" value="0000ffff"/>
+    <Option name="MeterColorClip" value="ff0000ff"/>
+    <Option name="MeterColorMid" value="73f9baff"/>
+    <Option name="MeterColorTop" value="00fd5dff"/>
+    <Option name="MeterMarker" value="f2425bff"/>
+    <Option name="midi bus base" value="ff0000ee"/>
+    <Option name="midi track base" value="ff8f8f3d"/>
+    <Option name="NameHighlightFill" value="0000ffff"/>
+    <Option name="NameHighlightOutline" value="7c00ff96"/>
+    <Option name="PlayHead" value="ff0000ff"/>
+    <Option name="processor automation line" value="7aa3f9ff"/>
+    <Option name="PunchLine" value="a80000ff"/>
+    <Option name="RangeDragBarRect" value="969696c6"/>
+    <Option name="RangeDragRect" value="82c696c6"/>
+    <Option name="rangemarker bar" value="7f7f8cff"/>
     <Option name="RecordingRect" value="e5c6c6ff"/>
+    <Option name="region base" value="99a7b584"/>
+    <Option name="RubberBandRect" value="c6c6c659"/>
+    <Option name="selected crossfade editor line" value="00dbdbff"/>
+    <Option name="selected crossfade editor wave" value="f9ea14a0"/>
+    <Option name="selected region base" value="51518aff"/>
+    <Option name="selected waveform fill" value="51518ac8"/>
+    <Option name="selected waveform outline" value="0f0f0fcc"/>
     <Option name="SelectionRect" value="e8f4d377"/>
     <Option name="Selection" value="636363b2"/>
-    <Option name="VestigialFrame" value="00000092"/>
+    <Option name="tempo bar" value="72727fff"/>
+    <Option name="TempoMarker" value="f2425bff"/>
     <Option name="TimeAxisFrame" value="000000cb"/>
-    <Option name="NameHighlightFill" value="0000ffff"/>
-    <Option name="NameHighlightOutline" value="7c00ff96"/>
-    <Option name="FrameHandle" value="7c00ff96"/>
+    <Option name="time-stretch-fill" value="e2b5b596"/>
+    <Option name="time-stretch-outline" value="63636396"/>
+    <Option name="TransportDragRect" value="969696c6"/>
+    <Option name="TransportLoopRect" value="1e7728f9"/>
+    <Option name="TransportMarkerBar" value="8c8c96ff"/>
+    <Option name="TransportPunchRect" value="6d2828e5"/>
     <Option name="TrimHandleLocked" value="ea0f0f28"/>
     <Option name="TrimHandle" value="1900ff44"/>
-    <Option name="EditPoint" value="0000ffff"/>
-    <Option name="PlayHead" value="ff0000ff"/>
-    <Option name="MeterColorBase" value="0000ffff"/>
-    <Option name="MeterColorMid" value="73f9baff"/>
-    <Option name="MeterColorTop" value="00fd5dff"/>
-    <Option name="MeterColorClip" value="ff0000ff"/>
+    <Option name="verbose canvas cursor" value="f4f214bc"/>
+    <Option name="VestigialFrame" value="00000092"/>
+    <Option name="waveform fill" value="3d4753dc"/>
+    <Option name="waveform outline" value="0f0f0fc8"/>
+    <Option name="ZeroLine" value="bdbdbd8d"/>
+    <Option name="ZoomRect" value="c6d1b26d"/>
   </Canvas>
 </Ardour>
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index d4acf8ec9b..905618f775 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -1,90 +1,90 @@
-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_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_RedirectAutomationLine, "processor automation line")
+CANVAS_VARIABLE(canvasvar_AutomationTrackFill, "automation track fill")
+CANVAS_VARIABLE(canvasvar_AutomationTrackOutline, "automation track outline")
+CANVAS_VARIABLE(canvasvar_CDMarkerBar, "cdmarkerbar")
+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, "EditPoint")
+CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "EnteredAutomationLine")
+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, "EnteredGainLine")
+CANVAS_VARIABLE(canvasvar_EnteredMarker, "EnteredMarker")
+CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
+CANVAS_VARIABLE(canvasvar_FrameHandle, "FrameHandle")
+CANVAS_VARIABLE(canvasvar_GainLine, "GainLine")
+CANVAS_VARIABLE(canvasvar_GainLineInactive, "GainLineInactive")
+CANVAS_VARIABLE(canvasvar_GhostTrackBase, "GhostTrackBase")
+CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "GhostTrackWaveClip")
+CANVAS_VARIABLE(canvasvar_GhostTrackWave, "GhostTrackWave")
+CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "GhostTrackZeroLine")
+CANVAS_VARIABLE(canvasvar_ImageTrack, "ImageTrack")
 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, "markerbar")
 CANVAS_VARIABLE(canvasvar_MarkerBarSeparator, "marker bar separator")
-CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
+CANVAS_VARIABLE(canvasvar_MarkerDragLine, "MarkerDragLine")
+CANVAS_VARIABLE(canvasvar_MarkerLabel, "marker label")
+CANVAS_VARIABLE(canvasvar_MarkerTrack, "MarkerTrack")
+CANVAS_VARIABLE(canvasvar_MeasureLineBar, "MeasureLineBar")
+CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "MeasureLineBeat")
 CANVAS_VARIABLE(canvasvar_MeterBar, "meterbar")
-CANVAS_VARIABLE(canvasvar_MarkerBar, "markerbar")
-CANVAS_VARIABLE(canvasvar_CDMarkerBar, "cdmarkerbar")
-CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "rangemarker bar")
-CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "TransportMarkerBar")
+CANVAS_VARIABLE(canvasvar_MeterColorBase, "MeterColorBase")
+CANVAS_VARIABLE(canvasvar_MeterColorClip, "MeterColorClip")
+CANVAS_VARIABLE(canvasvar_MeterColorMid, "MeterColorMid")
+CANVAS_VARIABLE(canvasvar_MeterColorTop, "MeterColorTop")
+CANVAS_VARIABLE(canvasvar_MeterMarker, "MeterMarker")
+CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
+CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")
+CANVAS_VARIABLE(canvasvar_NameHighlightFill, "NameHighlightFill")
+CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "NameHighlightOutline")
+CANVAS_VARIABLE(canvasvar_PlayHead, "PlayHead")
+CANVAS_VARIABLE(canvasvar_PunchLine, "PunchLine")
 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_RangeMarkerBar, "rangemarker bar")
 CANVAS_VARIABLE(canvasvar_RecordingRect, "RecordingRect")
+CANVAS_VARIABLE(canvasvar_RedirectAutomationLine, "processor automation line")
+CANVAS_VARIABLE(canvasvar_RubberBandRect, "RubberBandRect")
+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, "SelectionRect")
 CANVAS_VARIABLE(canvasvar_Selection, "Selection")
-CANVAS_VARIABLE(canvasvar_VestigialFrame, "VestigialFrame")
+CANVAS_VARIABLE(canvasvar_TempoBar, "tempo bar")
+CANVAS_VARIABLE(canvasvar_TempoMarker, "TempoMarker")
 CANVAS_VARIABLE(canvasvar_TimeAxisFrame, "TimeAxisFrame")
-CANVAS_VARIABLE(canvasvar_NameHighlightFill, "NameHighlightFill")
-CANVAS_VARIABLE(canvasvar_NameHighlightOutline, "NameHighlightOutline")
-CANVAS_VARIABLE(canvasvar_FrameHandle, "FrameHandle")
+CANVAS_VARIABLE(canvasvar_TimeStretchFill, "time-stretch-fill")
+CANVAS_VARIABLE(canvasvar_TimeStretchOutline, "time-stretch-outline")
+CANVAS_VARIABLE(canvasvar_TransportDragRect, "TransportDragRect")
+CANVAS_VARIABLE(canvasvar_TransportLoopRect, "TransportLoopRect")
+CANVAS_VARIABLE(canvasvar_TransportMarkerBar, "TransportMarkerBar")
+CANVAS_VARIABLE(canvasvar_TransportPunchRect, "TransportPunchRect")
 CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "TrimHandleLocked")
 CANVAS_VARIABLE(canvasvar_TrimHandle, "TrimHandle")
-CANVAS_VARIABLE(canvasvar_EditPoint, "EditPoint")
-CANVAS_VARIABLE(canvasvar_PlayHead, "PlayHead")
-CANVAS_VARIABLE(canvasvar_MeterColorBase, "MeterColorBase")
-CANVAS_VARIABLE(canvasvar_MeterColorMid, "MeterColorMid")
-CANVAS_VARIABLE(canvasvar_MeterColorTop, "MeterColorTop")
-CANVAS_VARIABLE(canvasvar_MeterColorClip, "MeterColorClip")
+CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
+CANVAS_VARIABLE(canvasvar_VestigialFrame, "VestigialFrame")
+CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
+CANVAS_VARIABLE(canvasvar_WaveFormFill, "waveform fill")
+CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
+CANVAS_VARIABLE(canvasvar_ZeroLine, "ZeroLine")
+CANVAS_VARIABLE(canvasvar_ZoomRect, "ZoomRect")
diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index 41dc429cf8..604d486990 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -978,7 +978,7 @@ NewSessionDialog::reset_recent()
 	sessions = new std::vector<std::string*>;
 	
 	for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
-	        sessions->push_back (new string ((*i).second));
+		sessions->push_back (new string ((*i).second));
 	}
 	
 	for (i = sessions->begin(); i != sessions->end(); ++i) {
@@ -990,7 +990,7 @@ NewSessionDialog::reset_recent()
 		/* remove any trailing / */
 		
 		if (fullpath[fullpath.length()-1] == '/') {
-		        fullpath = fullpath.substr (0, fullpath.length()-1);
+			fullpath = fullpath.substr (0, fullpath.length()-1);
 		}
 	    
 		/* check whether session still exists */
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index c4f8eece0f..f134bb1d2c 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -27,19 +27,17 @@ ardour.Append(POTFILE = domain + '.pot')
 ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
 
 ardour_files=Split("""
-diskstream.cc
 analyser.cc
 audioanalyser.cc
 audio_diskstream.cc
-audio_library.cc
-audio_playlist.cc
-track.cc
-audio_track.cc
 audioengine.cc
 audiofilesource.cc
 audiofilter.cc
+audio_library.cc
+audio_playlist.cc
 audioregion.cc
 audiosource.cc
+audio_track.cc
 auditioner.cc
 automation.cc
 automation_event.cc
@@ -50,6 +48,7 @@ crossfade.cc
 curve.cc
 cycle_timer.cc
 default_click.cc
+diskstream.cc
 enums.cc
 gain.cc
 gdither.cc
@@ -60,6 +59,7 @@ io.cc
 jack_slave.cc
 ladspa_plugin.cc
 location.cc
+mix.cc
 mtc_slave.cc
 named_selection.cc
 panner.cc
@@ -78,8 +78,8 @@ reverse.cc
 route.cc
 route_group.cc
 send.cc
-session.cc
 session_butler.cc
+session.cc
 session_click.cc
 session_command.cc
 session_events.cc
@@ -95,10 +95,10 @@ sndfilesource.cc
 source.cc
 source_factory.cc
 tempo.cc
+track.cc
 transient_detector.cc
 utils.cc
 version.cc
-mix.cc
 """)
 
 arch_specific_objects = [ ]
@@ -262,20 +262,20 @@ ardour = conf.Finish ()
 
 ardour.Merge ([
 	     libraries['core'],
-	     libraries['xml'],
-	     libraries['sndfile-ardour'],
-	     libraries['raptor'],
+	     libraries['fftw3'],
+	     libraries['fftw3f'],
+	     libraries['glib2'],
+	     libraries['glibmm2'],
 	     libraries['lrdf'],
+	     libraries['midi++2'],
+	     libraries['pbd'],
+	     libraries['raptor'],
 	     libraries['samplerate'],
 	     libraries['sigc2'],
-	     libraries['pbd'],
-	     libraries['midi++2'],
-	     libraries['glib2'],
-	     libraries['glibmm2'],
+	     libraries['sndfile-ardour'],
 	     libraries['vamp'],
 	     libraries['vamphost'],
-	     libraries['fftw3f'],
-	     libraries['fftw3'],
+	     libraries['xml']
 	     ])
 
 if ardour['RUBBERBAND']: