]> Shamusworld >> Repos - ardour-manual/commitdiff
Regrouped all the session properties in one page (as for the Preferences)
authorEd Ward <edwsaintesprit@hotmail.com>
Tue, 9 Jul 2019 13:42:30 +0000 (15:42 +0200)
committerEd Ward <edwsaintesprit@hotmail.com>
Tue, 9 Jul 2019 13:42:30 +0000 (15:42 +0200)
31 files changed:
include/fades-tab.html [deleted file]
include/filenames-tab.html [deleted file]
include/locations-tab.html [deleted file]
include/master-bus-strip.html
include/media-tab.html [deleted file]
include/meterbridge-tab.html [deleted file]
include/monitor-section.html
include/monitoring-tab.html [deleted file]
include/newopen-session-dialog.html
include/preferences.html
include/session-misc-tab.html [deleted file]
include/session-properties-dialog.html [deleted file]
include/session-properties.html [new file with mode: 0644]
include/sync-tab.html [deleted file]
include/the-session-menu.html
include/the-view-menu.html
include/timecode-tab.html [deleted file]
include/workflow-amp-operations.html
master-doc.txt
source/images/a4_meterbridge_full.png [deleted file]
source/images/a4_session_properties_fades.png [deleted file]
source/images/a4_session_properties_filenames.png [deleted file]
source/images/a4_session_properties_locations.png [deleted file]
source/images/a4_session_properties_media.png [deleted file]
source/images/a4_session_properties_meterbridge.png [deleted file]
source/images/a4_session_properties_misc.png [deleted file]
source/images/a4_session_properties_monitoring.png [deleted file]
source/images/a4_session_properties_sync.png [deleted file]
source/images/a4_session_properties_timecode.png [deleted file]
source/images/preferences.png [new file with mode: 0644]
source/images/session_properties.png [new file with mode: 0644]

diff --git a/include/fades-tab.html b/include/fades-tab.html
deleted file mode 100644 (file)
index cc8ba3f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-
-<figure>
-    <img src="/images/a4_session_properties_fades.png" alt="Session properties fades tab">
-    <figcaption>
-      Session properties fades tab
-    </figcaption>
-</figure>
-
-<p>
-  Change how Ardour works with region crossfades.
-</p>
-
-<ul>
-  <li>
-    <dfn>Destructive crossfade length</dfn> is used when an operation on a
-    region is destructive, such as when recording in a track is in tape mode.
-  </li>
-  <li>
-    When <dfn>Region fades</dfn> <strong>active</strong> is checked, the
-    region fades set up in the mixer are used during playback.  When unchecked,
-    the fades are ignored.
-  </li>
-  <li>
-    When <strong>Region fades visible</strong> is checked the region fades are visible
-    in the the <strong>Editor</strong>.
-  </li>
-
-</ul>
-
diff --git a/include/filenames-tab.html b/include/filenames-tab.html
deleted file mode 100644 (file)
index cb728de..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-
-<figure>
-    <img src="/images/a4_session_properties_filenames.png" alt="Session properties filenames tab">
-    <figcaption>
-      Session properties filenames tab
-    </figcaption>
-</figure>
-
-<p>
-  This tab is used to change how Ardour names recorded regions.
-  If <dfn>Prefix track number</dfn> is selected a unique number will appear on each track
-  in the <dfn>Editor</dfn> window and will prefix the region name. If the track number
-  is 2 and the region would have been Gtr-1.1 with track number prefix turned on the region
-  will be named 2_Gtr-1.1 instead.  See XX for base of the region name.
-</p>
-
-<p>
-  If <dfn>Prefix take name</dfn> is selected and the <dfn>Take name</dfn> has Take1 the region
-  will have the name Take1_Gtr-1.1 instead.  If both boxes are checked the name will be
-  Take1_2_Gtr-1.1 instead.
-</p>
-
-<p>
-  When <dfn>Prefix take name</dfn> is enabled, the first time a track is recorded it will
-  have the specified take name.  When recording is stopped, any trailing number on the
-  end of the take name will incremented by 1. If the track name specified doesn't have
-  a number on the end, the number 1 will be suffixed.
-</p>
-
diff --git a/include/locations-tab.html b/include/locations-tab.html
deleted file mode 100644 (file)
index c324762..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<figure>
-  <img src="/images/a4_session_properties_locations.png" alt="Session properties locations tab">
-  <figcaption>
-    Session properties locations tab
-  </figcaption>
-</figure>
-
-<p>
-  These options add file locations that will be searched to find the audio and
-  midi files used by the session. This is useful when the files have been
-  imported into the session but not copied into the session.
-</p>
-
-<p>
-  To add a location, navigate to the directory where the files are stored.
-  Drill down into the directory and then click open.  The directory will
-  show up in the dialog.  The remove button next to the added directory can be used
-  to remove it from the search path.
-</p>
-
index 5f0e5f2621771a055131a5c81a81686515b3731c..6de109108ee41484b9c29375aebb0c504716a29b 100644 (file)
@@ -13,7 +13,7 @@
 <ul>
   <li>There is no color affected to the master strip</li>
   <li>The master strip cannot be hidden, so there is not <kbd class="menu">X</kbd> in the top right</li>
