From f661e32ec82ef37ae63b9dd309ae8d7a3b8bf5e7 Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Fri, 13 Jun 2014 21:01:35 +0000 Subject: [PATCH] Change remaining references to -nosound to -sound none in code and docs; move description of -sound option to OSD-specific doc files to be orthogonal to -video (nw) --- docs/SDL.txt | 7 ++++++- docs/config.txt | 5 ----- docs/windows.txt | 8 +++++++- src/osd/osdepend.c | 2 +- src/osd/sdl/man/mame.6 | 2 +- src/tools/runtest.cmd | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/docs/SDL.txt b/docs/SDL.txt index 47005ee4840..e755819f4da 100644 --- a/docs/SDL.txt +++ b/docs/SDL.txt @@ -59,7 +59,7 @@ Performance options -bench [n] Benchmark for [n] number of emulated seconds; implies the command string: - -str [n] -video none -nosound -nothrottle. Default is OFF (-nobench) + -str [n] -video none -sound none -nothrottle. Default is OFF (-nobench) @@ -326,6 +326,11 @@ Full screen options Sound options ------------- +-sound + + Specifies which sound subsystem to use. 'none' disables sound altogether. + The default is sdl. + -audio_latency This controls the amount of latency built into the audio streaming. By diff --git a/docs/config.txt b/docs/config.txt index b55bfdf21e3..2d780d6b777 100644 --- a/docs/config.txt +++ b/docs/config.txt @@ -864,11 +864,6 @@ Core vector options Core sound options ------------------ --sound [value] - - Enable (auto), disable (none), or SDL (sdl) if using SDL. The default - is enable (auto). - -samplerate / -sr Sets the audio sample rate. Smaller values (e.g. 11025) cause lower diff --git a/docs/windows.txt b/docs/windows.txt index d14567162e8..4e31f7baf32 100644 --- a/docs/windows.txt +++ b/docs/windows.txt @@ -70,7 +70,7 @@ Windows performance options -bench [n] Benchmark for [n] number of emulated seconds; implies the command string: - -str [n] -video none -nosound -nothrottle + -str [n] -video none -sound none -nothrottle @@ -339,6 +339,12 @@ Full screen options Windows sound options --------------------- +-sound + + Specifies which sound subsystem to use. 'none' disables sound altogether. + The default is dsound. + + -audio_latency This controls the amount of latency built into the audio streaming. By diff --git a/src/osd/osdepend.c b/src/osd/osdepend.c index f2217a4901a..db5e9b74b1e 100644 --- a/src/osd/osdepend.c +++ b/src/osd/osdepend.c @@ -33,7 +33,7 @@ const options_entry osd_options::s_option_entries[] = { NULL, NULL, OPTION_HEADER, "OSD PERFORMANCE OPTIONS" }, { OSDOPTION_MULTITHREADING ";mt", "0", OPTION_BOOLEAN, "enable multithreading; this enables rendering and blitting on a separate thread" }, { OSDOPTION_NUMPROCESSORS ";np", OSDOPTVAL_AUTO, OPTION_STRING, "number of processors; this overrides the number the system reports" }, - { OSDOPTION_BENCH, "0", OPTION_INTEGER, "benchmark for the given number of emulated seconds; implies -video none -nosound -nothrottle" }, + { OSDOPTION_BENCH, "0", OPTION_INTEGER, "benchmark for the given number of emulated seconds; implies -video none -sound none -nothrottle" }, // video options { NULL, NULL, OPTION_HEADER, "OSD VIDEO OPTIONS" }, // OS X can be trusted to have working hardware OpenGL, so default to it on for the best user experience diff --git a/src/osd/sdl/man/mame.6 b/src/osd/sdl/man/mame.6 index cb4458df6f9..5933d9032d8 100644 --- a/src/osd/sdl/man/mame.6 +++ b/src/osd/sdl/man/mame.6 @@ -509,7 +509,7 @@ Show SDL video performance. .TP .B \-bench Benchmark for the given number of emulated seconds; -implies \-video none \-nosound \-nothrottle. +implies \-video none \-sound none \-nothrottle. .\" .\" ******************************************************* .SS Rotation options diff --git a/src/tools/runtest.cmd b/src/tools/runtest.cmd index 3e3911a5d74..17d59fb6ce5 100644 --- a/src/tools/runtest.cmd +++ b/src/tools/runtest.cmd @@ -166,7 +166,7 @@ goto :eof :runone @echo Testing %1 (%2)... echo.>>%SUMMARY% -mame %1 -str 30 -watchdog 300 -nodebug -nothrottle -inipath .. -video none -nosound 1>log\%1.txt 2>log\%1.err +mame %1 -str 30 -watchdog 300 -nodebug -nothrottle -inipath .. -video none -sound none 1>log\%1.txt 2>log\%1.err if %errorlevel% equ 100 ( echo @@@@@driver=%1: Exception>>%SUMMARY% type log\%1.err >>%SUMMARY%