Refactoring to finish the Ardour Interface page, updated the content of the tracks...

diff --git a/include/about-ardours-interface.html b/include/about-ardours-interface.html
index a88f71fee6e23ced56c26a5ca89f1bf78b0019bf..df4dfe88c4a82b3bb56af4665c767956f5c1b3b5 100644 (file)
--- a/include/about-ardours-interface.html
+++ b/include/about-ardours-interface.html
@@ -28,13 +28,13 @@
                        <a href="@@editor-lists"><div class="hoverimg" style="left: 498px; top: 88px; width: 102px; height: 259px; background-image: url('/images/Split_EditorLists.png');"></div></a>
                        <a href="@@ruler"><div class="hoverimg" style="left: 43px; top: 62px; width: 455px; height: 49px; background-image: url('/images/Split_Ruler.png');"></div></a>
                        <a href="@@summary"><div class="hoverimg" style="left: 43px; top: 295px; width: 455px; height: 52px; background-image: url('/images/Split_Summary.png');"></div></a>
-                       <div class="hoverimg" style="left: 43px; top: 110px; width: 7px; height: 185px; background-image: url('/images/Split_GroupTabs.png');"></div>
-                       <div class="hoverimg" style="left: 50px; top: 110px; width: 448px; height: 26px; background-image: url('/images/Split_MasterBus.png');"></div>
-                       <div class="hoverimg" style="left: 50px; top: 136px; width: 448px; height: 27px; background-image: url('/images/Split_anAudioTrack.png');"></div>
-                       <div class="hoverimg" style="left: 50px; top: 163px; width: 448px; height: 26px; background-image: url('/images/Split_someAutomation.png');"></div>
-                       <div class="hoverimg" style="left: 50px; top: 189px; width: 448px; height: 27px; background-image: url('/images/Split_anotherAudioTrack.png');"></div>
-                       <div class="hoverimg" style="left: 50px; top: 215px; width: 448px; height: 26px; background-image: url('/images/Split_aMIDITrack.png');"></div>
-                       <div class="hoverimg" style="left: 50px; top: 242px; width: 448px; height: 54px; background-image: url('/images/Split_anotherMIDITrack.png');"></div>
+                       <a href="@@track-and-bus-groups"><div class="hoverimg" style="left: 43px; top: 110px; width: 7px; height: 185px; background-image: url('/images/Split_GroupTabs.png');"></div></a>
+                       <a href="@@bus-controls"><div class="hoverimg" style="left: 50px; top: 110px; width: 448px; height: 26px; background-image: url('/images/Split_MasterBus.png');"></div></a>
+                       <a href="@@audio-track-controls"><div class="hoverimg" style="left: 50px; top: 136px; width: 448px; height: 27px; background-image: url('/images/Split_anAudioTrack.png');"></div></a>
+                       <a href="@@automation"><div class="hoverimg" style="left: 50px; top: 163px; width: 448px; height: 26px; background-image: url('/images/Split_someAutomation.png');"></div></a>
+                       <a href="@@audio-track-controls"><div class="hoverimg" style="left: 50px; top: 189px; width: 448px; height: 27px; background-image: url('/images/Split_anotherAudioTrack.png');"></div></a>
+                       <a href="@@midi-track-controls"><div class="hoverimg" style="left: 50px; top: 215px; width: 448px; height: 26px; background-image: url('/images/Split_aMIDITrack.png');"></div></a>
+                       <a href="@@midi-track-controls"><div class="hoverimg" style="left: 50px; top: 242px; width: 448px; height: 54px; background-image: url('/images/Split_anotherMIDITrack.png');"></div></a>
                </div>
 
   <div class="container" style="margin-left:10px; float:left; width: 600px; height: 347px; background-image: url('/images/Split_Background.png');">
@@ -52,7 +52,7 @@
                        <a href="@@favorite-plugins-window"><div class="hoverimg" style="left: 0px; top: 48px; width: 66px; height: 122px; background-image: url('/images/Split_FavoritePlugins.png');"></div></a>
                        <a href="@@strips-list"><div class="hoverimg" style="left: 0px; top: 170px; width: 66px; height: 88px; background-image: url('/images/Split_StripsList.png');"></div></a>
                        <a href="@@groups-list"><div class="hoverimg" style="left: 0px; top: 257px; width: 66px; height: 90px; background-image: url('/images/Split_GroupsList.png');"></div></a>