-  <li>It is by definition always solo, so no <kbd class="menu">Solo</kbd>, <kbd class="menu">Iso</kbd> or <kbd class="menu">Lock</kbd> buttons. It is replaced by a button to show the Monitoring section if <a href="@@monitoring-tab">the session has one</a></li>
+  <li>It is by definition always solo, so no <kbd class="menu">Solo</kbd>, <kbd class="menu">Iso</kbd> or <kbd class="menu">Lock</kbd> buttons. It is replaced by a button to show the Monitoring section if <a href="@@session-properties#monitoring">the session has one</a></li>
   <li>It cannot belong to a mix group, so the button is removed.</li>
 </ul>
 
diff --git a/include/media-tab.html b/include/media-tab.html
deleted file mode 100644 (file)
index 880f4ec..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<figure class="right">
-  <img src="/images/a4_session_properties_media.png" alt="Session properties media tab">
-  <figcaption>
-               Session properties media tab
-  </figcaption>
-</figure>
-
-<p>
-  Change how sound is stored on disk. These options do not change how sound is handled
-  internally.
-</p>
-
-<ul>
-  <li>
-    <dfn>Sample format</dfn> defaults to 32-bit floating point, the same as
-    the internal representation. 24 and 16-bit integer representation are
-    also available.
-  </li>
-  <li>
-    <strong>File type</strong> options are WAVE,  WAVE-64, and CAF.
-  </li>
-</ul>
-
diff --git a/include/meterbridge-tab.html b/include/meterbridge-tab.html
deleted file mode 100644 (file)
index 4348ca8..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<p>
-  The meters from audio tracks always display in the <dfn>Meterbridge</dfn>.
-  This tab changes what additional controls are also displayed.
-</p>
-
-<figure>
-  <img src="/images/a4_session_properties_meterbridge.png" alt="Session properties meterbridge tab">
-  <figcaption>
-               Session properties meterbridge tab
-  </figcaption>
-</figure>
-
-<ul>
-  <li>
-    <dfn>Route Display</dfn> has options for showing midi tracks, busses, and the master bus.
-  </li>
-  <li>
-    <dfn>Button Area</dfn> has options for adding record enable, mute, solo, and input monitor buttons.
-  </li>
-  <li>
-    <dfn>Name Labels</dfn> adds the track name and, if numbers are enabled on the filenames tab, the number.
-  </li>
-</ul>
-
-<figure>
-  <img src="/images/a4_meterbridge_full.png" alt="Meterbidge with all options on">
-  <figcaption>
-               Meterbidge with all options on
-  </figcaption>
-</figure>
index 5c1db27f9102f442a4a4a9392a48185b2d09b4e2..a428e37b70d34b8ef29a1e89eae3bcb883136528 100644 (file)
@@ -9,7 +9,7 @@
 <p>
   The <dfn>Monitor section</dfn> is an optional feature that provides Control Room/Monitor Speaker outputs.
   It can be activated for the current session in the
-  <a href="@@monitoring-tab">
+  <a href="@@session-properties#monitoring">
   <kbd class="menu">Session &gt; Properties</kbd> window</a> by enabling the
   <kbd class="option">Use monitor section in this session</kbd> option in the
   <kbd class="menu">Monitoring</kbd> tab. By default the Monitor Section is fed with audio from the Master Bus,
diff --git a/include/monitoring-tab.html b/include/monitoring-tab.html
deleted file mode 100644 (file)
index 31951d1..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-<p>
-  Provides options affecting monitoring.
-</p>
-
-<figure class="center">
-  <img src="/images/a4_session_properties_monitoring.png" alt="session properties monitoring tab">
-  <figcaption>
-    The session properties 'monitoring' tab
-  </figcaption>
-</figure>
-
-<p>
-  The <strong>Track Input Monitoring automatically follows transport state</strong>
-  affects how input monitoring is handling. See
-  <a href="@@monitor-setup-in-ardour">Monitor Setup in Ardour</a>.
-</p>
-
-<p>
-  The 'Use monitor section' displays an extra section in the <strong>Mixer</strong>
-  window that is modelled on the similarly named section on large analog consoles.
-  More information can be found on the <a href="@@monitor-section">Monitor Section</a> page.
-</p>
index 339c76985d82b6ad294dabfe6aab1f8c58414fd1..4ad232f75b0981403e6acd9cd427f4d91e3c194f 100644 (file)
@@ -59,7 +59,7 @@
 <p>
   Templates can be huge time savers when working on similar projects, or on
   usual projects, as they allow to preset and tweak a lot of the <a
