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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/17 08:58:31

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp 

Log message:
        * gui/gnash.cpp: fixed handling of -h flag (force exit
        after printing usage string); added comments to
        removal of file_opener stuff.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.346&tr2=1.347&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gnash.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.346 gnash/ChangeLog:1.347
--- gnash/ChangeLog:1.346       Wed May 17 08:51:17 2006
+++ gnash/ChangeLog     Wed May 17 08:58:31 2006
@@ -1,5 +1,8 @@
 2006-05-17 Sandro Santilli <address@hidden>
        
+       * gui/gnash.cpp: fixed handling of -h flag (force exit 
+       after printing usage string); added comments to
+       removal of file_opener stuff.
        * gui/Makefile.am: use new USE_GUI_* conditionals
        to avoid references to unrequested dependencies.
        Move KDE deps to klash_LDFLAGS (from AM_LDFLAGS)
Index: gnash/gui/gnash.cpp
diff -u gnash/gui/gnash.cpp:1.11 gnash/gui/gnash.cpp:1.12
--- gnash/gui/gnash.cpp:1.11    Wed May 17 00:27:30 2006
+++ gnash/gui/gnash.cpp Wed May 17 08:58:31 2006
@@ -71,6 +71,9 @@
 static void version_and_copyright();
 static bool advance_movie(void* data);
 
+// we don't need to register a file opener anymore, the
+// default gnash::globals::streamProvider is good enough
+#if 0
 static tu_file*
 file_opener(const char* url)
 // Callback function.  This opens files for the library.
@@ -84,6 +87,7 @@
         return new tu_file(url, "rb");
     }
 }
+#endif
 
 static void
 fs_callback(gnash::movie_interface* movie, const char* command, const char* 
args)
@@ -144,7 +148,7 @@
        switch (c) {
          case 'h':
              usage ();
-             break;
+          exit(0);
          case 'v':
               dbglogfile.setVerbosity();
              dbglogfile << "Verbose output turned on" << endl;
@@ -261,6 +265,8 @@
        return EXIT_FAILURE;
     }
 
+// we don't need to register a file opener anymore, the
+// default gnash::globals::streamProvider is good enough
 #if 0
     // strk removed this function..
     gnash::register_file_opener_callback(file_opener);
@@ -282,11 +288,11 @@
     float movie_fps = 30.0f;
 
     try {
-      gnash::get_movie_info(URL(infile), &movie_version, &movie_width,
-      &movie_height, &movie_fps, NULL, NULL);
+        gnash::get_movie_info(URL(infile), &movie_version, &movie_width,
+            &movie_height, &movie_fps, NULL, NULL);
     } catch (const GnashException& er) {
-      fprintf(stderr, "%s\n", er.what());
-      movie_version = 0;
+        fprintf(stderr, "%s\n", er.what());
+        movie_version = 0;
     }
 
     if (movie_version == 0) {