updated templates for 2.X

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

1 files changed, 120 insertions, 57 deletions

diff --git a/templates/2 Track.template.in b/templates/2 Track.template.in
index 3d798d77b4..c9f70455f7 100644
--- a/templates/2 Track.template.in
+++ b/templates/2 Track.template.in
@@ -1,92 +1,155 @@
-<?xml version="1.0"?>
-<Session version="0.821.0">
-  <Options>
-    <recording-plugins val="no"/>
-    <slave type="none"/>
-    <send-midi-timecode val="no"/>
-    <send-midi-machine-control val="no"/>
-    <input-auto-connect val="1"/>
-    <output-auto-connect val="2"/>
-    <max-level val="0"/>
-    <min-level val="0"/>
-    <meter-hold val="10.000000"/>
-    <long-over-length val="10"/>
-    <short-over-length val="2"/>
-    <shuttle-speed-factor val="1.000000"/>
-    <shuttle-speed-threshold val="5.000000"/>
-    <rf-speed val="2.000000"/>
-    <smpte-frames-per-second val="30.000000"/>
-    <edit-mode val="slide"/>
-    <auto-play val="no"/>
-    <auto-input val="no"/>
-    <seamless-loop val="no"/>
-    <punch-in val="no"/>
-    <punch-out val="no"/>
-    <all-safe val="no"/>
-    <auto-return val="no"/>
-    <mmc-control val="no"/>
-    <recording-plugins val="no"/>
-    <auto-crossfade val="no"/>
-    <audible-click val="no"/>
-    <align-style val="existing"/>
-  </Options>
+<?xml version="1.0" encoding="UTF-8"?>
+<Session version="2.0.0" id-counter="1191241115">
+  <Config>
+    <Option name="output-auto-connect" value="2"/>
+    <Option name="input-auto-connect" value="1"/>
+    <Option name="mtc-port-name" value="control"/>
+    <Option name="mmc-port-name" value="control"/>
+    <Option name="midi-port-name" value="control"/>
+    <Option name="mmc-control" value="0"/>
+    <Option name="midi-feedback" value="0"/>
+    <Option name="xfade-model" value="0"/>
+    <Option name="edit-mode" value="0"/>
+    <Option name="layer-model" value="0"/>
+    <Option name="solo-model" value="0"/>
+    <Option name="all-safe" value="0"/>
+    <Option name="auto-play" value="0"/>
+    <Option name="auto-return" value="0"/>
+    <Option name="auto-input" value="1"/>
+    <Option name="punch-in" value="0"/>
+    <Option name="punch-out" value="0"/>
+    <Option name="seamless-loop" value="0"/>
+    <Option name="rf-speed" value="2"/>
+    <Option name="shuttle-speed-factor" value="1"/>
+    <Option name="shuttle-speed-threshold" value="5"/>
+    <Option name="meter-hold" value="10"/>
+    <Option name="meter-falloff" value="1.5"/>
+    <end-marker-is-free val="no"/>
+  </Config>
   <Sources/>
   <Regions/>
   <DiskStreams>
-    <DiskStream channels="2" playlist="Audio 1.1" speed="1.000000" name="Audio 1" id="1088698381595945"/>
-    <DiskStream channels="2" playlist="Audio 2.1" speed="1.000000" name="Audio 2" id="1088698381722129"/>
+    <AudioDiskstream flags="Recordable" channels="2" playlist="Audio 1.1" speed="1" name="Audio 1" id="1088698381595945"/>
+    <AudioDiskstream flags="Recordable" channels="2" playlist="Audio 2.1" speed="1" name="Audio 2" id="1088698381722129"/>
   </DiskStreams>
   <Locations>
-    <Location name="end" start="14400000" end="14400000" flags="33"/>
-    <Location name="Loop" start="0" end="14400000" flags="12"/>
-    <Location name="Punch" start="0" end="14400000" flags="10"/>
+    <Location id="1191241116" name="start" start="0" end="0" flags="IsMark,IsStart"/>
+    <Location id="1191241117" name="end" start="14400000" end="14400000" flags="IsMark,IsEnd"/>
   </Locations>
   <Connections/>
   <Routes>
-    <Route flags="0x2" muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=0:signal=0">
-      <IO name="master" id="1088698373992392" inputs="{ardour:Audio 2/out 1,ardour:Audio 1/out 1}{ardour:Audio 2/out 2,ardour:Audio 1/out 2}" outputs="{%JACK_INPUT%1}{%JACK_INPUT%2}" gain="1" iolimits="-1,2,-1,2" automation-state="0x0" automation-style="0x1">
-        <Panner linked="no" link_direction="0">
-          <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
-          <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
+    <Route flags="MasterOut" default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=0:signal=0">
+      <IO name="master" id="1088698373992392" inputs="{Audio 2/out 1,Audio 1/out 1}{Audio 2/out 2,Audio 1/out 2}" outputs="{%JACK_INPUT%1}{%JACK_INPUT%2}" gain="1.000000000000" iolimits="-1,2,-1,2">
+        <Panner linked="no" link_direction="SameDirection" bypassed="no">
+          <Output x="0" y="0"/>
+          <Output x="1" y="0"/>
+          <StreamPanner x="0" type="Equal Power Stereo" muted="no">
+            <Automation>
+              <AutomationList id="1191241081" default="0" min_yval="0" max_yval="1" max_xval="0" state="Off" style="Absolute"/>
+            </Automation>
+            <controllable name="panner" id="1191241080"/>
+          </StreamPanner>
+          <StreamPanner x="1" type="Equal Power Stereo" muted="no">
+            <Automation>
+              <AutomationList id="1191241084" default="1" min_yval="0" max_yval="1" max_xval="0" state="Off" style="Absolute"/>
+            </Automation>
+            <controllable name="panner" id="1191241083"/>
+          </StreamPanner>
         </Panner>
