diff --git a/include/audio-midi-setup.html b/include/audio-midi-setup.html new file mode 100644 index 00000000..2ce417b8 --- /dev/null +++ b/include/audio-midi-setup.html @@ -0,0 +1,70 @@ +

Audio/MIDI Setup

+ +
+ The Audio/MIDI Setup Dialog +
+ The Audio/MIDI Setup Dialog +
+
+ +

+ This window exposes the different audio options to be used by Ardour for the + current work session, for hardware and software and is made of: +

+ + + + + + + + + + + + + + + + + + + + +
Audio SystemDepending on the operating system, Ardour can possibly use different audio + systems, e.g. on Linux, both + ALSA and JACK are + available. +
Driver + On Mac OS X this will typically be CoreAudio. On Linux usually + this will be either FFADO + or ALSA, depending on whether or not a firewire device + is used. Advanced users on all platforms may also + use NetJack which provides network audio I/O. +
DeviceThe selector should show all available interfaces provided by the + driver above and which are capable of duplex operation. +

+ When using an Intel Mac running OS X and the builtin audio + interface, its separate input and output devices must be + merged first into a single "aggregate device" before Ardour will be able + to use it. +

+
Sample Rate + The selector will allow to select from any sample rate supported by the device + selected above it. +
Buffer Size + The size of the buffer used by the audio interface can be adjusted + to allow for either lower latency, or lower CPU usage and higher + latency. +
Input/Output Channels + Specifies the number of hardware channels to use. The + default is all available channels.
Hardware Input/Output LatencySpecify the hardware delay in samples for precise latency compensation.
Calibrate + This button runs a semi-automated guided process to obtain + precise hardware latency measurements for the above option.
MIDI System + Selects the MIDI driver to use. On Mac OS X, this will be CoreMIDI. On Linux, this will follow the audio backend. + If the Audio backend is ALSA, midi will be alsa also. If the backend is + JACK, it can be changed between two legacy + ALSA drivers or the (preferred) new JACK+ALSA implementation.
diff --git a/include/newopen-session-dialog.html b/include/newopen-session-dialog.html index f8678e87..59ebf794 100644 --- a/include/newopen-session-dialog.html +++ b/include/newopen-session-dialog.html @@ -93,77 +93,8 @@

Whether or not a template is used, and before the "Template Setup" dialog, the - Audio/MIDI Setup will be shown. + Audio/MIDI Setup will be shown.

-

Audio/MIDI Setup

-
- The Audio/MIDI Setup Dialog -
- The Audio/MIDI Setup Dialog -
-
- -

- This window exposes the different audio options to be used by Ardour for the - current work session, for hardware and software and is made of: -

- - - - - - - - - - - - - - - - - - - - -
Audio SystemDepending on the operating system, Ardour can possibly use different audio - systems, e.g. on Linux, both - ALSA and JACK are - available. -
Driver - On Mac OS X this will typically be CoreAudio. On Linux usually - this will be either FFADO - or ALSA, depending on whether or not a firewire device - is used. Advanced users on all platforms may also - use NetJack which provides network audio I/O. -
DeviceThe selector should show all available interfaces provided by the - driver above and which are capable of duplex operation. -

- When using an Intel Mac running OS X and the builtin audio - interface, its separate input and output devices must be - merged first into a single "aggregate device" before Ardour will be able - to use it. -

-
Sample Rate - The selector will allow to select from any sample rate supported by the device - selected above it. -
Buffer Size - The size of the buffer used by the audio interface can be adjusted - to allow for either lower latency, or lower CPU usage and higher - latency. -
Input/Output Channels - Specifies the number of hardware channels to use. The - default is all available channels.
Hardware Input/Output LatencySpecify the hardware delay in samples for precise latency compensation.
Calibrate - This button runs a semi-automated guided process to obtain - precise hardware latency measurements for the above option.
MIDI System - Selects the MIDI driver to use. On Mac OS X, this will be CoreMIDI. On Linux, this will follow the audio backend. - If the Audio backend is ALSA, midi will be alsa also. If the backend is - JACK, it can be changed between two legacy - ALSA drivers or the (preferred) new JACK+ALSA implementation.
diff --git a/include/preferences.html b/include/preferences.html index b703214c..bb5f0d5c 100644 --- a/include/preferences.html +++ b/include/preferences.html @@ -1,9 +1,3 @@ -
- The Preferences window -
- The Preferences window -
-

Global preferences control general workflow and system @@ -12,92 +6,151 @@ configuration file in the user's home directory.

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

Preferences are conveniently grouped by category:

-

General

+

General

- + +

Recorder

+ +

Editor

+ + + +

Mixer

+ + + +

Toolbar

+ + + +

Size and Scale

+ + + +

Colors

+ + + +

Quirks

+ + + +

Translation

-

Translation

- - + +

Editor

+ -
  • - Post Export Analysis + Region Analysis
  • -

    Transport

    +

    Performance

    - -
  • Video Monitor
  • + diff --git a/include/status-bar.html b/include/status-bar.html index ae902bc5..6e86c606 100644 --- a/include/status-bar.html +++ b/include/status-bar.html @@ -52,7 +52,7 @@ Audio: - opens the Audio MIDI Setup + opens the Audio MIDI Setup window. diff --git a/include/the-window-menu.html b/include/the-window-menu.html index 6c8e4c77..5515107f 100644 --- a/include/the-window-menu.html +++ b/include/the-window-menu.html @@ -4,7 +4,7 @@

    - + diff --git a/master-doc.txt b/master-doc.txt index d3cabb45..e860aa6d 100644 --- a/master-doc.txt +++ b/master-doc.txt @@ -713,6 +713,13 @@ uri: working-with-sessions/the-new-session-dialog part: subchapter --- +--- +title: Audio/MIDI Setup +include: audio-midi-setup.html +link: audio-midi-setup +part: subchapter +--- + --- title: Renaming a Session include: renaming-a-session.html diff --git a/source/images/preferences.png b/source/images/preferences.png index ef253cf2..348e3d4e 100644 Binary files a/source/images/preferences.png and b/source/images/preferences.png differ
    □ Audio/MIDI SetupShows the Audio/MIDI Setup window, where the sound system configuration can be modified
    □ Audio/MIDI SetupShows the Audio/MIDI Setup window, where the sound system configuration can be modified
    Editor
    Show EditorSwitches to the Editor view