summaryrefslogtreecommitdiffstatshomepage
path: root/docs
diff options
context:
space:
mode:
author Alex W. Jackson <alex.w.jackson@gmail.com>2014-06-13 21:01:35 +0000
committer Alex W. Jackson <alex.w.jackson@gmail.com>2014-06-13 21:01:35 +0000
commitf661e32ec82ef37ae63b9dd309ae8d7a3b8bf5e7 (patch)
treed5928a23d91fc268a4ea79b025d06b198ec306e8 /docs
parent1358278e4daedf0b3e724a6055b670e88abe0a68 (diff)
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)
Diffstat (limited to 'docs')
-rw-r--r--docs/SDL.txt7
-rw-r--r--docs/config.txt5
-rw-r--r--docs/windows.txt8
3 files changed, 13 insertions, 7 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 <sdl|none>
+
+ Specifies which sound subsystem to use. 'none' disables sound altogether.
+ The default is sdl.
+
-audio_latency <value>
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 <value> / -sr <value>
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 <dsound|sdl|none>
+
+ Specifies which sound subsystem to use. 'none' disables sound altogether.
+ The default is dsound.
+
+
-audio_latency <value>
This controls the amount of latency built into the audio streaming. By