merged with trunk (that is, pulled the fixes from release_2_0)

only quickly tested, seems okay on the first glance

1 files changed, 129 insertions, 140 deletions

diff --git a/muse2/share/templates/audio.med b/muse2/share/templates/audio.med
index 27a3a79f..df4463ff 100644
--- a/muse2/share/templates/audio.med
+++ b/muse2/share/templates/audio.med
@@ -9,13 +9,6 @@
     <midiFilterCtrl2>0</midiFilterCtrl2>
     <midiFilterCtrl3>0</midiFilterCtrl3>
     <midiFilterCtrl4>0</midiFilterCtrl4>
-    <waveTracksVisible>1</waveTracksVisible>
-    <auxTracksVisible>1</auxTracksVisible>
-    <groupTracksVisible>1</groupTracksVisible>
-    <midiTracksVisible>1</midiTracksVisible>
-    <inputTracksVisible>1</inputTracksVisible>
-    <outputTracksVisible>1</outputTracksVisible>
-    <synthTracksVisible>1</synthTracksVisible>
     <mtctype>1</mtctype>
     <mtcoffset>00:00:00:00:00</mtcoffset>
     <sendClockDelay>1</sendClockDelay>
@@ -24,21 +17,10 @@
     <extSync>0</extSync>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
-    <markerVisible>0</markerVisible>
-    <geometryMain x="0" y="0" w="1024" h="691"></geometryMain>
-    <geometryTransport x="0" y="0" w="100" h="30"></geometryTransport>
+    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
+    <geometryTransport x="0" y="0" w="607" h="86"></geometryTransport>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
-    <arranger>
-      <info>1</info>
-      <split>418 600 </split>
-      <list>
-        <header> -1 9 8 7 6 5 4 3 2 1 0 </header>
-        </list>
-      <xpos>0</xpos>
-      <xmag>266</xmag>
-      <ypos>0</ypos>
-      </arranger>
     <sequencer>
       <metronom>
         <premeasures>2</premeasures>
@@ -292,68 +274,6 @@
           </channel>
         </midiport>
       </sequencer>
-    <drumedit>
-      <raster>96</raster>
-      <dlistwidth>126</dlistwidth>
-      <dcanvaswidth>753</dcanvaswidth>
-      <topwin>
-        <width>934</width>
-        <height>488</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003ae0000019e00000004000000040000000800000008fc00000002000000020000000400000014004400720075006d00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000f5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000198ffffffff00000000000000000000000a00700061006e0069006301000002be000000f8000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a90000020d0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c000000000000000000000014004400720075006d00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000181ffffffff000000000000000000000012007400720061006e00730070006f007200740100000224ffffffff00000000000000000000000a00700061006e00690063010000034a000000b6000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a9000002570000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </drumedit>
-    <pianoroll>
-      <raster>96</raster>
-      <colormode>0</colormode>
-      <topwin>
-        <width>852</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000035c0000018200000004000000040000000800000008fc0000000200000002000000040000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000ae00000098000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c000000f800000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002120000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c0073010000013affffffff000000000000000000000012007400720061006e00730070006f0072007401000001bfffffffff00000000000000000000000a00700061006e0069006301000002e50000011b00000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002ae0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </pianoroll>
-    <scoreedit>
-      <topwin>
-        <width>867</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000036b000001e300000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000074ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000dbffffffff000000000000000000000012007400720061006e00730070006f007200740100000203ffffffff00000000000000000000000a00700061006e006900630100000329000000420000000000000000000000020000000100000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000025900000004000000040000000800000008fc0000000200000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c007301000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000100ffffffff000000000000000000000012007400720061006e00730070006f007200740100000167ffffffff00000000000000000000000a00700061006e00690063010000028d000001730000000000000000000000020000000200000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000002650000019b0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </scoreedit>
-    <masteredit>
-      <raster>0</raster>
-      <topwin>
-        <width>784</width>
-        <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000318000001ce00000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000b0ffffffff00000000000000000000000a00700061006e0069006301000001d600000142000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000002bb0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024500000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000d500000071000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c00000194000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000003a30000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </masteredit>
-    <waveedit>
-      <bgcolor r="200" g="200" b="200"></bgcolor>
-      <topwin>
-        <width>760</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000300000001ac00000004000000040000000800000008fc0000000100000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000184ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000040000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e00570061007600650020006500640069007400200074006f006f006c0073010000008cffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000210ffffffff0000000000000000</shared_toolbars>
-        <shares_when_free>0</shares_when_free>
-        <shares_when_subwin>1</shares_when_subwin>
-        <default_subwin>0</default_subwin>
-        </topwin>
-      </waveedit>
     <dialogs>
       <mod_len>
         <range>1</range>
@@ -444,6 +364,47 @@
     <len>0</len>
     <follow>1</follow>
     <sampleRate>44100</sampleRate>
