diff --git a/include/fades-tab.html b/include/fades-tab.html deleted file mode 100644 index cc8ba3f6..00000000 --- a/include/fades-tab.html +++ /dev/null @@ -1,29 +0,0 @@ - -
- Session properties fades tab -
- Session properties fades tab -
-
- -

- Change how Ardour works with region crossfades. -

- - - diff --git a/include/filenames-tab.html b/include/filenames-tab.html deleted file mode 100644 index cb728dea..00000000 --- a/include/filenames-tab.html +++ /dev/null @@ -1,29 +0,0 @@ - -
- Session properties filenames tab -
- Session properties filenames tab -
-
- -

- This tab is used to change how Ardour names recorded regions. - If Prefix track number is selected a unique number will appear on each track - in the Editor 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. -

- -

- If Prefix take name is selected and the Take name 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. -

- -

- When Prefix take name 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. -

- diff --git a/include/locations-tab.html b/include/locations-tab.html deleted file mode 100644 index c3247625..00000000 --- a/include/locations-tab.html +++ /dev/null @@ -1,21 +0,0 @@ - -
- Session properties locations tab -
- Session properties locations tab -
-
- -

- 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. -

- -

- 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. -

- diff --git a/include/master-bus-strip.html b/include/master-bus-strip.html index 5f0e5f26..6de10910 100644 --- a/include/master-bus-strip.html +++ b/include/master-bus-strip.html @@ -13,7 +13,7 @@ diff --git a/include/media-tab.html b/include/media-tab.html deleted file mode 100644 index 880f4ec0..00000000 --- a/include/media-tab.html +++ /dev/null @@ -1,24 +0,0 @@ - -
- Session properties media tab -
- Session properties media tab -
-
- -

- Change how sound is stored on disk. These options do not change how sound is handled - internally. -

- - - diff --git a/include/meterbridge-tab.html b/include/meterbridge-tab.html deleted file mode 100644 index 4348ca8b..00000000 --- a/include/meterbridge-tab.html +++ /dev/null @@ -1,31 +0,0 @@ - -

- The meters from audio tracks always display in the Meterbridge. - This tab changes what additional controls are also displayed. -

- -
- Session properties meterbridge tab -
- Session properties meterbridge tab -
-
- - - -
- Meterbidge with all options on -
- Meterbidge with all options on -
-
diff --git a/include/monitor-section.html b/include/monitor-section.html index 5c1db27f..a428e37b 100644 --- a/include/monitor-section.html +++ b/include/monitor-section.html @@ -9,7 +9,7 @@

The Monitor section is an optional feature that provides Control Room/Monitor Speaker outputs. It can be activated for the current session in the - + Session > Properties window by enabling the Use monitor section in this session option in the Monitoring 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 index 31951d14..00000000 --- a/include/monitoring-tab.html +++ /dev/null @@ -1,23 +0,0 @@ - -

- Provides options affecting monitoring. -

- -
- session properties monitoring tab -
- The session properties 'monitoring' tab -
-
- -

- The Track Input Monitoring automatically follows transport state - affects how input monitoring is handling. See - Monitor Setup in Ardour. -

- -

- The 'Use monitor section' 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 Monitor Section page. -

