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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/23 11:20:55

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp sdl.cpp 

Log message:
        moved parsing of -c switch from gnash to sdl gui.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.900&r2=1.901
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -b -r1.900 -r1.901
--- ChangeLog   22 Sep 2006 17:40:43 -0000      1.900
+++ ChangeLog   23 Sep 2006 11:20:55 -0000      1.901
@@ -1,3 +1,8 @@
+2006-09-23 Sandro Santilli  <address@hidden>
+
+       * gui/gnash.cpp, gui/sdl.cpp: moved parsing of -c switch from
+         gnash to sdl gui.
+
 2006-09-22 Patrice Dumas <address@hidden>
 
        * testsuite/Makefile.am, testsuite/actionscript.all/Makefile.am,

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gui/gnash.cpp       8 Sep 2006 14:35:07 -0000       1.37
+++ gui/gnash.cpp       23 Sep 2006 11:20:55 -0000      1.38
@@ -236,9 +236,12 @@
           case 's':
               scale = fclamp((float) atof(optarg), 0.01f, 100.f);
               break;
+#if 0
+          // This option is parsed in SDLGui::init().
           case 'c':
               sdl_abort = false;
               break;
+#endif
           case 'd':
               delay = strtol(optarg, NULL, 0);
               break;

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gui/sdl.cpp 18 Sep 2006 13:43:52 -0000      1.19
+++ gui/sdl.cpp 23 Sep 2006 11:20:55 -0000      1.20
@@ -200,12 +200,19 @@
 {
     GNASH_REPORT_FUNCTION;
 
+       while ((c = getopt (argc, argv, "m:c")) != -1)
+       {
+               switch (c)
+               {
 #ifdef FIX_I810_LOD_BIAS
-    int c = getopt (argc, argv, "m:");
-    if (c == 'm') {
+                       case 'm':
       _tex_lod_bias = (float) atof(optarg);
-    }
+                               break;
 #endif
+                       case 'c':
+                               disableCoreTrap();
+               }
+       }
 
     if (_xid) {
       char SDL_windowhack[32];