[Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp serv...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/31 14:35:18

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStream.cpp NetStreamFfmpeg.cpp 

Log message:
                * server/asobj/: NetStream.cpp, NetStreamFfmpeg.cpp:
                  More debugging lines protection.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3423&r2=1.3424
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.78&r2=1.79

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3423
retrieving revision 1.3424
diff -u -b -r1.3423 -r1.3424
--- ChangeLog   31 May 2007 14:30:03 -0000      1.3423
+++ ChangeLog   31 May 2007 14:35:17 -0000      1.3424
@@ -1,5 +1,10 @@
 2007-05-31 Sandro Santilli <address@hidden>
 
+       * server/asobj/: NetStream.cpp, NetStreamFfmpeg.cpp:
+         More debugging lines protection.
+
+2007-05-31 Sandro Santilli <address@hidden>
+
        * libbase/FLVParser.cpp: protect seek debugging by
          a GNASH_DEBUG_SEEK macro
        * server/asobj/NetStreamFfmpeg.cpp: dont debug condition

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/asobj/NetStream.cpp  30 May 2007 15:12:28 -0000      1.59
+++ server/asobj/NetStream.cpp  31 May 2007 14:35:18 -0000      1.60
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.59 2007/05/30 15:12:28 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.60 2007/05/31 14:35:18 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +40,9 @@
 
 #include "movie_root.h"
 
+// Define the following macro to have status notification handling debugged
+//#define GNASH_DEBUG_STATUS
+
 namespace gnash {
  
 static as_value netstream_new(const fn_call& fn);
@@ -460,13 +463,17 @@
        as_value status;
        if ( get_member("onStatus", &status) && status.is_function())
        {
+#ifdef GNASH_DEBUG_STATUS
                log_debug("Processing "SIZET_FMT" status notifications", 
_statusQueue.size());
+#endif
 
                for (StatusQueue::iterator it=_statusQueue.begin(), 
itE=_statusQueue.end(); it!=itE; ++it)
                {
                        StatusCode code = *it; 
 
+#ifdef GNASH_DEBUG_STATUS
                        log_debug(" Invoking onStatus(%s)", 
getStatusCodeInfo(code).first);
+#endif
 
                        // TODO: optimize by reusing the same as_object ?
                        boost::intrusive_ptr<as_object> o = 
getStatusObject(code);

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/asobj/NetStreamFfmpeg.cpp    31 May 2007 14:30:04 -0000      1.78
+++ server/asobj/NetStreamFfmpeg.cpp    31 May 2007 14:35:18 -0000      1.79
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.78 2007/05/31 14:30:04 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.79 2007/05/31 14:35:18 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -49,6 +49,9 @@
 /// Define this to add debugging prints for locking
 //#define GNASH_DEBUG_THREADS
 
+// Define the following macro to have status notification handling debugged
+//#define GNASH_DEBUG_STATUS
+
 // Used to free data in the AVPackets we create our self
 static void avpacket_destruct(AVPacket* av) {
        delete [] av->data;
@@ -704,7 +707,9 @@
 #endif
        ns->m_go = false;
 
+#ifdef GNASH_DEBUG_STATUS
        log_debug("Setting playStop status");
+#endif
        ns->setStatus(playStop);
 }
 
@@ -1223,7 +1228,9 @@
        //    and we then wait until the buffer contains some data (1 sec) 
again.
        if (m_go && m_pause && m_start_onbuffer && m_parser.get() && 
m_parser->isTimeLoaded(uint32_t(m_current_timestamp*1000)+m_bufferTime))
        {
+#ifdef GNASH_DEBUG_STATUS
                log_debug("(advance): setting buffer full");
+#endif
                setStatus(bufferFull);
                unpauseDecoding();
                m_start_onbuffer = false;
@@ -1256,7 +1263,7 @@
 
 void NetStreamFfmpeg::pauseDecoding()
 {
-       log_msg("pauseDecoding called");
+       //GNASH_REPORT_FUNCTION
 
        // assert(decoding_mutex is locked by this thread!)