Fix up profiling.

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

5 files changed, 16 insertions, 25 deletions

diff --git a/libs/ardour/test/profiling/sessions/1region/1region.ardour b/libs/ardour/test/profiling/sessions/1region/1region.ardour
index b846225009..a3fc264dab 100644
--- a/libs/ardour/test/profiling/sessions/1region/1region.ardour
+++ b/libs/ardour/test/profiling/sessions/1region/1region.ardour
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Session version="3001" name="1region" sample-rate="48000" id-counter="142" event-counter="2">
+<Session version="3001" name="1region" sample-rate="48000" id-counter="140" event-counter="1">
   <Config>
     <Option name="xfade-model" value="FullCrossfade"/>
     <Option name="xfade-choice" value="ConstantPowerMinus3dB"/>
@@ -43,9 +43,9 @@
   </Sources>
   <Regions/>
   <Locations>
-    <Location id="86" name="Loop" start="1633716" end="2118148" flags="IsAutoLoop,IsHidden" locked="no" position-lock-style="AudioTime"/>
+    <Location id="86" name="Loop" start="529680" end="1089150" flags="IsAutoLoop,IsHidden" locked="no" position-lock-style="AudioTime"/>
     <Location id="87" name="Punch" start="0" end="1" flags="IsAutoPunch,IsHidden" locked="no" position-lock-style="AudioTime"/>
-    <Location id="133" name="session" start="1633716" end="2118148" flags="IsSessionRange" locked="no" position-lock-style="AudioTime"/>
+    <Location id="134" name="session" start="529680" end="1089150" flags="IsSessionRange" locked="no" position-lock-style="AudioTime"/>
   </Locations>
   <Bundles/>
   <Routes>
@@ -84,7 +84,7 @@
         </PannerShell>
       </Processor>
     </Route>
-    <Route id="88" name="MIDI 1" default-type="midi" active="yes" phase-invert="" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=1:signal=1" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" note-mode="Sustained" step-editing="no" midi-thru="yes" input-active="yes">
+    <Route id="88" name="MIDI 1" default-type="midi" active="yes" phase-invert="" denormal-protection="no" meter-point="MeterPostFader" order-keys="editor=1:signal=1" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" note-mode="Sustained" step-editing="no" input-active="yes">
       <IO name="MIDI 1" id="105" direction="Input" default-type="midi" user-latency="0">
         <Port type="midi" name="MIDI 1/midi_in 1"/>
       </IO>
@@ -116,7 +116,7 @@
   </Routes>
   <Playlists>
     <Playlist id="116" name="MIDI 1.1" type="midi" orig-track-id="88" frozen="no" combine-ops="0">
-      <Region locked="0" name="MIDI 1-1" position="1633716" length="484432" stretch="1" muted="0" opaque="1" automatic="0" whole-file="0" import="0" external="0" sync-marked="0" left-of-split="0" right-of-split="0" hidden="0" position-locked="0" valid-transients="0" start="0" sync-position="0" ancestral-start="0" ancestral-length="0" shift="1" positional-lock-style="MusicTime" layering-index="0" start-beats="0" length-beats="20.1846666667" id="131" type="midi" first-edit="nothing" bbt-position="18|1|137" source-0="118" master-source-0="118"/>
+      <Region locked="0" name="MIDI 1-1" position="529680" length="559470" stretch="1" muted="0" opaque="1" automatic="0" whole-file="0" import="0" external="0" sync-marked="0" left-of-split="0" right-of-split="0" hidden="0" position-locked="0" valid-transients="0" start="0" sync-position="0" ancestral-start="0" ancestral-length="0" shift="1" positional-lock-style="MusicTime" layering-index="0" start-beats="0" length-beats="23.31125" id="131" type="midi" first-edit="nothing" bbt-position="6|3|134" source-0="118" master-source-0="118"/>
     </Playlist>
   </Playlists>
   <UnusedPlaylists/>
@@ -162,7 +162,7 @@
       <Window name="R-88-110" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
       <Window name="R-88-111" visible="no" x-off="-1" y-off="-1" x-size="-1" y-size="-1"/>
       <GUIObjectState>
-        <Object id="route 21" color="3416:21888:21293"/>
+        <Object id="route 21" color="41362:19043:7132"/>
         <Object id="rtav 21" height="62" visible="1"/>
         <Object id="automation 42" height="62" visible="0"/>
         <Object id="automation 29" height="62" visible="0"/>
@@ -170,8 +170,8 @@
         <Object id="strip 21" visible="1">
           <Object id="processor 40"/>
         </Object>
-        <Object id="route 88" color="7490:6780:29796"/>
-        <Object id="rtav 88" height="105" visible="1" note-range-min="60" note-range-max="71" color-mode="MeterColors"/>
+        <Object id="route 88" color="32992:47392:14682"/>
+        <Object id="rtav 88" height="102" visible="1" note-range-min="60" note-range-max="71" color-mode="MeterColors"/>
         <Object id="strip 88" visible="1">
           <Object id="processor 107"/>
         </Object>
diff --git a/libs/ardour/test/profiling/sessions/1region/1region.ardour.bak b/libs/ardour/test/profiling/sessions/1region/1region.ardour.bak
index ff17374272..4a3e63f351 100644
--- a/libs/ardour/test/profiling/sessions/1region/1region.ardour.bak
+++ b/libs/ardour/test/profiling/sessions/1region/1region.ardour.bak
@@ -81,7 +81,7 @@
         </PannerShell>
       </Processor>
     </Route>
