OSC: Updated to match current code.

diff --git a/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc.html b/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc.html
index f87c2f4bcb29e82111b5420b4fe4ff1c9f028c00..59420aef6b1a6580d0a21fd73bfaf501d0743fa1 100644 (file)
--- a/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc.html
+++ b/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc.html
@@ -234,6 +234,8 @@ here</em>"/&gt;</kbd>
   Auto monitoring is enabled.</dd>
   <dt><kbd class="osc">/strip/recenable <em>ssid</em> <em>rec_st</em></kbd></dt>
   <dd>where <em>rec_st</em> is a bool/int representing the desired rec state of the track</dd>
+  <dt><kbd class="osc">/strip/record_safe <em>ssid</em> <em>rec_st</em></kbd></dt>
+  <dd>where <em>rec_st</em> is a bool/int representing the desired record safe state of the track</dd>
   <dt><kbd class="osc">/strip/gain <em>ssid</em>  <em>gain</em></kbd></dt>
   <dd>where <em>gain</em> is a float ranging from -193 to 6 representing the desired gain of the track in dB.</dd>
   <dt><kbd class="osc">/strip/fader <em>ssid</em>  <em>position</em></kbd></dt>

diff --git a/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc/02_feedback-in-osc.html b/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc/02_feedback-in-osc.html
index f2c943781ec5db4ba9cab71095d61f8c5ffb57e7..24b4ac5a76632cd0a32cc3516636e5e2ea237bb3 100644 (file)
--- a/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc/02_feedback-in-osc.html
+++ b/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc/02_feedback-in-osc.html
@@ -46,6 +46,38 @@ title: OSC Feedback With Ardour
 
 <h2>List of OSC feedback messages</h2>
 
+<h3>Feedback only</h3>
+<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="/using-control-surfaces/controlling-ardour-with-osc/calculating-feedback-and-strip-types-values/">
+  Calculating Feedback and Strip-types Values.</a>
+</p>
+<p class="note">
+  See strip section below for info about ssid and wrapping it into the
+  path.
+</p>
+<dl class="bindings">
+  <dt><kbd class="osc">/strip/name <em>ssid</em> <em>track_name</em></kbd></dt>
+  <dd>where <em>track_name</em> is a string representing the name of the track</dd>
+  <dt><kbd class="osc">/session_name <em>session_name</em></kbd></dt>
+  <dd>where <em>session_name</em> is a string representing the name of the session</dd>
+  <dt><kbd class="osc">/strip/meter <em>ssid</em> <em>meter</em></kbd></dt>
+  <dd>where <em>meter</em> is a value repesenting the current audio level.
+  (the exact math used is determined by the feedback bits set)</dd>
+  <dt><kbd class="osc">/strip/signal <em>ssid</em> <em>signal</em></kbd></dt>
+  <dd>where <em>signal</em> is a float indicating the instantainious
+  audio level is -40dB or higher.</dd>
+  <dt><kbd class="osc">/timecode <em>time</em></kbd></dt>
+  <dd>where <em>time</em> is a string with the current play head time.</dd>
+  <dt><kbd class="osc">/bar_beat <em>beat</em></kbd></dt>
+  <dd>where <em>beat</em> is a string with the current play head bar/beat.</dd>
+  <dt><kbd class="osc">/heartbeat <em>LED</em></kbd></dt>
+  <dd>where <em>LED</em> is a float that cycles 1/0 at 1 second intervals.</dd>
+  <dt><kbd class="osc">/record_tally <em>state</em></kbd></dt>
+  <dd>Some record enable is true or "ready to record"</dd>
+</dl>
+
 <h3>Transport Control</h3>
 <dl class="bindings">
   <dt><kbd class="osc">/transport_stop <em>state</em></kbd></dt>
@@ -60,7 +92,6 @@ title: OSC Feedback With Ardour
   <dd></dd>
 </dl>
 
-
 <h3>Recording control</h3>
 <dl class="bindings">
   <!--dt><kbd class="osc">/toggle_punch_in</kbd></dt>
@@ -69,8 +100,6 @@ title: OSC Feedback With Ardour
   <dd></dd-->
   <dt><kbd class="osc">/rec_enable_toggle <em>state</em></kbd></dt>
   <dd>Master record enabled.</dd>
-  <dt><kbd class="osc">/record_tally <em>state</em></kbd></dt>
-  <dd>Some record enable is true or "ready to record"</dd>
 </dl>
 
 <h3>Master and monitor strips</h3>
@@ -124,6 +153,8 @@ title: OSC Feedback With Ardour
   where both disk and input are false/0, auto monitoring is used.</dd>
   <dt><kbd class="osc">/strip/recenable <em>ssid</em> <em>rec_st</em></kbd></dt>
   <dd>where <em>rec_st</em> is a bool/int representing the actual rec state of the track</dd>
+  <dt><kbd class="osc">/strip/record_safe <em>ssid</em> <em>rec_st</em></kbd></dt>
+  <dd>where <em>rec_st</em> is a bool/int representing the actual record safe state of the track</dd>
   <dt><kbd class="osc">/strip/gain <em>ssid</em> <em>gain</em></kbd></dt>
   <dd>where <em>gain</em> is a float ranging from -193 to 6 representing the actual gain of the track in dB.</dd>
   <dt><kbd class="osc">/strip/fader <em>ssid</em>  <em>position</em></kbd></dt>

diff --git a/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc/03_calculating-feedback-and-strip-types-values.html b/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc/03_calculating-feedback-and-strip-types-values.html
index 40505768e9763ba15ef474579ec46bbe0a5aab38..bf153ce032d7c71ac99828bcfb8b614217c0a114 100644 (file)
--- a/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc/03_calculating-feedback-and-strip-types-values.html
+++ b/_manual/22_using-control-surfaces/01_controlling-ardour-with-osc/03_calculating-feedback-and-strip-types-values.html
@@ -77,7 +77,7 @@ title: Calculating Feedback and Strip-types Values
                2 - Variable control values for strips.
        </li>
        <li>
-               4 - Send meter values (not coded yet).
+               4 - Send SSID as path extension.
        </li>
        <li>
                8 - heartbeat to surface.
@@ -86,13 +86,21 @@ title: Calculating Feedback and Strip-types Values
                16 - Enable master section feedback.
        </li>
        <li>
-               32 - Send Bar and Beat (not coded yet).
+               32 - Send Bar and Beat.
        </li>
        <li>
-               64 - Send timecode (not coded yet).
+               64 - Send timecode.
        </li>
        <li>
-               128 - Send SSID as path extension.
+               128 - Send meter as dB (-193 to +6) or 1024 depending on gainmode
+       </li>
+       <li>
+               256 - Send meter a 16 bit value where each bit is a level
+               and all bits of lower level are on. For use in a LED strip. This
+               will not work if the above option is turned on.
+       </li>
+       <li>
+               512 - Send signal present, true if level is higher than -20dB
        </li>
   </ul>
 <p>