diff --git a/include/newopen-session-dialog.html b/include/newopen-session-dialog.html index 339c7698..4ad232f7 100644 --- a/include/newopen-session-dialog.html +++ b/include/newopen-session-dialog.html @@ -59,7 +59,7 @@

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 session properties, (like the + href="@@session-properties">session properties, (like the availability of a monitoring section, connection to a Master Bus, etc.), and handle the creation of tracks of any kind. diff --git a/include/preferences.html b/include/preferences.html index 7e1f13c2..83aa681c 100644 --- a/include/preferences.html +++ b/include/preferences.html @@ -1,3 +1,10 @@ +

+ The Preferences window +
+ The Preferences window +
+
+

Global preferences control general workflow and system configuration, and should apply to all sessions. They are located in - This tab has several things that don't fit on the other tabs. -

- -
- Session properties misc tab -
- Session properties misc tab -
-
- - - diff --git a/include/session-properties-dialog.html b/include/session-properties-dialog.html deleted file mode 100644 index 59cd3ca3..00000000 --- a/include/session-properties-dialog.html +++ /dev/null @@ -1,14 +0,0 @@ - -

- Session properties 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 Session > Properties, and are stored in the - session file. -

- -
-session properties dialog -
The Session Properties dialog.
-
- diff --git a/include/session-properties.html b/include/session-properties.html new file mode 100644 index 00000000..22a28836 --- /dev/null +++ b/include/session-properties.html @@ -0,0 +1,383 @@ +
+ The Session Properties window +
+ The Session Properties window +
+
+ +

+ Session properties 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 Session > Properties, and are stored in the + session file. +

+ +

+ Preferences are grouped by category: +

+ + + + + + +

Timecode

+ + + +

Sync

+ + + +

Fades

+ + + +

Media

+ +

+ Change how sound is stored on disk. These options do not change how sound is handled + internally. +

+ + + +

Locations

+ +

+ 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. +

+ + + +

Filenames

+ +

+ This tab is used to change how Ardour names recorded regions. +

+ + + + +

Monitoring

+ +

+ Provides options affecting monitoring. +

+ + + + +

Meterbridge

+ +

+ This tab changes what controls are displayed in the Meterbridge that is + available in the Window > Meterbridge menu. +

+ + + +

Misc

+ +

+ This tab has several things that don't fit on the other tabs. +

+ + + diff --git a/include/sync-tab.html b/include/sync-tab.html deleted file mode 100644 index 686fa801..00000000 --- a/include/sync-tab.html +++ /dev/null @@ -1,13 +0,0 @@ - -
- Session properties sync tab -
- Session properties sync tab -
-
- -

- 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. -

- diff --git a/include/the-session-menu.html b/include/the-session-menu.html index ff14482e..d6441a9f 100644 --- a/include/the-session-menu.html +++ b/include/the-session-menu.html @@ -39,7 +39,7 @@ Clean-up Unused Sources…Quarantines all the media files not used in the session to a specific sub-folder of the session Flush WastebasketDeletes those quarantined files - [] PropertiesShows the Session Properties dialog, allowing to fine-tune the parameters of the current session + [] PropertiesShows the Session Properties dialog, allowing to fine-tune the parameters of the current session LockLocks the session by showing an Unlock window that (until clicked) blocks every action on Ardour's window diff --git a/include/the-view-menu.html b/include/the-view-menu.html index 2168cc61..df178d4e 100644 --- a/include/the-view-menu.html +++ b/include/the-view-menu.html @@ -72,7 +72,7 @@ [] Show Editor MixerWhen 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 [] Show Editor ListIn the Editor window, shows the Editor List, giving access to a number of handy lists (regions, tracks, …) [] Toggle Mixer ListIn the Mixer view, shows the Mixer list, giving access to some handy lists (Favorite plugins, The Strip list,…) - [] Toggle Monitor Section VisibilityIf the Use monitoring section on this session has been checked in the Session Properties window, shows or hides the Monitor Section in the Mixer + [] Toggle Monitor Section VisibilityIf the Use monitoring section on this session has been checked in the Session Properties window, shows or hides the Monitor Section in the Mixer [] Show Measure LinesIf checked, in the Editor, shows a vertical white line at each measure start [] Show SummaryIf checked, in the Editor, shows the Summary, allowing a faster navigation in the session [] Show Group TabsIf checked, makes the groups visible as tabs on the left in the Editor, and on the top in the mixer diff --git a/include/timecode-tab.html b/include/timecode-tab.html deleted file mode 100644 index 133d0632..00000000 --- a/include/timecode-tab.html +++ /dev/null @@ -1,31 +0,0 @@ - -
- Session properties timecode tab -
- Session properties timecode tab -
-
- -

- This tab is used to change how Ardour interprets and manipulates timecode. -

- - - diff --git a/include/workflow-amp-operations.html b/include/workflow-amp-operations.html index facd0f05..49a695c1 100644 --- a/include/workflow-amp-operations.html +++ b/include/workflow-amp-operations.html @@ -70,7 +70,7 @@ Window > Video Monitor menu which is binded to V by default.
  • Adjust Session Framerate to Match Video Framerate - which can also be set later with the Session Properties. + which can also be set later with the Session Properties. Having the session and video framerate at the same value allows their sync not to drift off.
  • diff --git a/master-doc.txt b/master-doc.txt index 9c864d0a..b4b66aae 100644 --- a/master-doc.txt +++ b/master-doc.txt @@ -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 index 5d52c51d..00000000 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 index 2a32ff79..00000000 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 index fc4a8514..00000000 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 index d56432ed..00000000 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 index fed50dff..00000000 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 index ed207ed2..00000000 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 index 40b6dc16..00000000 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 index 1dce5a3a..00000000 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 index 4359894a..00000000 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 index 339df14b..00000000 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 index 00000000..ef253cf2 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 index 00000000..0f4fa41a Binary files /dev/null and b/source/images/session_properties.png differ