-  href="@@session-properties-dialog">session properties</a>, (like the
+  href="@@session-properties">session properties</a>, (like the
   availability of a <a href="@@monitor-section">monitoring section</a>,
   connection to a Master Bus, etc.), and handle the creation of <a
   href="@@adding-tracks-busses-and-vcas">tracks</a> of any kind.
index 7e1f13c24d4ab2c3b6cf55364e5f829af5addb60..83aa681c42310013d7c5ae8cc99adc7ee3306dcc 100644 (file)
@@ -1,3 +1,10 @@
+<figure class="right">
+  <img src="/images/preferences.png" alt="The Preferences window">
+  <figcaption>
+    The Preferences window
+  </figcaption>
+</figure>
+
 <p>
   Global <dfn>preferences</dfn> control general workflow and system
   configuration, and should apply to all sessions. They are located in <kbd
diff --git a/include/session-misc-tab.html b/include/session-misc-tab.html
deleted file mode 100644 (file)
index 6b0af80..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-
-<p>
-  This tab has several things that don't fit on the other tabs.
-</p>
-
-<figure>
-    <img src="/images/a4_session_properties_misc.png" alt="Session properties misc tab">
-    <figcaption>
-      Session properties misc tab
-    </figcaption>
-</figure>
-
-<ul>
-  <li>
-    <dfn>MIDI Options</dfn>
-    <ul>
-      <li>
-       If <dfn>MIDI region copies are independent</dfn> is selected, when a
-       MIDI region is copied or duplicated, the new region is not linked to
-       the region it was copied from.  If it is not selected, the copied regions
-       are linked and any editing of one of the linked regions changes all
-       of the linked regions.
-      </li>
-      <li>
-       The <dfn>Editor</dfn> can be configured to handle overlapping MIDI notes
-       several ways.
-       <ul>
-         <li>never allow them</li>
-         <li>don't do anything in particular</li>
-         <li>replace any overlapped existing notes</li>
-         <li>shorten the overlapped existing note</li>
-         <li>shorten the overlapped new note</li>
-         <li>replace both overlapping notes with a single note</li>
-       </ul>
-      </li>
-    </ul>
-  </li>
-  <li>
-    <dfn>Glue to bars and beats</dfn>
-    <ul>
-      <li>New markers can be glued to bars and beats</li>
-      <li>New regions can be glued to bars and beats</li>
-    </ul>
-  </li>
-  <li>
-    Settings from the session properties dialogs can be saved to the
-    default session template.
-  </li>
-</ul>
-
diff --git a/include/session-properties-dialog.html b/include/session-properties-dialog.html
deleted file mode 100644 (file)
index 59cd3ca..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<p>
-  <dfn>Session properties</dfn> control aspects of the workflow or
-  configuration that pertain to the current session only; these settings are
-  initially set from the template used to create the session. They can be found
-  in <kbd class="menu">Session &gt; Properties</kbd>, and are stored in the
-  session file.
-</p>
-
-<figure class="center">
-<img src="/images/a4_session_properties_timecode.png" alt="session properties dialog"/>
-<figcaption class="center">The Session Properties dialog.</figcaption>
-</figure>
-
diff --git a/include/session-properties.html b/include/session-properties.html
new file mode 100644 (file)
index 0000000..22a2883
--- /dev/null
@@ -0,0 +1,383 @@
+<figure class="right">
+  <img src="/images/session_properties.png" alt="The Session Properties window">
+  <figcaption>
+    The Session Properties window
+  </figcaption>
+</figure>
+
+<p>
+  <dfn>Session properties</dfn> control aspects of the workflow or
+  configuration that pertain to the current session only; these settings are
+  initially set from the template used to create the session. They can be found
+  in <kbd class="menu">Session &gt; Properties</kbd>, and are stored in the
+  session file.
+</p>
+
+<p>
+       Preferences are grouped by category:
+</p>
+
+<ul>
+       <li><a href="#timecode">Timecode</a></li>
+       <li><a href="#sync">Sync</a></li>
+       <li><a href="#fade">Fades</a></li>
+       <li><a href="#media">Media</a></li>
+       <li><a href="#locations">Locations</a></li>
+       <li><a href="#filenames">Filenames</a></li>
+       <li><a href="#monitoring">Monitoring</a></li>
+       <li><a href="#meterbridge">Meterbridge</a></li>
+       <li><a href="#misc">Misc</a></li>
+</ul>
+
+
+
+
+<h2 id="timecode">Timecode</h2>
+
+<ul>
+  <li>
+    <dfn>Timecode Settings</dfn>
+    <ul>
+                       <li>
+                               <dfn>Timecode frames-per-second:</dfn> defines how many frames of
+                               timecode are in one second. This can differ from the actual frame rate
+                               depending on the standard used.
+                       </li>
+                       <li>
+                               <dfn>Pull-up / pull-down:</dfn> sets the speed correction to match one
+                               actual second, e.g. a 4.1667 pull-up matches a 24fps cinema movie to a
+                               25 fps PAL TV broadcast format.
+                       </li>
+    </ul>
+       </li>
+       <li>
+               <dfn>Ext Timecode Offsets</dfn>
+               <ul>
+                       <li>
+                               <dfn>Slave Timecode offset:</dfn> when an external timecode source is used,
+                               adds or substracts the specified offset to the received timecode (MTC or LTC).
+                       </li>
+                       <li>
+                               <dfn>Timecode Generator offset:</dfn> adds the specified offset to
+                               the timecode generated by Ardour (so far only LTC) before sending it to
+                               the external synchronized system.
+                       </li>
+               </ul>
+  </li>
+  <li>
+               <dfn>JACK Transport/Time Settings</dfn>
+               <ul>
+                       <li>
+                               <dfn>Ardour is JACK Time Master (provides Bar|Beat|Tick and other information
+                               to JACK)</dfn> Aside from synchronizing any JACK slave, Ardour can also
+                               provide musical time information (Bar/Beat/Tick) for the current absolute
+                               position for all the JACK-aware clients (N.B. the first jack client that
+                               asks for this wins).
+                       </li>
+               </ul>
+  </li>
+</ul>
+
+<h2 id="sync">Sync</h2>
+
+<ul>
+       <li>
+               <dfn>A/V Synchronization</dfn>
+               <ul>
+                       <li>
+                               <dfn>Use Video File's FPS Instead of Timecode Value for Timeline and Video
+                               Monitor</dfn> when checked, uses the timecode FPS value of the standard
+                               used by the video file instead of forcing the FPS set in the <a href="#timecode">
+                               Timecode tab</a>.
+                       </li>
+                       <li>
+                               <dfn>Apply Pull-Up/Down to Video Timeline and Video Monitor (Unless using
+                               JACK-sync)</dfn> allows to apply the pull-up/down as set in the <a href="#timecode">
+                               Timecode tab</a> to the <a href="@@video-timeline-and-monitoring">video
+                               timeline</a> as displayed in the editor and to the Video Monitor, resulting
+                               in a shorter/longer video in the editor and a speed-up/down in the Video
+                               Monitor.
+                       </li>
+               </ul>
+       </li>
+</ul>
+
+<h2 id="fade">Fades</h2>
+
+<ul>
+       <li>
+               <dfn>Audio Fades</dfn>
+               <ul>
+                       <li>
+                               <dfn>Destructive crossfade length:</dfn> sets the duration of the crossfade
+                               Ardour automatically creates when an operation on a region is destructive,
+                               such as when recording in a track in tape mode.<br>
+                               This does not change the length of the crossfade Ardour automatically creates
+                               at regions boundaries on non-destructive operations (recording, slicing etc...)
+                               which is set to 1&nbsp;ms.
+                       </li>
+                       <li>
+                               <dfn>Declick when transport starts and stops</dfn> creates an artificial
+                               fade in/out when starting or stopping playback, to avoid the 'click' sound
+                               resulting in starting it at a non zero value.
+                       </li>
+                       <li>
+                               <dfn>Declick when monitor state changes</dfn> also creates an artificial
+                               fade in/out to avoid clicks when a parameter in the monitor changes.
+                       </li>
+                       <li>
+                               <dfn>Region fades active</dfn> when checked, Ardour applies the region
+                               <a href="@@create-region-fades-and-crossfades">crossfades</a> to each
+                               region's start and end. When unchecked, no fades are applied, and clicks
+                               may be heard at regions boundaries.
+                       </li>
+                       <li>
+                               <dfn>Region fades visible</dfn> when checked, the region fades are visible
+                               in the the Editor. Unchecking may increase readability for sessions made
+                               of a lot of tiny regions.
+                       </li>
+               </ul>
+       </li>
+</ul>
+
+<h2 id="media">Media</h2>
+
+<p>
+       Change how sound is stored on disk. These options do not change how sound is handled
+  internally.
+</p>
+
+<ul>
+       <li>
+               <dfn>Audio File Format</dfn>
+               <ul>
+                       <li>
+                               <dfn>Sample format:</dfn> defaults to 32-bit floating point, the same as
+                               the internal representation. 24 and 16-bit integer representation are
+                               also available, for more lightweight sessions at the cost of a reduced
+                               audio definition.
+                       </li>
+                       <li>
+                               <dfn>File type:</dfn> defines what format is used to store the audio
+                               files. The default is WAVE, and can be changed to Broadcast Wave to
+                               store metadata and timecodes, <abbr title="Core Audio
+                               Format">CAF</abbr> to overcome WAVE's limitation to 4Gb in size, RF64
+                               to add more channels, etc. The chosen format is usually very
+                               workflow-specific.
+                       </li>
+               </ul>
+       </li>
+</ul>
+
+<h2 id="locations">Locations</h2>
+
+<p>
+       These options add file locations that will be searched to find the audio and
+  midi files used by the session. This is useful when the files have been
+  imported into the session but not copied into the session.
+</p>
+
+<ul>
+       <li>
+               <dfn>File Locations</dfn>
+               <ul>
+                       <li>
+                               <dfn>Search for audio files in:</dfn> allows to add a location to look
+                               for audio files. Adding a location is done by navigating to the
+                               directory where the files are stored, selecting it and clicking <kbd
+                               class="menu">Open</kbd>. The directory will show up in the dialog. The
+                               <kbd class="menu">Remove</kbd> button next to the added directory can
+                               be used to remove it from the search path. Multiple paths can be added
+                               this way.
+                       </li>
+                       <li>
+                               <dfn>Search for MIDI files in:</dfn> is exactly the same, but for MIDI files.
+                       </li>
+               </ul>
+       </li>
+</ul>
+
+<h2 id="filenames">Filenames</h2>
+
+<p>
+        This tab is used to change how Ardour names recorded regions.
+</p>
+
+<ul>
+       <li>
+               <dfn>File Naming</dfn>
+               <ul>
+                       <li>
+                               <dfn>Prefix Track number</dfn> when checked, a unique number will
+                               appear on each track in the Editor window and will prefix the region
+                               name. If the track number is <samp>2</samp> and the region would have
+                               been named <samp>Gtr-1.1</samp>, with track number prefix turned on the
+                               region will be named <samp>2_Gtr-1.1</samp> instead. See <a
+                               href="@@region-naming">Region Naming</a>.
+                       </li>
+                       <li>
+                               <dfn>Prefix Take Name</dfn> when enabled, the first time a track is
+                               recorded it will have the specified take name. When recording is
+                               stopped, any trailing number on the end of the take name will be
+                               incremented by 1. If the specified track name doesn't have a number on
+                               the end, the number <samp>1</samp> will be suffixed.
+                       </li>
+                       <li>
+                               <dfn>Take name</dfn> specifies what name is prefixed if <kbd
+                               class="option">Prefix Take Name</kbd> is checked.
+                       </li>
+               </ul>
+       </li>
+</ul>
+
+
+<h2 id="monitoring">Monitoring</h2>
+
+<p>
+        Provides options affecting monitoring.
+</p>
+
+<ul>
+       <li>
+               <dfn>Monitoring</dfn>
+               <ul>
+                       <li>
+                               <dfn>Track Input Monitoring automatically follows transport state
+                               ("auto-input")</dfn> affects how input monitoring is handling. See <a
+                               href="@@monitor-setup-in-ardour">Monitor Setup in Ardour</a>
+                       </li>
+                       <li>
+                               <dfn>Use monitor section in this session</dfn> when enabled, displays
+                               an extra section in the Mixer window that is modelled on the similarly
+                               named section on large analog consoles. More information can be found
+                               on the <a href="@@monitor-section">Monitor Section</a> page.
+                       </li>
+               </ul>
+       </li>
+</ul>
+
+
+<h2 id="meterbridge">Meterbridge</h2>
+
+<p>
+       This tab changes what controls are displayed in the Meterbridge that is
+       available in the <kbd class="menu">Window &gt; Meterbridge</kbd> menu.
+</p>
+
+<ul>
+       <li>
+               <dfn>Route Display</dfn>
+               <ul>
+                       <li>
+                               <dfn>Show Midi Tracks</dfn> displays/hides MIDI tracks (even when no
+                               synth, hence no audio output exists)
+                       </li>
+                       <li>
+                               <dfn>Show Busses</dfn> displays/hides <a
+                               href="@@track-types">Busses</a> tracks
+                       </li>
+                       <li>
+                               <dfn>Include Master Bus</dfn> displays/hides the <a
+                               href="@@master-bus-strip">Master Bus</a>
+                       </li>
+               </ul>
+       </li>
+       <li>
+               <dfn>Button Area</dfn>
+               <ul>
+                       <li>
+                               <dfn>Rec-enable Button</dfn> displays/hides the record arm button (for audio
+                               and MIDI tracks only)
+                       </li>
+                       <li>
+                               <dfn>Mute Button</dfn> displays/hides the mute button (for all
+                               tracks/busses types)
+                       </li>
+                       <li>
+                               <dfn>Solo Button</dfn> same for solo
+                       </li>
+                       <li>
+                               <dfn>Monitor Buttons</dfn> displays/hides the two (input and playback)<a
+                               href="@@monitoring">monitoring</a> buttons, selecting what is played at
+                               record and playback time.
+                       </li>
+               </ul>
+       </li>
+       <li>
+               <dfn>Name Labels</dfn>
+               <ul>
+                       <li>
+                               <dfn>Track Name</dfn> adds the tracks' names bellow the buttons.
+                       </li>
+               </ul>
+       </li>
+</ul>
+
+<h2 id="misc">Misc</h2>
+
+<p>
+       This tab has several things that don't fit on the other tabs.
+</p>
+
+<ul>
+       <li>
+               <dfn>MIDI Options</dfn>
+               <ul>
+                       <li>
+                               <dfn>MIDI region copies are independent</dfn> if selected, when a MIDI
+                               region is copied or duplicated, the new region is not linked to the
+                               region it was copied from. If it is not selected, the copied regions
+                               are linked and any editing done on one of the linked regions changes
+                               all of the linked regions.
+                       </li>
+                       <li>
+                               <dfn>Policy for handling overlapping notes on the same MIDI channel:</dfn>
+                               Selects how Ardour reacts to possibly conflicting MIDI notes:
+                                       <ul>
+                                               <li>never allow them</li>
+                                               <li>don't do anything in particular</li>
+                                               <li>replace any overlapped existing     notes</li>
+                                               <li>shorten the overlapped existing note</li>
+                                               <li>shorten     the overlapping new note</li>
+                                               <li>replace both overlapping notes with a       single note</li>
+                                       </ul>
+                       </li>
+               </ul>
+       </li>
+       <li>
+               <dfn>Glue to Bars and Beats</dfn>
+               <ul>
+                       <li>
+                               <dfn>Glue new markers to bars and beats</dfn> if checked, a newly
+                               created marker will always be placed at the nearest musical time
+                               instead of right where the mouse pointer is.
+                       </li>
+                       <li>
+                               <dfn>Glue new regions to bars and beats</dfn> same as above, for regions.
+                       </li>
+               </ul>
+       </li>
+       <li>
+               <dfn>Metronome</dfn>
+               <ul>
+                       <li>
+                               <dfn>Always count-in when recording</dfn> when checked, waits for two
+                               bars before the actual recording begins. The Metronome will tick (even if
+                               disabled) during the count-in. Same as recording with <kbd
+                               class="menu">Transport &gt; Record w/Count-In</kbd>.
+                       </li>
+               </ul>
+       </li>
+       <li>
+               <dfn>Defaults</dfn>
+               <ul>
+                       <li>
+                               <dfn>Use these settings as defaults</dfn> clicking this buttons makes all
+                               the present Session Properties default, by recording them in the
+                               default session template.
+                       </li>
+               </ul>
+       </li>
+
+</ul>
+
diff --git a/include/sync-tab.html b/include/sync-tab.html
deleted file mode 100644 (file)
index 686fa80..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<figure>
-  <img src="/images/a4_session_properties_sync.png" alt="Session properties sync tab">
-  <figcaption>
-    Session properties sync tab
-  </figcaption>
-</figure>
-
-<p>
-  This tab is used to modify the timecode settings when working with video to
-  use the imported video's timecode settings instead of the session defaults.
-</p>
-
index ff14482efd41351c4af9d1a23a6632cac3b5bfaf..d6441a9f8eaa6d03dbb187169167c9a7d4825a5b 100644 (file)
@@ -39,7 +39,7 @@
                <tr><th class="sub1">Clean-up Unused Sources&hellip;</th><td>Quarantines all the media files not used in the session to a specific sub-folder of the session</td></tr>
                <tr><th class="sub1">Flush Wastebasket</th><td>Deletes those quarantined files</td></tr>
 
-       <tr><th>[] Properties</th><td>Shows the <a href="@@session-properties-dialog">Session Properties</a> dialog, allowing to fine-tune the parameters of the current session</td></tr>
+       <tr><th>[] Properties</th><td>Shows the <a href="@@session-properties">Session Properties</a> dialog, allowing to fine-tune the parameters of the current session</td></tr>
 
        <tr><th>Lock</th><td>Locks the session by showing an Unlock window that (until clicked) blocks every action on Ardour's window</td></tr>
 
index 2168cc61556d69b03bd3a2706dcfc16891140fbd..df178d4e412f9f9d0c845cca1ad6049f06779c24 100644 (file)
@@ -72,7 +72,7 @@
        <tr><th>[] Show Editor Mixer</th><td>When checked, the selected tracks' mixer strip is displayed on the left of the editor window, allowing for a quick access to e.g. effects and routing</td></tr>
        <tr><th>[] Show Editor List</th><td>In the Editor window, shows the <a href="@@editor-lists">Editor List</a>, giving access to a number of handy lists (regions, tracks, &hellip;)</td></tr>
        <tr><th>[] Toggle Mixer List</th><td>In the Mixer view, shows the Mixer list, giving access to some handy lists (<a href="@@favorite-plugins-window">Favorite plugins</a>, <a href="@@strips-list">The Strip list</a>,&hellip;)</td></tr>
-       <tr><th>[] Toggle Monitor Section Visibility</th><td>If the <kbd class="option">Use monitoring section on this session</kbd> has been checked in the <a href="@@monitoring-tab">Session Properties window</a>, shows or hides the Monitor Section in the Mixer</td></tr>
+       <tr><th>[] Toggle Monitor Section Visibility</th><td>If the <kbd class="option">Use monitoring section on this session</kbd> has been checked in the <a href="@@session-properties#monitoring">Session Properties window</a>, shows or hides the Monitor Section in the Mixer</td></tr>
        <tr><th>[] Show Measure Lines</th><td>If checked, in the Editor, shows a vertical white line at each measure start</td></tr>
        <tr><th>[] Show Summary</th><td>If checked, in the Editor, shows the <a href="@@summary">Summary</a>, allowing a faster navigation in the session</td></tr>
        <tr><th>[] Show Group Tabs</th><td>If checked, makes the groups visible as tabs on the left in the Editor, and on the top in the mixer</td></tr>
diff --git a/include/timecode-tab.html b/include/timecode-tab.html
deleted file mode 100644 (file)
index 133d063..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<figure>
-  <img src="/images/a4_session_properties_timecode.png" alt="Session properties timecode tab">
-  <figcaption>
-    Session properties timecode tab
-  </figcaption>
-</figure>
-
-<p>
-  This tab is used to change how Ardour interprets and manipulates timecode.
-</p>
-
-<ul>
-  <li>
-    Timecode Settings lets you set the number of frames per second
-    and pull up/down to match the timecode used other synchronized systems.
-  </li>
-  <li>
-    External Timecode Offsets allows Ardour to a fixed offset from other
-    synchronized systems. <dfn>Slave Timecode offset</dfn> adds the
-    specified offset to the received timecode (MTC or LTC).
-    <dfn>Timecode Generator offset</dfn> adds the specified offset to
-    the timecode generated by Ardour (so far only LTC).
-  </li>
-  <li>
-    Jack Transport / Time Settings determines whether Ardour controls
-    Bar|Beat|Tick and other information for Jack.
-  </li>
-
-</ul>
-
index facd0f0551b54f7e063972e94bbf5157b6712836..49a695c1537ba99e3895911627b4b4db4132ebf3 100644 (file)
@@ -70,7 +70,7 @@
        <kbd class="menu">Window > Video Monitor</kbd> menu which is binded to
        <kbd class="mod2">V</kbd> by default.</li>
        <li><kbd class="option">Adjust Session Framerate to Match Video Framerate</kbd>
-       which can also be set later with the <a href="@@session-properties-dialog">Session Properties</a>.
+       which can also be set later with the <a href="@@session-properties">Session Properties</a>.
        Having the session and video framerate at the same value allows their sync not to
        drift off.</li>
 </ul>
index 9c864d0ad82fedba37c665ece827671e282f1596..b4b66aae99ff1819574fe0182680fa15962197a6 100644 (file)
@@ -287,93 +287,12 @@ part: chapter
 ---
 title: Session Properties
 menu_title: Session Properties
-include: session-properties-dialog.html
-link: session-properties-dialog
+include: session-properties.html
+link: session-properties
 uri: preferences-and-session-properties/session-properties-dialog
 part: chapter
 ---
 
----
-title: Timecode Tab
-menu_title: Timecode Tab
-include: timecode-tab.html
-link: timecode-tab
-uri: preferences-and-session-properties/session-properties-dialog/timecode
-part: subchapter
----
-
----
-title: Sync Tab
-menu_title: Sync Tab
-include: sync-tab.html
-link: sync-tab
-uri: preferences-and-session-properties/session-properties-dialog/sync
-part: subchapter
----
-
----
-title: Fades Tab
-menu_title: Fades Tab
-include: fades-tab.html
-link: fades-tab
-uri: preferences-and-session-properties/session-properties-dialog/fades
-part: subchapter
----
-
----
-title: Media Tab
-menu_title: Media Tab
-include: media-tab.html
-link: media-tab
-uri: preferences-and-session-properties/session-properties-dialog/media
-part: subchapter
----
-
----
-title: Locations Tab
-menu_title: Locations Tab
-include: locations-tab.html
-link: locations-tab
-uri: preferences-and-session-properties/session-properties-dialog/locations
-part: subchapter
----
-
----
-title: Filenames Tab
-menu_title: Filenames Tab
-include: filenames-tab.html
-link: filenames-tab
-uri: preferences-and-session-properties/session-properties-dialog/filenames
-part: subchapter
----
-
----
-title: Monitoring Tab
-menu_title: Monitoring Tab
-include: monitoring-tab.html
-link: monitoring-tab
-uri: preferences-and-session-properties/session-properties-dialog/monitoring
-part: subchapter
----
-
----
-title: Meterbridge Tab
-menu_title: Meterbridge Tab
-include: meterbridge-tab.html
-link: meterbridge-tab
-uri: preferences-and-session-properties/session-properties-dialog/meterbridge
-part: subchapter
----
-
----
-title: Session Misc Tab
-menu_title: Misc Tab
-include: session-misc-tab.html
-link: session-misc-tab
-uri: preferences-and-session-properties/session-properties-dialog/misc
-part: subchapter
----
-
 ---
 title: Configuring MIDI
 include: configuring-midi.html
diff --git a/source/images/a4_meterbridge_full.png b/source/images/a4_meterbridge_full.png
deleted file mode 100644 (file)
index 5d52c51..0000000
Binary files a/source/images/a4_meterbridge_full.png and /dev/null differ
diff --git a/source/images/a4_session_properties_fades.png b/source/images/a4_session_properties_fades.png
deleted file mode 100644 (file)
index 2a32ff7..0000000
Binary files a/source/images/a4_session_properties_fades.png and /dev/null differ
diff --git a/source/images/a4_session_properties_filenames.png b/source/images/a4_session_properties_filenames.png
deleted file mode 100644 (file)
index fc4a851..0000000
Binary files a/source/images/a4_session_properties_filenames.png and /dev/null differ
diff --git a/source/images/a4_session_properties_locations.png b/source/images/a4_session_properties_locations.png
deleted file mode 100644 (file)
index d56432e..0000000
Binary files a/source/images/a4_session_properties_locations.png and /dev/null differ
diff --git a/source/images/a4_session_properties_media.png b/source/images/a4_session_properties_media.png
deleted file mode 100644 (file)
index fed50df..0000000
Binary files a/source/images/a4_session_properties_media.png and /dev/null differ
diff --git a/source/images/a4_session_properties_meterbridge.png b/source/images/a4_session_properties_meterbridge.png
deleted file mode 100644 (file)
index ed207ed..0000000
Binary files a/source/images/a4_session_properties_meterbridge.png and /dev/null differ
diff --git a/source/images/a4_session_properties_misc.png b/source/images/a4_session_properties_misc.png
deleted file mode 100644 (file)
index 40b6dc1..0000000
Binary files a/source/images/a4_session_properties_misc.png and /dev/null differ
diff --git a/source/images/a4_session_properties_monitoring.png b/source/images/a4_session_properties_monitoring.png
deleted file mode 100644 (file)
index 1dce5a3..0000000
Binary files a/source/images/a4_session_properties_monitoring.png and /dev/null differ
diff --git a/source/images/a4_session_properties_sync.png b/source/images/a4_session_properties_sync.png
deleted file mode 100644 (file)
index 4359894..0000000
Binary files a/source/images/a4_session_properties_sync.png and /dev/null differ
diff --git a/source/images/a4_session_properties_timecode.png b/source/images/a4_session_properties_timecode.png
deleted file mode 100644 (file)
index 339df14..0000000
Binary files a/source/images/a4_session_properties_timecode.png and /dev/null differ
diff --git a/source/images/preferences.png b/source/images/preferences.png
new file mode 100644 (file)
index 0000000..ef253cf
Binary files /dev/null and b/source/images/preferences.png differ
diff --git a/source/images/session_properties.png b/source/images/session_properties.png
new file mode 100644 (file)
index 0000000..0f4fa41
Binary files /dev/null and b/source/images/session_properties.png differ