-                       <div class="hoverimg" style="left: 66px; top: 48px; width: 363px; height: 9px; background-image: url('/images/Split_GroupsTabs.png');"></div>
+                       <a href="@@track-and-bus-groups"><div class="hoverimg" style="left: 66px; top: 48px; width: 363px; height: 9px; background-image: url('/images/Split_GroupsTabs.png');"></div></a>
                        <a href="@@master-bus-strip"><div class="hoverimg" style="left: 490px; top: 48px; width: 46px; height: 299px; background-image: url('/images/Split_MasterStrip.png');"></div></a>
                        <a href="@@monitor-section"><div class="hoverimg" style="left: 536px; top: 48px; width: 64px; height: 299px; background-image: url('/images/Split_MonitorSection.png');"></div></a>
                        <a href="@@control-masters-mixer-strips"><div class="hoverimg" style="left: 429px; top: 48px; width: 61px; height: 299px; background-image: url('/images/Split_ControlMastersStrips.png');"></div></a>
@@ -127,4 +127,3 @@
 <p>
   To learn more about the process of mixing, see <a href="@@basic-mixing">Mixing<a>.
 </p>
-

diff --git a/include/audio-track-controls.html b/include/audio-track-controls.html
index 1a896d264070af5af18c0d5361952f6910946ca3..8036567ffc5e0e2ae5bfd44e9da86648838d28af 100644 (file)
--- a/include/audio-track-controls.html
+++ b/include/audio-track-controls.html
@@ -1,26 +1,59 @@
 
+<figure>
+    <img src="/images/typical-audio-track-controls.png" alt="audio track controls">
+    <figcaption>
+      An audio track header section
+    </figcaption>
+</figure>
+
 <p>
-  A typical control area or <dfn>track header</dfn> for an audio track is
-  shown below:
+  At the top-left of the controls is the name of the track, which can be
+  edited by double-clicking on it. The new name must be unique within the
+  session.
 </p>
-
-<img src="/images/typical-audio-track-controls.png" alt="audio track controls" />
+<p>
+  Underneath the name is the track's main level fader. Changing it will affect
+  the whole track :
+</p>
+<ul>
+  <li><kbd class="mouse">dragging</kbd> will change the fader's value as
+    per the mouse's position</li>
+  <li><kbd class="mod1 mouse">clicking</kbd> will set the fader to &minus;&infin;
+    </li>
+  <li><kbd class="mod3 mouse">clicking</kbd> will reset the fader to its original
+    0dB position.</li>
+</ul>
 
 <p>
-  An audio track has the same
-  <a href="@@bus-controls">controls as a bus</a>, with the
-  addition of two extras.
+  On the right-hand side of the headers are level meters for the outputs of the track
+  (1 level per output).
 </p>
 
+<p>
+  The control buttons are:
+</p>
 <table class="dl">
-  <tr><th id="record" style="color:red;font-weight:bold;">[&bull;]</th>
-  <td><dfn>Record</dfn>&mdash;The button with the pink circle arms the track
-  for recording. When armed, the entire button will turn pink, and change to
-  bright red as soon as the transport is rolling and the track is recording.</td></tr>
-  <tr><th id="playlist">p</th>
-  <td><dfn>Playlist</dfn>&mdash;Opens a playlist menu when clicked. The menu
-  offers various operations related to the track's <a
-  href="/working-with-playlists/">playlist</a>.
-  </td></tr>
+  <tr><th id="record"><kbd style="color:red;">&#9679;</kbd> (Record)</th>
+      <td>The button with the pink circle arms the track
+      for recording. When armed, the entire button will turn pink, and change to
+      bright red as soon as the transport is rolling and the track is recording.
+      <kbd class="mouse">Right</kbd> clicking will allow to en/disable Rec-safe,
+      protecting the track against accidental recording.</td></tr>
+  <tr><th id="mute"><kbd>M</kbd> (Mute)</th>
+      <td>Mutes the track. <kbd class="mouse">Right</kbd> clicking displays
+      a menu which dictates what particular parts of the track should be muted.</td></tr>
+  <tr><th id="solo"><kbd>S</kbd> (Solo)</th>
+      <td>Soloes the track. The behaviour of the solo system
+      is described in detail in the section <a href="@@muting-and-soloing">Muting and Soloing</a>.
+      <kbd class="mouse">Right</kbd> clicking will allow to en/disable Solo isolate
+      and Solo safe.</td></tr>
+  <tr><th id="playlist"><kbd>P</kbd> (Playlist)</th>
+      <td>Opens a playlist menu when clicked. The menu
+      offers various operations related to the track's <a href="@@playlists">playlist</a>.</td></tr>
+  <tr><th id="automation"><kbd>A</kbd> (Automation)</th>
+      <td>Opens the automation menu for the
+      track. For details see <a href="@@automation">Automation</a>.</td></tr>
+  <tr><th id="group"><kbd>G</kbd> (Group)</th>
+      <td>Allows to assign the track to an existing or a
+      new group. For details see <a href="@@track-and-bus-groups">Track and bus groups</a>.</td></tr>
 </table>
