ardour/manual
13
0
Fork 0
Code Pull Requests Releases Activity

patch from thomas vecchione that may have already been applied

Browse Source
This commit is contained in:
Paul Davis 2013-09-02 16:00:52 -04:00
parent cbf81a31d2
commit bb1d01a8e2
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
View File

@ -32,13 +32,6 @@ title: Audio Setup
<dt>Interface</dt>
<dd>
<<<<<<< HEAD:_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
The selector should show all the supported interfaces that the are duplex capable (i.e. support input and output to and from Ardour). <strong>Important</strong> if you are using an Intel Mac running
OS X and the built-in audio interface, you must
first <a href="/setting-up-your-system/using_more_than_one_audio_device">merge
its separate input and output devices into a single "aggregate
device"</a> before Ardour will be able to use it.
=======
<dd>The selector should show all availiable interfaces that driver
provides that are duplex capable for Ardour to
use. <strong>Important</strong> if you are using an Intel Mac
@ -47,7 +40,7 @@ title: Audio Setup
ing_more_than_one_audio_device/">merge its separate input and
output devices into a single "aggregate device"</a> before
Ardour will be able to use it.<br>
>>>>>>> minor patch for manual section on using multiple devices (from Thomas Vecchione):_manual/07_working-with-sessions/06_the-new-session-dialog/01_audio-setup.html
</dd>
</dd>
<dt>Sample Rate</dt>