Match the recent changes in recording modes

diff --git a/include/track-modes.html b/include/track-modes.html
index 47a70bae69c94a8fdae4cfca6bf3a4d8bcf5ff99..da4304b469346717889401846cda1a29555c58a2 100644 (file)
--- a/include/track-modes.html
+++ b/include/track-modes.html
@@ -3,9 +3,9 @@
   when recording:
 </p>
 <table class="dl">
-  <tr><th>Normal</th>
-  <td>Tracks in <dfn>normal mode</dfn> will record non-destructively&mdash;new
-  data is written to new files, and when overdubbing, new regions will be
+  <tr><th>Layered</th>
+  <td>Tracks in <dfn>layered mode</dfn> will record non-destructively&nbsp;&mdash;
+  new data is written to new files, and when overdubbing, new regions will be
   layered on top of existing ones. This is the recommended mode for most
   workflows.
   </td></tr>
@@ -18,39 +18,60 @@
   word material, especially in combination with
   <a href="@@pushpull-trimming">push/pull trimming</a>.
   </td></tr>
+  <tr><th>Sound on Sound</th>
+  <td>Tracks using <dfn>sound-on-sound mode</dfn> will record
+  non-destructively&nbsp;&mdash; new data is written to new files, but when
+  overdubbing, new regions will be layered on top of existing ones in non-opaque
+  mode which means both existing and new material will be played back after
+  the recording is over. This is convenient for a variety of use cases, such as
+  adding MIDI Control Change events on top of recorded live performance.
+  </td></tr>
 </table>
 
+<p>
+  Results of recording in layered and non-layered modes are visually the same.
+  However, with the sound-on-sound mode lower layers are visible under upper
+  layers, because in that case new regions with overdubs are created with
+  disabled <em>Opaque</em> setting.
+</p> 
+
 <figure class="right">
-  <img src="/images/a3_nonlayered_example.png" alt="Normal and non-layered overdubbing comparision">
+  <img src="/images/region-layering-modes-overlaid.png" alt="Layered, non-layered, and sound-on-sound modes" width="75%" >
   <figcaption>
-    Normal and non-layered overdubbing comparision
+    Layered, non-layered, and sound-on-sound modes in overlaid view
   </figcaption>
 </figure>
 
 <p>
-  The screenshot on the right shows the subtle difference between an overdub
-  in <dfn>normal mode</dfn> (upper track) and one in <dfn>non-layered mode</dfn>
-  (lower track). Both tracks were created using identical audio data.
-</p>
-<p>
-  The upper track shows a new region which has been <dfn>layered on
-  top</dfn> of the the existing (longer) region. It can be seen by the region
-  name strips.
+  To illustrate the difference, here is the screenshot of the same tracks, but
+  this time&nbsp;&mdash; in <em>Stacked</em> track mode (rather than
+  <em>Overlaid</em> as on the screenshot above).
 </p>
+
+<figure class="right">
+  <img src="/images/region-layering-modes-stacked.png" alt="Layered, non-layered, and sound-on-sound modes in stacked view" width="75%" >
+  <figcaption>
+    Layered, non-layered, and sound-on-sound modes in stacked view
+  </figcaption>
+</figure>
+
 <p>
-  The lower track has split the existing region in two, trimmed each new
-  region to create space for the new overdub, and inserted the overdub region
-  in between.
+  The overdub is an opaque region on top of the original content for the
+  <em>Layered</em> mode. For the <em>Non-Layered</em> mode, it completely
+  replaces the matching part of the original content. And for the
+  <em>Sound on Sound</em> mode, it's a transparent region on top of the original
+  content.
 </p>
 
 <p>
-  The switch between normal and non-layered modes is a global setting available
-  in the main toolbar.
+  The switch between layered, non-layered, and sound-on-sound modes is a global
+  setting available in the main toolbar right below the buttons enabling
+  Punch In and Punch Out.
 </p>
 
-<figure class="right">
-  <img src="/images/non-layered-track-mode-enabled.png" alt="Non-layered track mode enabled" width="50%">
+<figure class="left">
+  <img src="/images/layering-switch.png" alt="Layering switch" width="50%">
   <figcaption>
-    Non-layered track mode enabled
+    Layering switch
   </figcaption>
 </figure>

diff --git a/source/images/a3_nonlayered_example.png b/source/images/a3_nonlayered_example.png
deleted file mode 100644 (file)
index ddd864e..0000000
Binary files a/source/images/a3_nonlayered_example.png and /dev/null differ

diff --git a/source/images/layering-switch.png b/source/images/layering-switch.png
new file mode 100644 (file)
index 0000000..1cef5df
Binary files /dev/null and b/source/images/layering-switch.png differ

diff --git a/source/images/punch-controls.png b/source/images/punch-controls.png
index 67a0c4bd15b5d7aabc77934953cd8a9c5727e765..4ed9fb57d450a9e49ea48ea5b9af4444294b26de 100644 (file)
Binary files a/source/images/punch-controls.png and b/source/images/punch-controls.png differ

diff --git a/source/images/region-layering-modes-overlaid.png b/source/images/region-layering-modes-overlaid.png
new file mode 100644 (file)
index 0000000..153164b
Binary files /dev/null and b/source/images/region-layering-modes-overlaid.png differ

diff --git a/source/images/region-layering-modes-stacked.png b/source/images/region-layering-modes-stacked.png
new file mode 100644 (file)
index 0000000..ed26fe9
Binary files /dev/null and b/source/images/region-layering-modes-stacked.png differ