-    <Route id="88" name="MIDI 1" default-type="midi" active="yes" phase-invert="" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=2" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" note-mode="Sustained" step-editing="no" midi-thru="yes" input-active="yes">
+    <Route id="88" name="MIDI 1" default-type="midi" active="yes" phase-invert="" denormal-protection="no" meter-point="MeterPostFader" order-keys="signal=2" self-solo="no" soloed-by-upstream="0" soloed-by-downstream="0" solo-isolated="no" solo-safe="no" monitoring="" saved-meter-point="MeterPostFader" note-mode="Sustained" step-editing="no" input-active="yes">
       <IO name="MIDI 1" id="105" direction="Input" default-type="midi" user-latency="0">
         <Port type="midi" name="MIDI 1/midi_in 1"/>
       </IO>
diff --git a/libs/ardour/test/profiling/sessions/1region/1region.history b/libs/ardour/test/profiling/sessions/1region/1region.history
index d836783943..27732c0340 100644
--- a/libs/ardour/test/profiling/sessions/1region/1region.history
+++ b/libs/ardour/test/profiling/sessions/1region/1region.history
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <UndoHistory>
-  <UndoTransaction tv-sec="1339964796" tv-usec="189501" name="create region">
+  <UndoTransaction tv-sec="1340037919" tv-usec="627348" name="create region">
     <StatefulDiffCommand obj-id="116" type-name="ARDOUR::MidiPlaylist">
       <Changes>
         <Regions>
@@ -9,28 +9,19 @@
       </Changes>
     </StatefulDiffCommand>
   </UndoTransaction>
-  <UndoTransaction tv-sec="1339964800" tv-usec="298226" name="Region end trim">
+  <UndoTransaction tv-sec="1340037923" tv-usec="327852" name="Region end trim">
     <StatefulDiffCommand obj-id="131" type-name="ARDOUR::MidiRegion">
       <Changes>
-        <length from="96000" to="484432"/>
-        <length-beats from="4" to="20.1846666667"/>
+        <length from="96000" to="559470"/>
+        <length-beats from="4" to="23.31125"/>
       </Changes>
     </StatefulDiffCommand>
   </UndoTransaction>
-  <UndoTransaction tv-sec="1339964802" tv-usec="348425" name="add note">
+  <UndoTransaction tv-sec="1340037927" tv-usec="128795" name="add note">
     <NoteDiffCommand midi-source="118">
       <ChangedNotes/>
       <AddedNotes>
-        <note id="0" note="69" channel="0" time="3.656" length="4.78183" velocity="64"/>
-      </AddedNotes>
-      <RemovedNotes/>
-    </NoteDiffCommand>
-  </UndoTransaction>
-  <UndoTransaction tv-sec="1339964802" tv-usec="958308" name="add note">
-    <NoteDiffCommand midi-source="118">
-      <ChangedNotes/>
-      <AddedNotes>
-        <note id="1" note="65" channel="0" time="5.31125" length="5.33358" velocity="64"/>
+        <note id="0" note="68" channel="0" time="3.67833" length="12.8742" velocity="64"/>
       </AddedNotes>
       <RemovedNotes/>
     </NoteDiffCommand>
diff --git a/libs/ardour/test/profiling/sessions/1region/instant.xml b/libs/ardour/test/profiling/sessions/1region/instant.xml
index 6ee1811962..5f0c8e83dd 100644
--- a/libs/ardour/test/profiling/sessions/1region/instant.xml
+++ b/libs/ardour/test/profiling/sessions/1region/instant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <instant>
-  <Editor id="11" mixer-width="Wide" zoom-focus="ZoomFocusPlayhead" zoom="4413.999148" snap-to="SnapToBeat" snap-mode="SnapOff" internal-snap-to="SnapToBeat" internal-snap-mode="SnapOff" pre-internal-snap-to="SnapToBeatDiv3" pre-internal-snap-mode="SnapOff" edit-point="EditAtPlayhead" playhead="0" left-frame="0" y-origin="0.000000" show-measures="yes" maximised="no" follow-playhead="no" stationary-playhead="no" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" internal-edit="yes" join-object-range="no" show-editor-mixer="yes" show-editor-list="yes" editor-list-page="1" show-marker-lines="yes" nudge-clock-value="240000">
+  <Editor id="11" mixer-width="Wide" zoom-focus="ZoomFocusPlayhead" zoom="4413.999148" snap-to="SnapToBeat" snap-mode="SnapOff" internal-snap-to="SnapToBeat" internal-snap-mode="SnapOff" pre-internal-snap-to="SnapToBeat" pre-internal-snap-mode="SnapOff" edit-point="EditAtPlayhead" playhead="0" left-frame="0" y-origin="0.000000" show-measures="yes" maximised="no" follow-playhead="no" stationary-playhead="no" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" internal-edit="yes" join-object-range="no" show-editor-mixer="yes" show-editor-list="yes" editor-list-page="1" show-marker-lines="yes" nudge-clock-value="240000">
     <geometry x-size="1366" y-size="714" x-pos="0" y-pos="27" edit-horizontal-pane-pos="1011" notebook-shrunk="0" edit-vertical-pane-pos="518"/>
     <Buttons>
       <Press/>
diff --git a/libs/ardour/test/profiling/sessions/1region/interchange/1region/midifiles/MIDI 1-1.mid b/libs/ardour/test/profiling/sessions/1region/interchange/1region/midifiles/MIDI 1-1.mid
new file mode 100644
index 0000000000..80d4f9fda2
--- /dev/null
+++ b/libs/ardour/test/profiling/sessions/1region/interchange/1region/midifiles/MIDI 1-1.mid