+        <controllable name="gaincontrol" id="1191241021"/>
       </IO>
+      <controllable name="solo" id="1191241030"/>
+      <controllable name="mute" id="1191241031"/>
+      <remote_control id="1"/>
       <extra>
-        <GUI color="3746:15634:28532" track_height="normal" strip_width="wide" shown_mixer="yes" shown_editor="yes"/>
+        <GUI color="3746:15634:28532" strip_width="Wide" shown_mixer="yes" shown_editor="yes" track_height="normal">
+          <gain track_height="normal" shown="no"/>
+          <pan track_height="normal" shown="no"/>
+        </GUI>
       </extra>
     </Route>
-    <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=1:signal=1" diskstream-id="1088698381595945">
-      <IO name="Audio 1" id="1088698381595877" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
-        <Panner linked="no" link_direction="0">
-          <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
-          <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
+    <Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=1:signal=1" mode="Normal" diskstream-id="1088698381595945">
+      <IO name="Audio 1" id="1088698381595877" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
+        <Panner linked="no" link_direction="SameDirection" bypassed="no">
+          <Output x="0" y="0"/>
+          <Output x="1" y="0"/>
+          <StreamPanner x="0" type="Equal Power Stereo" muted="no">
+            <Automation>
+              <AutomationList id="1191241087" default="0" min_yval="0" max_yval="1" max_xval="0" state="Off" style="Absolute"/>
+            </Automation>
+            <controllable name="panner" id="1191241086"/>
+          </StreamPanner>
+          <StreamPanner x="1" type="Equal Power Stereo" muted="no">
+            <Automation>
+              <AutomationList id="1191241090" default="1" min_yval="0" max_yval="1" max_xval="0" state="Off" style="Absolute"/>
+            </Automation>
+            <controllable name="panner" id="1191241089"/>
+          </StreamPanner>
         </Panner>
+        <controllable name="gaincontrol" id="1191241033"/>
       </IO>
+      <controllable name="solo" id="1191241042"/>
+      <controllable name="mute" id="1191241043"/>
+      <remote_control id="2"/>
       <extra>
-        <GUI color="25329:39287:16285" strip_width="wide" track_height="normal" shown_mixer="yes" shown_editor="yes"/>
+        <GUI color="25329:39287:16285" strip_width="Wide" shown_mixer="yes" shown_editor="yes" track_height="normal">
+          <gain track_height="normal" shown="no"/>
+          <pan track_height="normal" shown="no"/>
+        </GUI>
       </extra>
+      <alignment style="ExistingMaterial"/>
+      <controllable name="recenable" id="1191241044"/>
     </Route>
-    <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" diskstream-id="1088698381722129">
-      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
-        <Panner linked="no" link_direction="0">
-          <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
-          <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
+    <Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" mode="Normal" diskstream-id="1088698381722129">
+      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
+        <Panner linked="no" link_direction="SameDirection" bypassed="no">
+          <Output x="0" y="0"/>
+          <Output x="1" y="0"/>
+          <StreamPanner x="0" type="Equal Power Stereo" muted="no">
+            <Automation>
+              <AutomationList id="1191241093" default="0" min_yval="0" max_yval="1" max_xval="0" state="Off" style="Absolute"/>
+            </Automation>
+            <controllable name="panner" id="1191241092"/>
+          </StreamPanner>
+          <StreamPanner x="1" type="Equal Power Stereo" muted="no">
+            <Automation>
+              <AutomationList id="1191241096" default="1" min_yval="0" max_yval="1" max_xval="0" state="Off" style="Absolute"/>
+            </Automation>
+            <controllable name="panner" id="1191241095"/>
+          </StreamPanner>
         </Panner>
+        <controllable name="gaincontrol" id="1191241046"/>
       </IO>
+      <controllable name="solo" id="1191241055"/>
+      <controllable name="mute" id="1191241056"/>
+      <remote_control id="3"/>
       <extra>
-        <GUI color="6057:31092:43721" strip_width="wide" shown_mixer="yes" track_height="normal" shown_editor="yes"/>
+        <GUI color="6057:31092:43721" strip_width="Wide" shown_mixer="yes" shown_editor="yes" track_height="normal">
+          <gain track_height="normal" shown="no"/>
+          <pan track_height="normal" shown="no"/>
+        </GUI>
       </extra>
+      <alignment style="ExistingMaterial"/>
+      <controllable name="recenable" id="1191241057"/>
     </Route>
   </Routes>
   <EditGroups/>
   <MixGroups/>
   <Playlists/>
+  <UnusedPlaylists/>
   <Click>
-    <IO name="click" id="1088698373994975" inputs="" outputs="{%JACK_INPUT%1}" gain="1" iolimits="0,0,-1,-1" automation-state="0x0" automation-style="0x1">
-      <Panner linked="no" link_direction="0" automation="t1-pan-click.automation"/>
+    <IO name="click" id="1088698373994975" inputs="" outputs="{%JACK_INPUT%1}" gain="1.000000000000" iolimits="0,0,-1,-1">
+      <Panner linked="no" link_direction="SameDirection" bypassed="no"/>
+      <controllable name="gaincontrol" id="1191241059"/>
     </IO>
   </Click>
   <TempoMap>
     <Tempo start="1|1|0" beats-per-minute="120.000000" movable="no"/>
     <Meter start="1|1|0" note-type="4.000000" beats-per-bar="4.000000" movable="no"/>
   </TempoMap>
+  <ControlProtocols>
+    <Protocol name="Generic MIDI" feedback="0" feedback_interval="10000" active="yes">
+      <controls/>
+    </Protocol>
+  </ControlProtocols>
 </Session>