-

diff --git a/include/bus-controls.html b/include/bus-controls.html
index f6c323c484445e0cbe964e72280e4d34c433ab68..353fee63ad2e7811b0a876c12a8ac42afb894a24 100644 (file)
--- a/include/bus-controls.html
+++ b/include/bus-controls.html
@@ -1,26 +1,21 @@
 
-<p>A typical control area or <dfn>bus header<dfn> is shown below:</p>
-<img src="/images/typical-bus-controls.png" alt="bus controls" />
+<figure>
+  <img src="/images/typical-bus-controls.png" alt="bus controls">
+  <figcaption>
+    A MIDI track header section
+  </figcaption>
+</figure>
 
 <p>
-  At the top-left of the controls is the name of the bus, which can be
-  edited by double-clicking on it. The new name must be unique within the
-  session. Underneath the name is a copy of the bus' main level fader.
-  The control buttons to the right-hand side are:
+  The bus' header is very similar to the <a href="@@audio-track-controls">audio track
+  header</a>, minus :
 </p>
-<table class="dl">
-  <tr><th id="mute">M</th>
-  <td><dfn>Mute</dfn>&mdash;click to mute the bus. Right-click to display
-  a menu which dictates what particular parts of the bus should be muted.</td></tr>
-  <tr><th id="solo">S</th>
-  <td><dfn>Solo</dfn>&mdash;solo the bus. The behaviour of the solo system
-  is described in detail in the section <a
-  href="/mixing/muting-and-soloing/">Muting and Soloing</a>.</td></tr>
-  <tr><th id="automation">A</th>
-  <td><dfn>Automation</dfn>&mdash;opens the automation menu for the
-  bus. For details see <a href="@@automation">Automation</a>.</td></tr>
-  <tr><th id="group">G</th>
-  <td><dfn>Group</dfn>&mdash;lets you assign the bus to an existing or a
-  new group. For details see <a href="@@the-track-and-bus-group-list">Track and bus groups</a>. </td></tr>
-</table>
+<ul>
+  <li>the playlist button, as a bus doesn't have any playlists or regions by itself,
+  it is only a pipe to route audio or midi through</li>
+  <li>the record button, for the same reason.</li>
+</ul>
 
+<p>
+  For more information about the bus concept, see <a href="@@understanding-basic-concepts-and-terminology#busses">Understanding basic concepts</a>.
+</p>

diff --git a/master-doc.txt b/master-doc.txt
index 83829a09314db38cde2907639626205648bb0eac..597ca910f6754db921ba6c1d4af4e692a315162e 100644 (file)
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -229,6 +229,49 @@ uri: setting-up-your-system/using_more_than_one_audio_device
 part: subchapter
 ---
 
+
+---
+title: Synchronization
+include: working-with-synchronization.html
+link: working-with-synchronization
+uri: synchronization
+part: chapter
+---
+
+---
+title: On Clock and Time
+include: on-clock-and-time.html
+link: on-clock-and-time
+uri: synchronization/on-clock-and-time
+part: subchapter
+---
+
+---
+title: Latency and Latency-Compensation
+menu_title: Latency
+include: latency-and-latency-compensation.html
+link: latency-and-latency-compensation
+uri: synchronization/latency-and-latency-compensation
+part: subchapter
+---
+
+---
+title: Timecode Generators and Slaves
+include: timecode-generators-and-slaves.html
+link: timecode-generators-and-slaves
+uri: synchronization/timecode-generators-and-slaves
+part: subchapter
+---
+
+---
+title: Overview of all Timecode related settings
+menu_title: Overview of Timecode settings
+include: overview-of-all-timecode-related-settings.html
+link: overview-of-all-timecode-related-settings
+uri: synchronization/overview-of-timecode-related-settings
+part: subchapter
+---
+
 ---
 title: Global Preferences
 menu_title: Global Preferences
@@ -776,6 +819,45 @@ uri: ardours-interface/the-master-bus-strip
 part: subchapter
 ---
 
