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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/21 23:42:20

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp 
        server         : movie_def_impl.cpp 
        utilities      : processor.cpp 

Log message:
                * utilities/processor.cpp: don't show -vp and -va options if
                  verbose parsing and action is not compiled in (bug #17367).
                * gui/gnash.cpp: fix -vp when VERBOSE_ACTION is undefined (bug 
#17367).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.669&r2=1.670
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_def_impl.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -b -r1.669 -r1.670
--- ChangeLog   21 Aug 2006 23:28:47 -0000      1.669
+++ ChangeLog   21 Aug 2006 23:42:19 -0000      1.670
@@ -1,5 +1,8 @@
 2006-08-21 Sandro Santilli  <address@hidden>
 
+       * utilities/processor.cpp: don't show -vp and -va options if
+         verbose parsing and action is not compiled in (bug #17367).
+       * gui/gnash.cpp: fix -vp when VERBOSE_ACTION is undefined (bug #17367).
        * server/movie_def_impl.cpp: implement MovieLoader::lock 
          and MovieLoader::unlock for SDL. Fix MovieLoader::wait_for_frame
          for SDL.

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gui/gnash.cpp       13 Aug 2006 13:39:31 -0000      1.28
+++ gui/gnash.cpp       21 Aug 2006 23:42:20 -0000      1.29
@@ -195,7 +195,7 @@
 #endif
              break;
          case 'p':
-#if VERBOSE_ACTION
+#if VERBOSE_PARSE
              dbglogfile.setParserDump(true); // gnash::set_verbose_parse(true);
 #else
               dbglogfile << "Verbose parsing disabled at compile time" << endl;

Index: server/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_def_impl.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/movie_def_impl.cpp   21 Aug 2006 23:28:47 -0000      1.27
+++ server/movie_def_impl.cpp   21 Aug 2006 23:42:20 -0000      1.28
@@ -179,8 +179,15 @@
 
 MovieLoader::~MovieLoader()
 {
-       pthread_cond_destroy(&_frame_reached_condition);
-       pthread_mutex_destroy(&_mutex);
+       if ( pthread_cond_destroy(&_frame_reached_condition) != 0 )
+       {
+               log_error("Error destroying MovieLoader condition");
+       }
+
+       if ( pthread_mutex_destroy(&_mutex) != 0 )
+       {
+               log_error("Error destroying MovieLoader mutex");
+       }
 }
 
 void*
@@ -229,7 +236,10 @@
        }
 #endif
 
-       pthread_mutex_lock(&_mutex);
+       if ( pthread_mutex_lock(&_mutex) != 0 )
+       {
+               log_error("Error locking MovieLoader");
+       }
 
 #ifdef DEBUG_THREADS_LOCKING
        // debugging
@@ -254,7 +264,10 @@
        }
 #endif
 
-       pthread_mutex_unlock(&_mutex);
+       if ( pthread_mutex_unlock(&_mutex) != 0 )
+       {
+               log_error("Error unlocking MovieLoader");
+       }
 
 #ifdef DEBUG_THREADS_LOCKING
        // debugging

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- utilities/processor.cpp     20 Aug 2006 13:54:23 -0000      1.14
+++ utilities/processor.cpp     21 Aug 2006 23:42:20 -0000      1.15
@@ -337,8 +337,12 @@
        "  -h          Print this info.\n"
        "  -w          Write a .gsc file with preprocessed info, for each input 
file.\n"
        "  -v          Be verbose; i.e. print log messages to stdout\n"
+#if VERBOSE_PARSE
        "  -vp         Be verbose about movie parsing\n"
+#endif
+#if VERBOSE_ACTION
        "  -va         Be verbose about ActionScript\n", name
+#endif
        );
 }