[Gnash-commit] gnash ChangeLog gui/gnash.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/27 12:10:25

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp 

Log message:
        * gui/gnash.cpp: changed semantic of -r switch:
                0: disable both rendering and sound
                1: enable rendering only (as before)
                2: enable sound only (changed!)
                3: enable both (new, previously done by 2)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.535&r2=1.536
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -b -r1.535 -r1.536
--- ChangeLog   27 Jul 2006 08:37:45 -0000      1.535
+++ ChangeLog   27 Jul 2006 12:10:25 -0000      1.536
@@ -1,3 +1,11 @@
+2006-07-27 Sandro Santilli <address@hidden>
+
+       * gui/gnash.cpp: changed semantic of -r switch:
+               0: disable both rendering and sound
+               1: enable rendering only (as before)
+               2: enable sound only (changed!)
+               3: enable both (new, previously done by 2)
+
 2006-07-27 Bastiaan Jacques <address@hidden>
 
        * all over the place: Facilitate the use of -pedantic in combination

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gui/gnash.cpp       26 Jul 2006 19:11:57 -0000      1.18
+++ gui/gnash.cpp       27 Jul 2006 12:10:25 -0000      1.19
@@ -214,17 +214,22 @@
                     do_sound = false;
                     break;
                 case 1:
-                    // Enable both
+                    // Enable rendering, disable sound
                     do_render = true;
-                    do_sound = true;
+                    do_sound = false;
                     break;
                 case 2:
-                    // Disable just sound
+                    // Enable sound, disable rendering
+                    do_render = false;
+                    do_sound = true;
+                    break;
+                case 3:
+                    // Enable render & sound
                     do_render = true;
-                    do_sound = false;
+                    do_sound = true;
                     break;
                 default:
-                    cerr << "-r must be followed by 0, 1 or 2 (" << 
+                    cerr << "-r must be followed by 0, 1, 2 or 3 (" << 
                         render_arg << ") is invalid" << endl;
                     break;
               };
@@ -396,9 +401,11 @@
         "  -x <ID>     X11 Window ID for display\n"
         "  -w          Produce the disk based debug log\n"
         "  -1          Play once; exit when/if movie reaches the last frame\n"
-        "  -r <0|1|2>  0 disables rendering & sound (good for batch tests)\n"
-        "              1 enables rendering & sound\n"
-        "              2 enables rendering & disables sound (default)\n"
+        "  -r <0|1|2|3>\n"
+       "              0 disables both rendering & sound (good for batch 
tests)\n"
+        "              1 enables rendering & disables sound (default)\n"
+        "              2 enables sound & enable sound\n"
+        "              3 enables both rendering & sound\n"
         "  -t <sec>    Timeout and exit after the specified number of 
seconds\n"
         "  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
         "  --version   Print gnash's version number and exit\n"