[Scummvm-cvs-logs] CVS: scummvm README,1.306,1.307 TODO,1.202,1.203 scummvm.6,1.21,1.22

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24676

Modified Files:
	README TODO scummvm.6 
Log Message:
Get rid of the useless & troublesome master_volume

Index: README
===================================================================
RCS file: /cvsroot/scummvm/scummvm/README,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- README	24 Dec 2004 01:17:04 -0000	1.306
+++ README	25 Dec 2004 23:43:04 -0000	1.307
@@ -316,7 +316,6 @@
   -e, --music-driver=MODE  Select music driver (see also section 7.0)
   -q, --language=LANG      Select language (see also section 5.2)
   -m, --music-volume=NUM   Set the music volume, 0-255 (default: 192)
-  -o, --master-volume=NUM  Set the master volume, 0-255 (default: 192)
   -s, --sfx-volume=NUM     Set the sfx volume, 0-255 (default: 192)
   -r, --speech-volume=NUM   Set the voice volume, 0-255 (default: 192)
   -n, --subtitles          Enable subtitles (use with games that have voice)
@@ -990,7 +989,6 @@
         [tentacle]
         path=C:\tentacle\
         subtitles=true
-        master_volume=98
         music_volume=40
         sfx_volume=255
 
@@ -1037,7 +1035,6 @@
         cdrom           number   Number of CD-ROM unit to use for audio. If
                                  negative, don't even try to access the CD-ROM.
         joystick_num    number   Number of joystick device to use for input
-        master_volume   number   The master volume setting (0-255)
         music_driver    string   The music engine to use.
         output_rate     number   The output sample rate to use, in Hz. Sensible
                                  values are 11025, 22050 and 44100.

Index: TODO
===================================================================
RCS file: /cvsroot/scummvm/scummvm/TODO,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- TODO	25 Dec 2004 18:34:41 -0000	1.202
+++ TODO	25 Dec 2004 23:43:04 -0000	1.203
@@ -160,9 +160,6 @@
 =====
 * Get the high quality resample code to work
    [Fingolfin has started work on this]
-* Consider getting completely rid of the "master volume" (the config key,
-  the command line switch, in the GUI, and in the engines), it doesn't
-  seem to serve much of a purpose.
 * Add "sound types" to the mixer; client code will be able to pass such a type
   whenever registering an audio stream. Then, volume control will be changed
   to be based on the sound type.

Index: scummvm.6
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.6,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- scummvm.6	15 Dec 2004 09:58:21 -0000	1.21
+++ scummvm.6	25 Dec 2004 23:43:04 -0000	1.22
@@ -103,10 +103,6 @@
 range 0-255 (default: 192).
 .It Fl n
 Enable subtitles (use with games that have voice).
-.It Fl o Ar vol
-Set the master volume to
-.Ar vol
-range 0-255 (default: 192).
 .It Fl p Ar path
 Path to where the game is installed.
 .It Fl q Ar language