[Gnash-commit] gnash configure.ac gui/Player.cpp gui/gui.h gui...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/10/22 16:07:42

Modified files:
        .              : configure.ac 
        gui            : Player.cpp gui.h sdl.cpp 

Log message:
                * configure.ac: Have the description of --enable-write make 
sense.
                * gui/{gui.h, sdl.cpp}: Gui::init() should return true on 
success.
                Document this in gui.h and implement it in sdl.cpp.
                * gui/Player.cpp: Remove obsolete comment.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.174&r2=1.175
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.46&r2=1.47

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -b -r1.174 -r1.175
--- configure.ac        22 Oct 2006 10:55:04 -0000      1.174
+++ configure.ac        22 Oct 2006 16:07:41 -0000      1.175
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.174 2006/10/22 10:55:04 nihilus Exp $
+dnl $Id: configure.ac,v 1.175 2006/10/22 16:07:41 bjacques Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -80,7 +80,7 @@
 fi
 
 dnl Write the file to disk in the plugin, if specified.
-AC_ARG_ENABLE(write, AC_HELP_STRING([--enable-write], [Use a thread instead 
writeing the standalone player.]),
+AC_ARG_ENABLE(write, AC_HELP_STRING([--enable-write], [Makes the Mozilla 
plugin write the currently playing SWF movie to /tmp.]),
 [case "${enableval}" in
   yes) write=yes ;;
   no)  write=no ;;

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gui/Player.cpp      18 Oct 2006 22:36:21 -0000      1.22
+++ gui/Player.cpp      22 Oct 2006 16:07:41 -0000      1.23
@@ -355,8 +355,6 @@
       _gui->setTimeout((unsigned int)(exit_timeout * 1000));
     }
 
-    // @@ is it ok for 'app' to be NULL ?
-    // (this would be the case when USE_KDE is not defined)
     _gui->run();
 
     // Clean up as much as possible, so valgrind will help find actual leaks.

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gui/gui.h   19 Oct 2006 07:32:49 -0000      1.28
+++ gui/gui.h   22 Oct 2006 16:07:42 -0000      1.29
@@ -86,6 +86,7 @@
      * 
      * @param argc The commandline argument count.
      * @param argv The commandline arguments.
+     * @return True on success; false on failure.
      */
     virtual bool init(int argc, char **argv[]) = 0;
 

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gui/sdl.cpp 18 Oct 2006 12:36:49 -0000      1.46
+++ gui/sdl.cpp 22 Oct 2006 16:07:42 -0000      1.47
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.46 2006/10/18 12:36:49 nihilus Exp $ */
+/* $Id: sdl.cpp,v 1.47 2006/10/22 16:07:42 bjacques Exp $ */
 
 // XXXbjacques: Screw up the indentation in this file, and you're dead. And by
 //              screw up, I mean not adhering the indentation used throughout
@@ -217,7 +217,7 @@
 
     _renderer = _glue.createRenderHandler(_depth);
 
-    return false;
+    return true;
 }