most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet

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

1 files changed, 12 insertions, 8 deletions

diff --git a/gtk2_ardour/ardour2_ui_sae.conf b/gtk2_ardour/ardour2_ui_sae.conf
index b9fac38909..277ec44300 100644
--- a/gtk2_ardour/ardour2_ui_sae.conf
+++ b/gtk2_ardour/ardour2_ui_sae.conf
@@ -2,12 +2,13 @@
 <Ardour>
   <Canvas>
     <Option name="active crossfade" value="e8ed3d77"/>
-    <Option name="audio bus base" value="dbd1ea68"/>
-    <Option name="audio track base" value="c6d3d868"/>
+    <Option name="audio bus base" value="abe1aa68"/>
+    <Option name="audio master bus base" value="ebb1b168"/>
+    <Option name="audio track base" value="c3c3c868"/>
     <Option name="automation line" value="44bc59ff"/>
     <Option name="automation track fill" value="a0a0ce68"/>
     <Option name="automation track outline" value="282828ff"/>
-    <Option name="cdmarkerbar" value="9090a3ff"/>
+    <Option name="cdmarkerbar" value="9090a3a0"/>
     <Option name="clipped waveform" value="ff0000e5"/>
     <Option name="control point fill" value="000000ff"/>
     <Option name="control point outline" value="000000ff"/>
@@ -42,13 +43,13 @@
     <Option name="location punch" value="7c3a3aff"/>
     <Option name="location range" value="497a59ff"/>
     <Option name="marker bar separator" value="30303088"/>
-    <Option name="markerbar" value="9898a3ff"/>
+    <Option name="markerbar" value="9898a3a0"/>
     <Option name="MarkerDragLine" value="004f00f9"/>
     <Option name="marker label" value="000000ff"/>
     <Option name="MarkerTrack" value="ddddd8ff"/>
     <Option name="MeasureLineBar" value="8c8c988c"/>
     <Option name="MeasureLineBeat" value="72727266"/>
-    <Option name="meterbar" value="666672ff"/>
+    <Option name="meterbar" value="666672a0"/>
     <Option name="MeterColorBase" value="0000ffff"/>
     <Option name="MeterColorClip" value="ff0000ff"/>
     <Option name="MeterColorMid" value="73f9baff"/>
@@ -63,7 +64,7 @@
     <Option name="PunchLine" value="a80000ff"/>
     <Option name="RangeDragBarRect" value="969696c6"/>
     <Option name="RangeDragRect" value="82c696c6"/>
-    <Option name="rangemarker bar" value="7f7f8cff"/>
+    <Option name="rangemarker bar" value="7f7f8ca0"/>
     <Option name="RecordingRect" value="e5c6c6ff"/>
     <Option name="region base" value="99a7b584"/>
     <Option name="RubberBandRect" value="c6c6c659"/>
@@ -72,16 +73,19 @@
     <Option name="selected region base" value="130505ff"/>
     <Option name="selected waveform fill" value="e6e6fac8"/>
     <Option name="selected waveform outline" value="1a1a1acc"/>
+    <Option name="recorded region base" value="ad7173ff"/>
+    <Option name="recorded waveform fill" value="74383884"/>
+    <Option name="recorded waveform outline" value="3b0013ff"/>
     <Option name="SelectionRect" value="e8f4d377"/>
     <Option name="Selection" value="636363b2"/>
-    <Option name="tempo bar" value="72727fff"/>
+    <Option name="tempo bar" value="72727fa0"/>
     <Option name="TempoMarker" value="f2425bff"/>
     <Option name="TimeAxisFrame" value="000000cb"/>
     <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="TransportMarkerBar" value="8c8c96a0"/>
     <Option name="TransportPunchRect" value="6d2828e5"/>
     <Option name="TrimHandleLocked" value="ea0f0f28"/>
     <Option name="TrimHandle" value="1900ff44"/>