X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fosc58-feedback.html;h=db1b0e5cf7991e3066931d548ca0796bbd4c151b;hb=f56f685d73572cad74ad34f4b9dc8acf5ed68fdf;hp=a0dd7301b942a3ce64dc5249a5d743f33d485c6b;hpb=7be4f507991a0b87174a0e78831a4e7e9e96bcbe;p=ardour-manual

diff --git a/include/osc58-feedback.html b/include/osc58-feedback.html
index a0dd730..db1b0e5 100644
--- a/include/osc58-feedback.html
+++ b/include/osc58-feedback.html
@@ -69,7 +69,7 @@
 <p>
   These messages are feedback only. They are sent as status from Ardour
   and some of them may be enabled separately from other feedback. See:
-  <a href="@@osc58-feedback-and-strip-types-values">
+  <a href="@@osc58-feedback-and-strip-types-values#feedback">
   Calculating Feedback and Strip-types Values.</a>
 </p>
 <p class="note">
@@ -83,6 +83,9 @@
 <table class="dl">
   <tr><th><kbd class="osc">/strip/name <em>ssid</em> <em>track_name</em></kbd></th>
   <td>where <em>track_name</em> is a string representing the name of the track</td></tr>
+  <tr><th><kbd class="osc">/strip/*/automation_name <em>ssid</em>  <em>name</em></kbd></th>
+  <td>where <em>name</em> is a string representing the current automation mode for the control.
+  <a href="@@osc58-automation">See OSC Automation.</a></td></tr>
   <tr><th><kbd class="osc">/session_name <em>session_name</em></kbd></th>
   <td>where <em>session_name</em> is a string representing the name of the session</td></tr>
   <tr><th><kbd class="osc">/strip/meter <em>ssid</em> <em>meter</em></kbd></th>
@@ -119,6 +122,8 @@
   <td><em>state</em> is true when loop mode is true</td></tr>
   <tr><th><kbd class="osc">/cancel_all_solos <em>state</em></kbd></th>
   <td>Where <em>state</em> true indicates there are active solos that can be canceled.</td></tr>
+  <tr><th><kbd class="osc">/jog/mode/name <em>name</em></kbd></th>
+  <td>Where <em>name</em> is a string indicating the name of the current jog mode.</td></tr>
 </table>
 
 <h3>Recording control</h3>
@@ -145,12 +150,18 @@
   <td>where <em>dB</em> is a float ranging from -20 to +20 representing the actual trim for master in dB</td></tr>
   <tr><th><kbd class="osc">/master/pan_stereo_position <em>position</em></kbd></th>
   <td>where <em>position</em> is a float ranging from 0 to 1 representing the actual pan position for master</td></tr>
-  <tr><th><kbd class="osc">/master/mute  <em>yn</em></kbd></th>
-  <td>where <em>yn</em> is a bool/int representing the actual mute state of the Master strip</td></tr>
+  <tr><th><kbd class="osc">/master/mute  <em>state</em></kbd></th>
+  <td>where <em>state</em> is a bool/int representing the actual mute state of the Master strip</td></tr>
   <tr><th><kbd class="osc">/monitor/gain <em>dB</em></kbd></th>
   <td>where <em>dB</em> is a float ranging from -193 to 6 representing the actual gain of monitor in dB</td></tr>
   <tr><th><kbd class="osc">/monitor/fader  <em>position</em></kbd></th>
   <td>where <em>position</em> is an int ranging from 0 to 1023 representing the fader control position</td></tr>
+  <tr><th><kbd class="osc">/monitor/mute  <em>state</em></kbd></th>
+  <td>where <em>state</em> is a bool/int representing the actual mute state of the Monitor strip</td></tr>
+  <tr><th><kbd class="osc">/monitor/dim  <em>state</em></kbd></th>
+  <td>where <em>state</em> is a bool/int representing the actual dim state of the Monitor strip</td></tr>
+  <tr><th><kbd class="osc">/monitor/mono  <em>state</em></kbd></th>
+  <td>where <em>state</em> is a bool/int representing the actual mono state of the Monitor strip</td></tr>
 </table>
 
 <h3>Track specific operations</h3>
@@ -163,7 +174,7 @@
   below can also be sent as /strip/command/ssid param. Feedback can be
   set to match this with the /set_surface/feedback <em>state</em>
   command. See <a
-  href="/using-control-surfaces/controlling-ardour-with-osc/calculating-feedback-and-strip-types-values/">
+  href="@@osc58-feedback-and-strip-types-values#feedback">
   Calculating Feedback and Strip-types Values.</a>
 </p>
 
@@ -192,12 +203,15 @@
   <td>where <em>gain</em> is a float ranging from -193 to 6 representing the actual gain of the track in dB.</td></tr>
   <tr><th><kbd class="osc">/strip/fader <em>ssid</em>  <em>position</em></kbd></th>
   <td>where <em>position</em> is an float ranging from 0 to 1 representing the actual fader position of the track.</td></tr>
+  <tr><th><kbd class="osc">/strip/*/automation <em>ssid</em>  <em>mode</em></kbd></th>
+  <td>where <em>mode</em> is an int ranging from 0 to 3 representing the actual automation mode for the control.
+  <a href="@@osc58-automation">See OSC Automation.</a></td></tr>
   <tr><th><kbd class="osc">/strip/trimdB <em>ssid</em>  <em>trim_db</em></kbd></th>
   <td>where <em>trim_db</em> is a float ranging from -20 to 20 representing the actual trim of the track in dB.</td></tr>
   <tr><th><kbd class="osc">/strip/pan_stereo_position <em>ssid</em> <em>position</em></kbd></th>
   <td>where <em>position</em> is a float ranging from 0 to 1 representing the actual pan position of the track</td></tr>
 </table>
-<h3>Selection Operations</h3>
+<h3>Selected Operations</h3>
 <p>
   Selection feedback is the same as for strips, only the path changes
   from <em>/strip</em> to <em>/select</em> and there is no <em>ssid</em>.
@@ -233,7 +247,7 @@
   Every single menu item in Ardour's GUI is accessible via OSC. However,
   there is no provision for returning the state of anything set this way.
   This is not a bad thing as most menu items either do not have an on/off
-  state or that state is quite visible. Binding that affect other parameters
+  state or that state is quite visible. Bindings that affect other parameters
   that OSC does track will show on those OSC controls. Examples of this
   might be track record enable for tracks 1 to 32, play or stop.
 </p>