update ffmpeg version note

[ardour-manual] / _manual / 25_tempo-meter / 01_tempo-and-meter.html

diff --git a/_manual/25_tempo-meter/01_tempo-and-meter.html b/_manual/25_tempo-meter/01_tempo-and-meter.html
index ad636863e514f11ff4cc3475ce0bc8c24b1139aa..4060e569d56224cd08dd544fc510ccb2b412af5f 100644 (file)
--- a/_manual/25_tempo-meter/01_tempo-and-meter.html
+++ b/_manual/25_tempo-meter/01_tempo-and-meter.html
@@ -10,7 +10,8 @@ menu_title: Tempo and Meter
   When you change tempo or move an audio-locked meter, all objects on the timeline that are glued to bars and beats (locations, regions) will move in sympathy.
 </p>
 <p class="note">When performing meter or tempo operations, it is advised that you show the BBT ruler (available by right-clicking an existing marker or ruler name),
-  and ensure that the constraint modifier is set (in Preferences->User Interaction) so that no other modifiers share the key combination for "Constrain drags using : " e.g. control-shift.
+  and ensure that the constraint modifier is set (in Preferences->User Interaction) so that no other modifiers share its key combination.<br>
+  The constraint modifier is the "Constrain drags using : " setting under the "When Beginning a Drag" heading. One viable setting is control-shift.
 </p>
 
 <h3>Tempo</h3>
@@ -42,16 +43,32 @@ Music locked tempo marks move their frame position as their neighbours are moved
 <br>
 <p>A tempo may be remped or constant.
 
-<ul><li>A constant tempo will keep the sesion tempo constant until the next tempo section, at which time it will jump instantly to the next tempo.
-These are mostly useful abrupt changes, and is the way in which traditional DAWs deal with tempo changes (abrupt jumps in tempo).</li>
+  <ul>
+    <li>A constant tempo will keep the sesion tempo constant until the next tempo section, at which time it will jump instantly to the next tempo.
+      These are mostly useful abrupt changes, and is the way in which traditional DAWs deal with tempo changes (abrupt jumps in tempo).
+      <br>
+  </li>
 
-<li>A ramped tempo increases its tempo over time so that when the next tempo section has arrived, the sesion tempo is the same as the second one.
-This is useful for matching the session tempo to music which has been recorded without click tracks or electronic clocks.
+    <li>A ramped tempo increases its tempo over time so that when the next tempo section has arrived, the sesion tempo is the same as the second one.
+This is useful for matching the session tempo to music which has been recorded without a metronome.
 Ramps may also be used as a compositional tool, but more on this later.
 Note that a ramp requires two points - a start and an end tempo. The first tempo in a new session is ramped, but appears to be constant as it has no tempo to ramp to. It is only when you add a new tempo and adjust one of them that you will hear a ramp.
-The same applies to the last tempo in the session - it will always appear to be constant until a new last tempo is added and changed.
-</li>
-</ul>
+      The same applies to the last tempo in the session - it will always appear to be constant until a new last tempo is added and changed.
+  </li>
+  </ul>
+</p>
+<br>
+<p>
+  <img src="/images/constant-tempo.png" alt="A constant tempo displaying the tempo at the playhead in the audio clock">
+  <br>
+  A series of constant tempo markers. The tempo at the playhead position is the same as the previous tempo.
+</p>
+<br>
+<p>
+  <img src="/images/ramped-tempo.png" alt="A ramped tempo displaying the tempo at the playhead in the audio clock">
+  <br>
+  A ramped tempo marker. The tempo at the playhead position is approaching the second tempo. Because the playhead is equidistant (in beats) between the
+  two markers, the tempo at the playhead is the average of the two.
 </p>
 <br>
 <p>To add a new tempo, use the primary modifier and click on the tempo line at the desired position.