+    <AudioOutput>
+      <name>Out 1</name>
+      <record>0</record>
+      <mute>0</mute>
+      <solo>0</solo>
+      <off>0</off>
+      <channels>2</channels>
+      <height>20</height>
+      <locked>1</locked>
+      <selected>1</selected>
+      <prefader>0</prefader>
+      <sendMetronome>0</sendMetronome>
+      <automation>0</automation>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
+        </controller>
+      <controller id="1" cur="0" color="#ff0000" visible="0">
+        </controller>
+      <controller id="2" cur="0" color="#0000ff" visible="0">
+        </controller>
+      </AudioOutput>
+    <AudioInput>
+      <name>Input 1</name>
+      <record>0</record>
+      <mute>1</mute>
+      <solo>0</solo>
+      <off>0</off>
+      <channels>2</channels>
+      <height>20</height>
+      <locked>1</locked>
+      <prefader>0</prefader>
+      <sendMetronome>0</sendMetronome>
+      <automation>0</automation>
+      <auxSend idx="0">0</auxSend>
+      <auxSend idx="1">0</auxSend>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
+        </controller>
+      <controller id="1" cur="0" color="#ff0000" visible="0">
+        </controller>
+      <controller id="2" cur="0" color="#0000ff" visible="0">
+        </controller>
+      </AudioInput>
     <wavetrack>
       <name>Track 1</name>
       <record>0</record>
@@ -453,13 +414,12 @@
       <channels>1</channels>
       <height>20</height>
       <locked>0</locked>
-      <selected>1</selected>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -477,10 +437,10 @@
       <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -498,10 +458,10 @@
       <locked>0</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -519,10 +479,10 @@
       <locked>0</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -540,10 +500,10 @@
       <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -561,10 +521,10 @@
       <locked>0</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
+      <automation>0</automation>
       <auxSend idx="0">0</auxSend>
       <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -582,8 +542,8 @@
       <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <automation>0</automation>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
@@ -601,54 +561,70 @@
       <locked>1</locked>
       <prefader>0</prefader>
       <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
+      <automation>0</automation>
+      <controller id="0" cur="1.02164" color="#ff0000" visible="0">
         </controller>
       <controller id="1" cur="0" color="#ff0000" visible="0">
         </controller>
       <controller id="2" cur="0" color="#0000ff" visible="0">
         </controller>
       </AudioAux>
-    <AudioInput>
-      <name>Input 1</name>
-      <record>0</record>
-      <mute>1</mute>
-      <solo>0</solo>
-      <off>0</off>
-      <channels>2</channels>
-      <height>20</height>
-      <locked>1</locked>
-      <prefader>0</prefader>
-      <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
-      <auxSend idx="0">0</auxSend>
-      <auxSend idx="1">0</auxSend>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="1" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="2" cur="0" color="#0000ff" visible="0">
-        </controller>
-      </AudioInput>
-    <AudioOutput>
-      <name>Out 1</name>
-      <record>0</record>
-      <mute>0</mute>
-      <solo>0</solo>
-      <off>0</off>
-      <channels>2</channels>
-      <height>20</height>
-      <locked>1</locked>
-      <prefader>0</prefader>
-      <sendMetronome>0</sendMetronome>
-      <automation>1</automation>
-      <controller id="0" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="1" cur="0" color="#ff0000" visible="0">
-        </controller>
-      <controller id="2" cur="0" color="#0000ff" visible="0">
-        </controller>
-      </AudioOutput>
+    <Route channel="0">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_1"/>
+      </Route>
+    <Route channel="1">
+      <source name="Out 1"/>
+      <dest type="1" name="system:playback_2"/>
+      </Route>
+    <Route channel="0">
+      <source type="1" name="system:capture_1"/>
+      <dest name="Input 1"/>
+      </Route>
+    <Route channel="1">
+      <source type="1" name="system:capture_2"/>
+      <dest name="Input 1"/>
+      </Route>
+    <Route>
+      <source name="Input 1"/>
+      <dest name="Track 1"/>
+      </Route>
+    <Route>
+      <source name="Input 1"/>
+      <dest name="Track 2"/>
+      </Route>
+    <Route>
+      <source name="Input 1"/>
+      <dest name="Track 3"/>
+      </Route>
+    <Route>
+      <source name="Input 1"/>
+      <dest name="Track 4"/>
+      </Route>
+    <Route>
+      <source name="Track 1"/>
+      <dest name="Group 1"/>
+      </Route>
+    <Route>
+      <source name="Track 2"/>
+      <dest name="Group 1"/>
+      </Route>
+    <Route>
+      <source name="Track 3"/>
+      <dest name="Group 2"/>
+      </Route>
+    <Route>
+      <source name="Track 4"/>
+      <dest name="Group 2"/>
+      </Route>
+    <Route>
+      <source name="Group 1"/>
+      <dest name="Out 1"/>
+      </Route>
+    <Route>
+      <source name="Group 2"/>
+      <dest name="Out 1"/>
+      </Route>
     <tempolist fix="500000">
       <tempo at="21474837">
         <tick>0</tick>
@@ -675,11 +651,24 @@
     <arrangerview>
       <topwin>
         <is_subwin>1</is_subwin>
-        <geometry_state>01d9d0cb000100000000000000000000000003ff000002440000000000000000fffffffefffffffe000000000200</geometry_state>
+        <x>0</x>
+        <y>0</y>
+        <width>850</width>
+        <height>382</height>
         <shares_menu>1</shares_menu>
         <toolbars>000000ff00000000fd00000000000000000000000000000004000000040000000800000008fc00000000</toolbars>
         </topwin>
       <tool>1</tool>
+      <arranger>
+        <info>1</info>
+        <split>370 477 </split>
+        <list>
+          <header> 7 9 8 6 5 4 3 2 1 0 </header>
+          </list>
+        <xpos>0</xpos>
+        <xmag>266</xmag>
+        <ypos>0</ypos>
+        </arranger>
       </arrangerview>
     </toplevels>
   </muse>