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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/08 11:11:07

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

Log message:
                * gui/gnash.cpp, utilities/processor.cpp: notify about -vp -va
                  requests being ignored when VERBOSE_ACTION and VERBOSE_PARSE
                  are undefined.
                * server/dlist.cpp: commented out GNASH_REPORT_FUNCTION (we 
should
                  also make these no-op with a macro).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.605&r2=1.606
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -b -r1.605 -r1.606
--- ChangeLog   8 Aug 2006 10:51:36 -0000       1.605
+++ ChangeLog   8 Aug 2006 11:11:06 -0000       1.606
@@ -1,5 +1,13 @@
 2006-08-08 Sandro Santilli <address@hidden>
 
+       * gui/gnash.cpp, utilities/processor.cpp: notify about -vp -va
+         requests being ignored when VERBOSE_ACTION and VERBOSE_PARSE
+         are undefined.
+       * server/dlist.cpp: commented out GNASH_REPORT_FUNCTION (we should
+         also make these no-op with a macro).
+
+2006-08-08 Sandro Santilli <address@hidden>
+
        * libbase/log.cpp (log_action): don't check getActionDump(),
          assume callers use IF_VERBOSE_ACTION instead.
        * libbase/log.h: added IF_VERBOSE_ACTION and VERBOSE_ACTION

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gui/gnash.cpp       1 Aug 2006 16:57:35 -0000       1.25
+++ gui/gnash.cpp       8 Aug 2006 11:11:07 -0000       1.26
@@ -67,6 +67,8 @@
 #include "rc.h"
 #include "GnashException.h"
 
+#include "log.h"
+
 using namespace std;
 using namespace gnash;
 
@@ -185,10 +187,18 @@
              dbglogfile << "Logging to disk enabled." << endl;
              break;
          case 'a':
+#if VERBOSE_ACTION
              dbglogfile.setActionDump(true); //gnash::set_verbose_action(true);
+#else
+              dbglogfile << "Verbose actions disabled at compile time" << endl;
+#endif
              break;
          case 'p':
+#if VERBOSE_ACTION
              dbglogfile.setParserDump(true); // gnash::set_verbose_parse(true);
+#else
+              dbglogfile << "Verbose parsing disabled at compile time" << endl;
+#endif
              break;
 #if 0
           case 'f':
@@ -431,8 +441,12 @@
         "  -c          Produce a core file instead of letting SDL trap it\n"
         "  -d num      Number of milliseconds to delay in main loop\n"
         "  -v          Be verbose; i.e. print log messages to stdout\n"
+#if VERBOSE_ACTION
         "  -va         Be verbose about movie Actions\n"
+#endif
+#if VERBOSE_PARSE
         "  -vp         Be verbose about parsing the movie\n"
+#endif
         "  -m <bias>   Specify the texture LOD bias (float, default is -1.0)\n"
 #if 0
         "  -f          Run full speed (no sleep) and log frame rate\n"

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/dlist.cpp    6 Aug 2006 02:00:54 -0000       1.16
+++ server/dlist.cpp    8 Aug 2006 11:11:07 -0000       1.17
@@ -218,7 +218,7 @@
        float ratio,
        uint16_t clip_depth)
 {
-       GNASH_REPORT_FUNCTION;
+       //GNASH_REPORT_FUNCTION;
 
        ch->set_depth(depth);
        ch->set_cxform(color_xform);
@@ -363,7 +363,8 @@
 void
 DisplayList::clear()
 {
-       GNASH_REPORT_FUNCTION;
+       //GNASH_REPORT_FUNCTION;
+
        for (iterator it = _characters.begin(),
                        itEnd = _characters.end();
                it != itEnd; ++it)
@@ -381,7 +382,7 @@
 void
 DisplayList::reset()
 {
-       GNASH_REPORT_FUNCTION;
+       // GNASH_REPORT_FUNCTION;
 
        // We just clear the container, but
        // might eventually keep it allocated

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- utilities/processor.cpp     8 Jun 2006 12:25:35 -0000       1.12
+++ utilities/processor.cpp     8 Aug 2006 11:11:07 -0000       1.13
@@ -142,10 +142,18 @@
              dbglogfile << "Verbose output turned on" << endl;
              break;
          case 'a':
+#if VERBOSE_ACTION
              dbglogfile.setActionDump(true);
+#else
+              dbglogfile << "Verbose actions disabled at compile time" << endl;
+#endif
              break;
          case 'p':
+#if VERBOSE_ACTION
              dbglogfile.setParserDump(true);
+#else
+              dbglogfile << "Verbose parsing disabled at compile time" << endl;
+#endif
              break;
        }
     }
@@ -248,7 +256,7 @@
        // @@ Maybe we should allow the user to specify some
        // safety margin on scaled shapes.
        
-       int     last_frame = m->get_current_frame();
+       size_t  last_frame = m->get_current_frame();
        m->advance(0.010f);
        m->display();