merged experimental into trunk

new features:
 - MDI user interface
 - improved pasting (dialogs etc)
 - some fixes

1 files changed, 113 insertions, 57 deletions

diff --git a/muse2/share/templates/synti.med b/muse2/share/templates/synti.med
index c2efb6b5..1198359c 100644
--- a/muse2/share/templates/synti.med
+++ b/muse2/share/templates/synti.med
@@ -25,15 +25,15 @@
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
     <markerVisible>0</markerVisible>
-    <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
+    <geometryMain x="0" y="0" w="1024" h="691"></geometryMain>
     <geometryTransport x="0" y="0" w="100" h="30"></geometryTransport>
     <mixer1Visible>0</mixer1Visible>
     <mixer2Visible>0</mixer2Visible>
     <arranger>
-      <info>0</info>
-      <split>298 298 </split>
+      <info>1</info>
+      <split>418 600 </split>
       <list>
-        <header> 9 8 7 6 5 4 3 2 1 0 </header>
+        <header> -1 9 8 7 6 5 4 3 2 1 0 </header>
         </list>
       <xpos>0</xpos>
       <xmag>266</xmag>
@@ -63,6 +63,7 @@
       <rcRecord>31</rcRecord>
       <rcGotoLeft>33</rcGotoLeft>
       <rcPlay>29</rcPlay>
+      <rcSteprec>36</rcSteprec>
       <midiport idx="0">
         <defaultOutChans>1</defaultOutChans>
         <instrument>organ-1</instrument>
@@ -696,35 +697,65 @@
       </sequencer>
     <drumedit>
       <raster>96</raster>
-      <width>883</width>
-      <height>465</height>
       <dlistwidth>126</dlistwidth>
       <dcanvaswidth>753</dcanvaswidth>
-      <toolbars>000000ff00000000fd00000000000003730000015c00000004000000040000000800000008fc00000004000000020000000400000014004400720075006d00200074006f006f006c00730100000000000000d1000000000000000000000014004500640069007400200054006f006f006c007301000000d1000000c8000000000000000000000012007400720061006e00730070006f0072007401000001990000018400000000000000000000000a00700061006e00690063010000031dffffffff00000000000000000000000200000000000000020000000100000012004e006f0074006500200049006e0066006f0100000000ffffffff000000000000000000000002000000020000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000083ffffffff0000000000000000</toolbars>
+      <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>
-      <width>879</width>
-      <height>467</height>
       <colormode>0</colormode>
-      <toolbars>000000ff00000000fd000000000000036f0000017800000004000000040000000800000008fc00000006000000020000000000000002000000000000000200000000000000020000000000000002000000030000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000091ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000103ffffffff00000000000000000000000200000003000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c007301000000000000024c000000000000000000000012007400720061006e00730070006f00720074010000024c000000fc00000000000000000000000a00700061006e006900630100000348ffffffff0000000000000000</toolbars>
+      <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>
-      <width>880</width>
-      <height>466</height>
-      <toolbars>000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000099ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e0067007301000000d9ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000ff00000000000000000000000a00700061006e006900630100000349ffffffff0000000000000000</toolbars>
+      <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>
-      <width>875</width>
-      <height>464</height>
-      <toolbars>000000ff00000000fd000000000000036b000001a400000004000000040000000800000008fc000000010000000200000004ffffffff0100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff0000000000000000ffffffff0100000099ffffffff0000000000000000ffffffff01000000faffffffff0000000000000000</toolbars>
+      <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>
-      <width>883</width>
-      <height>466</height>
-      <toolbars>000000ff00000000fd0000000000000373000001a100000004000000040000000800000008fc0000000200000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000400000023b000000000000000000000012007400720061006e00730070006f00720074010000027b0000003900000000000000000000000200000000</toolbars>
+      <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>
@@ -747,6 +778,10 @@
         </quantize>
       <erase>
         <range>1</range>
+        <velo_threshold>16</velo_threshold>
+        <velo_thres_used>0</velo_thres_used>
+        <len_threshold>12</len_threshold>
+        <len_thres_used>0</len_thres_used>
         </erase>
       <del_overlaps>
         <range>1</range>
@@ -763,6 +798,32 @@
         <range>1</range>
         <amount>0</amount>
         </transpose>
+      <crescendo>
+        <range>3</range>
+        <start>80</start>
+        <end>130</end>
+        <absolute>0</absolute>
+        </crescendo>
+      <legato>
+        <range>1</range>
+        <min_len>0</min_len>
+        <allow_shortening>0</allow_shortening>
+        </legato>
+      <pastedialog>
+        <insert_method>0</insert_method>
+        <number>1</number>
+        <raster>384</raster>
+        <clone>0</clone>
+        <all_in_one_track>0</all_in_one_track>
+        </pastedialog>
+      <pasteeventsdialog>
+        <number>1</number>
+        <raster>384</raster>
+        <always_new_part>0</always_new_part>
+        <never_new_part>0</never_new_part>
+        <max_distance>3072</max_distance>
+        <into_single_part>0</into_single_part>
+        </pasteeventsdialog>
       </dialogs>
     </configuration>
   <song>