+---
+title: Editor Tracks
+include: track-controls.html
+link: track-controls
+part: chapter
+---
+
+---
+title: Audio Track Controls
+include: audio-track-controls.html
+link: audio-track-controls
+uri: working-with-tracks/audio-track-controls
+part: subchapter
+---
+
+---
+title: MIDI Track Controls
+include: midi-track-controls.html
+link: midi-track-controls
+uri: working-with-tracks/midi-track-controls
+part: subchapter
+---
+
+---
+title: Bus Controls
+include: bus-controls.html
+link: bus-controls
+uri: working-with-tracks/bus-controls
+part: subchapter
+---
+
+---
+title: Track and Bus Groups
+include: track-and-bus-groups.html
+link: track-and-bus-groups
+uri: working-with-tracks/track-and-bus-groups
+part: chapter
+---
+
 ---
 title: Monitor Section
 include: monitor-section.html
@@ -893,37 +975,6 @@ uri: working-with-tracks/track-context-menu
 part: subchapter
 ---
 
----
-title: Track Controls
-include: track-controls.html
-link: track-controls
-part: chapter
----
-
----
-title: Bus Controls
-include: bus-controls.html
-link: bus-controls
-uri: working-with-tracks/bus-controls
-part: subchapter
----
-
----
-title: Audio Track Controls
-include: audio-track-controls.html
-link: audio-track-controls
-uri: working-with-tracks/audio-track-controls
-part: subchapter
----
-
----
-title: MIDI Track Controls
-include: midi-track-controls.html
-link: midi-track-controls
-uri: working-with-tracks/midi-track-controls
-part: subchapter
----
-
 ---
 title: Controlling Track Appearance
 include: controlling-track-appearance.html
@@ -964,14 +1015,6 @@ uri: working-with-tracks/controlling-track-appearance/waveform-display
 part: subchapter
 ---
 
----
-title: Track and Bus Groups
-include: track-and-bus-groups.html
-link: track-and-bus-groups
-uri: working-with-tracks/track-and-bus-groups
-part: chapter
----
-
 ---
 title: Importing and Exporting Session Data
 menu_title: Import/Export Session Data
@@ -1958,72 +2001,16 @@ part: subchapter
 ---
 
 ---
-title: Sync & Video
+title: Video
 part: part
 ---
 
----
-title: Working with Synchronization
-include: working-with-synchronization.html
-link: working-with-synchronization
-uri: synchronization
-part: chapter
----
-
----
-title: On Clock and Time
-include: on-clock-and-time.html
-link: on-clock-and-time
-uri: synchronization/on-clock-and-time
-part: subchapter
----
-
----
-title: Latency and Latency-Compensation
-menu_title: Latency
-include: latency-and-latency-compensation.html
-link: latency-and-latency-compensation
-uri: synchronization/latency-and-latency-compensation
-part: subchapter
----
-
----
-title: Timecode Generators and Slaves
-include: timecode-generators-and-slaves.html
-link: timecode-generators-and-slaves
-uri: synchronization/timecode-generators-and-slaves
-part: subchapter
----
-
----
-title: Overview of all Timecode related settings
-menu_title: Overview of Timecode settings
-include: overview-of-all-timecode-related-settings.html
-link: overview-of-all-timecode-related-settings
-uri: synchronization/overview-of-timecode-related-settings
-part: subchapter
----
-
----
-title: Working with Field Recorders in Ardour
-include: working-with-field-recorders-in-ardour.html
-link: working-with-field-recorders-in-ardour
-part: chapter
----
-
----
-title: Working with Video in Ardour
-include: working-with-video-in-ardour.html
-link: working-with-video-in-ardour
-part: chapter
----
-
 ---
 title: Video Timeline and Monitoring
 include: video-timeline-and-monitoring.html
 link: video-timeline-and-monitoring
 uri: video-timeline
-part: subchapter
+part: chapter
 ---
 
 ---
@@ -2031,7 +2018,7 @@ title: Video Timeline Setup
 include: video-timeline-setup.html
 link: video-timeline-setup
 uri: video-timeline/setup
-part: subchapter
+part: chapter
 ---
 
 ---
@@ -2039,7 +2026,7 @@ title: Transcoding, Formats & Codecs
 include: transcoding-formats-amp-codecs.html
 link: transcoding-formats-amp-codecs
 uri: video-timeline/transcoding_formats_codecs
-part: subchapter
+part: chapter
 ---
 
 ---
@@ -2047,7 +2034,7 @@ title: Workflow & Operations
 include: workflow-amp-operations.html
 link: workflow-amp-operations
 uri: video-timeline/operations
-part: subchapter
+part: chapter
 ---
 
 ---