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

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/07/06 15:10:44

Modified files:
        gui            : gnash.cpp 
        .              : ChangeLog 

Log message:
                * gui/gnash.cpp: Reformat crazy indentation and simplify 
redundant 
                  local variables (no functional change)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3661&r2=1.3662

Patches:
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- gui/gnash.cpp       3 Jul 2007 17:01:57 -0000       1.82
+++ gui/gnash.cpp       6 Jul 2007 15:10:43 -0000       1.83
@@ -251,13 +251,10 @@
               url = optarg;
               log_msg (_("Setting root URL to %s"), url);
               break;
-          case 'U':
-         {
-               const char* baseurl = optarg;
-               player.setBaseUrl(baseurl);
-               log_msg (_("Setting base URL to %s"), baseurl);
+          case 'U':    // Set base URL
+             player.setBaseUrl(optarg);
+             log_msg (_("Setting base URL to %s"), optarg);
                break;
-         }
           case 'j':
               width_given = true;
               player.setWidth ( strtol(optarg, NULL, 0) );
@@ -280,18 +277,16 @@
               log_msg (_("Setting height to " SIZET_FMT), player.getHeight());
               break;
           case 'x':
-              called_by_plugin=true;
+              called_by_plugin = true;
               player.setWindowId(strtol(optarg, NULL, 0));
               break;
           case '1':
               player.setDoLoop(false);
               break;
           case 'r':
-       {
               specified_rendering_flag=true;
 
-              long int render_arg = strtol(optarg, NULL, 0);
-              switch (render_arg) {
+              switch (strtol(optarg, NULL, 0)) {
                 case 0:
                     // Disable both
                     player.setDoRender(false);
@@ -313,34 +308,26 @@
                     player.setDoSound(true);
                     break;
                 default:
-                    log_error (_("-r must be followed by 0, 1, 2 or 3 "
-                       "(%ld is invalid)"), render_arg);
+                    log_error (_("-r must be followed by 0, 1, 2 or 3 "));
                     break;
               }
               break;
-       }
           case 't':
               player.setExitTimeout( (float) atof(optarg) );
               break;
           case 'b':
-          {
-               int bit_depth;
-              bit_depth = atoi(optarg);
-               player.setBitDepth(bit_depth);
+             player.setBitDepth(atoi(optarg));
               break;
-          }
           case 'f':
-          {
 #ifdef GNASH_FPS_DEBUG
-               float frames = strtod(optarg, NULL);
-               player.setFpsPrintTime(frames);
-               break;
+               player.setFpsPrintTime((float)strtod(optarg, NULL));
 #else // ndef GNASH_FPS_DEBUG
                printf(_("FPS debugging disabled at compile time, -f is 
invalid\n"));
                exit(EXIT_FAILURE);
 #endif // ndef GNASH_FPS_DEBUG
-          }
+               break;
           case 'P':
+           {
                string param = optarg;
                size_t eq = param.find("=");
                string name, value;
@@ -357,6 +344,7 @@
                break;
        }
     }
+    }
 
     if ( ! specified_rendering_flag ) {
        log_msg (_("No rendering flags specified, using rcfile"));
@@ -367,8 +355,8 @@
         }
     }
 
-    if (called_by_plugin && height_given && width_given && !player.getHeight() 
&& 
-        !player.getWidth()) {
+    if (called_by_plugin && height_given && width_given
+       && !player.getHeight() && !player.getWidth()) {
         // We were given dimensions of 0x0 to render to (probably the plugin
         // is playing an "invisible" movie. Disable video rendering.
         player.setDoRender(false);
@@ -410,12 +398,10 @@
 
        // No file name was supplied
        if (!infile) {
-               std::cerr << "Error: no input file was specified."
-                       << endl << endl;
+           std::cerr << "Error: no input file was specified." << endl << endl;
                usage();
                return EXIT_FAILURE;
        }
 
        return player.run(argc, argv, infile, url);
 }
-

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3661
retrieving revision 1.3662
diff -u -b -r1.3661 -r1.3662
--- ChangeLog   6 Jul 2007 14:51:51 -0000       1.3661
+++ ChangeLog   6 Jul 2007 15:10:44 -0000       1.3662
@@ -3,6 +3,8 @@
        * backend/Makefile.am: Move a GUI test to its logical place
        * testsuite/libamf.all/test_number.cpp: Remove uused variables and
          commented-out debugging printfs
+       * gui/gnash.cpp: Reformat crazy indentation and simplify redundant
+         local variables (no functional change)
 
 2007-07-05 Markus Gothe <address@hidden>