summaryrefslogtreecommitdiffstatshomepage
path: root/docs
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2023-05-09 01:49:41 +1000
committer Vas Crabb <vas@vastheman.com>2023-05-09 01:49:41 +1000
commit82394e8569ac385142aa6bb261819ac35ef22377 (patch)
tree1b08bb1e148fc6e3ef0a212677b1679a5bf3a845 /docs
parent743ac098e40f2e9aa8df0a0ef9b0233a8cc68d9d (diff)
Adjustments to option priority interactions:
emu/sound.cpp: Made -volume in source file INI or higher priority context take precedence over volume read from CFG file. This matches behaviour of -bgfx_screen_chains. emu/input.cpp: Made explicit -no{mouse|joystick|lightgun} take precedence over -{mouse|trackball|adstick|paddle}_device etc. from lower priority levels. Alos got rid of a bunch of unnecessary simple_list.
Diffstat (limited to 'docs')
-rw-r--r--docs/source/commandline/commandline-all.rst27
1 files changed, 16 insertions, 11 deletions
diff --git a/docs/source/commandline/commandline-all.rst b/docs/source/commandline/commandline-all.rst
index 809d982b6a4..9096cb13888 100644
--- a/docs/source/commandline/commandline-all.rst
+++ b/docs/source/commandline/commandline-all.rst
@@ -2977,11 +2977,14 @@ Core Sound Options
**-volume** / **-vol** *<value>*
- Sets the startup volume. It can later be changed with the user interface
- (see Keys section). The volume is an attenuation in dB: e.g.,
- "**-volume -12**" will start with -12dB attenuation.
+ Sets the initial sound volume. It can be changed later with the user
+ interface (see Keys section). The volume is an attenuation in decibels:
+ e.g. "**-volume -12**" will start with -12 dB attenuation. Note that if the
+ volume is changed in the user interface it will be saved to the
+ configuration file for the system. The value from the configuration file
+ for the system has priority over ``volume`` settings in general INI files.
- The default is ``0``.
+ The default is ``0`` (no attenuation, or full volume).
Example:
.. code-block:: bash
@@ -3053,11 +3056,11 @@ Core Sound Options
The default is ``1``.
- | For PortAudio, see the section on :ref:`-pa_latency <mame-commandline-palatency>`.
- | XAudio2 calculates audio_latency as 10ms steps.
- | DSound calculates audio_latency as 10ms steps.
- | CoreAudio calculates audio_latency as 25ms steps.
- | SDL calculates audio_latency as Xms steps.
+ * For PortAudio, see the section on :ref:`-pa_latency <mame-commandline-palatency>`.
+ * XAudio2 calculates audio_latency as 10ms steps.
+ * DSound calculates audio_latency as 10ms steps.
+ * CoreAudio calculates audio_latency as 25ms steps.
+ * SDL calculates audio_latency as Xms steps.
Example:
.. code-block:: bash
@@ -3559,11 +3562,13 @@ Core Input Automatic Enable Options
:ref:`-mouse <mame-commandline-nomouse>`, :ref:`-joystick
<mame-commandline-nojoystick>` and/or :ref:`-lightgun
<mame-commandline-nolightgun>` depending on the type of inputs present on
- the emulated system.
+ the emulated system. Note that these options *will not* override explicit
+ **-nomouse**, **-nojoystick** and/or **-nolightgun** settings at a higher
+ priority level (e.g. in a more specific INI file or on the command line).
For example, if you specify the option **-paddle_device mouse**, then mouse
controls will automatically be enabled when you run a game that has paddle
- controls (e.g. Super Breakout), even if you specified **-nomouse**.
+ controls (e.g. Super Breakout), even if you specified **-nomouse** .
The default is to automatically enable mouse controls when running emulated
systems with mouse inputs (**-mouse_device mouse**).