From 6c1e51804434318cd55b63ec25c71bc371c47747 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Thu, 9 Feb 2017 18:23:36 +0000 Subject: [PATCH] Updated sound option documentation. --- bochs/.bochsrc | 4 ++-- bochs/CHANGES | 1 + bochs/doc/docbook/user/user.dbk | 4 ++-- bochs/doc/man/bochsrc.5 | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bochs/.bochsrc b/bochs/.bochsrc index f35939ccd..e5104f41b 100644 --- a/bochs/.bochsrc +++ b/bochs/.bochsrc @@ -889,9 +889,9 @@ parport1: enabled=1, file="parport.out" # waveindrv: # This defines the driver to be used for the wavein feature. # Possible values are 'dummy' (recording silence) and platform-dependent -# drivers 'alsa', 'oss' and 'win'. +# drivers 'alsa', 'oss', 'sdl' and 'win'. # wavein: -# This defines the device to be used for wave output (if necessary). +# This defines the device to be used for wave input (if necessary). # midioutdrv: # This defines the driver to be used for the MIDI output feature. # Possible values are 'file' (all MIDI data sent to file), 'dummy' (no diff --git a/bochs/CHANGES b/bochs/CHANGES index 972a881c9..dd29ea7bf 100644 --- a/bochs/CHANGES +++ b/bochs/CHANGES @@ -37,6 +37,7 @@ Changes after 2.6.8 release: - Sound - Added PCM output data resampling in a separate thread. The resampler requires either libsamplerate or the SoX resampler library installed. + - SDL: Added audio capture support (requires library version >= 2.0.5). - USB - Added USB EHCI device emulation support (EHCI core ported from Qemu). - Added USB floppy (UFI/CBI) support (patch by Ben Lunt). diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk index 7623df0b9..f36173cf9 100644 --- a/bochs/doc/docbook/user/user.dbk +++ b/bochs/doc/docbook/user/user.dbk @@ -4420,12 +4420,12 @@ format sound: property=value. : This defines the driver to be used for the wavein feature. Possible values are 'dummy' (recording silence) and platform-dependent - drivers 'alsa', 'oss' and 'win'. + drivers 'alsa', 'oss', 'sdl' and 'win'. : - This defines the device to be used for wave output (if necessary). + This defines the device to be used for wave input (if necessary). diff --git a/bochs/doc/man/bochsrc.5 b/bochs/doc/man/bochsrc.5 index 1b5c02bf4..1ced3d7d2 100644 --- a/bochs/doc/man/bochsrc.5 +++ b/bochs/doc/man/bochsrc.5 @@ -1,5 +1,5 @@ .\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com" -.TH bochsrc 5 "29 Jan 2017" "bochsrc" "The Bochs Project" +.TH bochsrc 5 "9 Feb 2017" "bochsrc" "The Bochs Project" .\"SKIP_SECTION" .SH NAME bochsrc \- Configuration file for Bochs. @@ -958,10 +958,10 @@ waveout: waveindrv: This defines the driver to be used for the wavein feature. Possible values are 'dummy' (recording silence) and platform-dependent - drivers 'alsa', 'oss' and 'win'. + drivers 'alsa', 'oss', 'sdl' and 'win'. wavein: - This defines the device to be used for wave output (if necessary). + This defines the device to be used for wave input (if necessary). midioutdrv: This defines the driver to be used for the MIDI output feature.