@@ -805,6 +866,7 @@
       <len>100</len>
       <compression>100</compression>
       <automation>1</automation>
+      <clef>0</clef>
       <part>
         <name>Track 1</name>
         <poslen tick="0" len="18432" />
@@ -878,15 +940,15 @@
       <label>Organ</label>
       <port>0</port>
       <nativeGuiVisible>0</nativeGuiVisible>
-      <nativeGeometry x="6" y="339" w="452" h="324"></nativeGeometry>
+      <nativeGeometry x="6" y="27" w="458" h="340"></nativeGeometry>
       <curProgram bankH="0" bankL="0" prog="0"/>
-      <midistate>
-        <event type="2" datalen="72">
-          00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-          00 00 00 00 00 00 00 00 14 00 00 00 14 00 00 00 
-          00 00 00 00 14 00 00 00 0a 00 00 00 0a 00 00 00 
-          00 00 00 00 0a 00 00 00 01 00 00 00 01 00 00 00 
-          01 00 00 00 00 00 00 00 
+      <midistate version="2">
+        <event type="2" datalen="75">
+          7c 01 01 00 00 00 00 00 00 00 00 00 00 00 00 00 
+          00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 14 
+          00 00 00 00 00 00 00 14 00 00 00 0a 00 00 00 0a 
+          00 00 00 00 00 00 00 0a 00 00 00 01 00 00 00 01 
+          00 00 00 01 00 00 00 00 00 00 00 
           </event>
         </midistate>
       </SynthI>
@@ -912,18 +974,19 @@
       <label>vam</label>
       <port>3</port>
       <nativeGuiVisible>0</nativeGuiVisible>
-      <nativeGeometry x="270" y="179" w="688" h="498"></nativeGeometry>
+      <nativeGeometry x="6" y="179" w="696" h="503"></nativeGeometry>
       <curProgram bankH="0" bankL="0" prog="0"/>
-      <midistate>
-        <event type="2" datalen="128">
-          00 20 00 00 00 20 00 00 01 00 00 00 01 00 00 00 
+      <midistate version="2">
+        <event type="2" datalen="131">
+          7c 02 01 00 20 00 00 00 20 00 00 01 00 00 00 01 
           00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
           00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-          fe 3e 00 00 fe 3e 00 00 00 00 00 00 00 00 00 00 
+          00 00 00 fe 3e 00 00 fe 3e 00 00 00 00 00 00 00 
           00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
-          00 00 00 00 00 00 00 00 00 00 00 00 ff 3f 00 00 
-          00 00 00 00 00 00 00 00 00 00 00 00 7a 3a 00 00 
-          00 20 00 00 00 20 00 00 00 00 00 00 00 00 00 00 
+          00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 
+          3f 00 00 00 00 00 00 00 00 00 00 00 00 00 00 7a 
+          3a 00 00 00 20 00 00 00 20 00 00 00 00 00 00 00 
+          00 00 00 
           </event>
         </midistate>
       </SynthI>
@@ -944,14 +1007,6 @@
       <dest name="Track 1"/>
       </Route>
     <Route channelMask="65535">
-      <source mport="0"/>
-      <dest name="Track 1"/>
-      </Route>
-    <Route channelMask="65535">
-      <source mport="1"/>
-      <dest name="Track 1"/>
-      </Route>
-    <Route channelMask="65535">
       <source mport="1"/>
       <dest name="Track 1"/>
       </Route>
@@ -960,14 +1015,6 @@
       <dest name="Track 1"/>
       </Route>
     <Route channelMask="65535">
-      <source mport="2"/>
-      <dest name="Track 1"/>
-      </Route>
-    <Route channelMask="65535">
-      <source mport="3"/>
-      <dest name="Track 1"/>
-      </Route>
-    <Route channelMask="65535">
       <source mport="3"/>
       <dest name="Track 1"/>
       </Route>
@@ -984,15 +1031,24 @@
         <denom>4</denom>
         </sig>
       </siglist>
-    <keylist fix="1">
-      <key at="21474837">
-        <tick>0</tick>
-        <val>1</val>
-        </key>
-      </keylist>
+    <keylist>
+    <key at="21474837">
+      <tick>0</tick>
+      <val>1</val>
+      </key>
+    </keylist>
     <drummap>
       </drummap>
     </song>
   <toplevels>
+    <arrangerview>
+      <topwin>
+        <is_subwin>1</is_subwin>
+        <geometry_state>01d9d0cb000100000000000000000000000003ff000002440000000000000000000003ff00000244000000000000</geometry_state>
+        <shares_menu>1</shares_menu>
+        <toolbars>000000ff00000000fd00000000000000000000000000000004000000040000000800000008fc00000000</toolbars>
+        </topwin>
+      <tool>1</tool>
+      </arrangerview>
     </toplevels>
   </muse>