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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/30 08:49:45

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

Log message:
                * server/asobj/NetStream.{h,cpp}: fix documentation for 
bufferLength
                  method (return milliseconds, not seconds); have
                  NetStream.bufferLength return in fractional seconds, as 
expected.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3400&r2=1.3401
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3400
retrieving revision 1.3401
diff -u -b -r1.3400 -r1.3401
--- ChangeLog   30 May 2007 07:28:08 -0000      1.3400
+++ ChangeLog   30 May 2007 08:49:44 -0000      1.3401
@@ -1,3 +1,9 @@
+2007-05-30 Sandro Santilli <address@hidden>
+
+       * server/asobj/NetStream.{h,cpp}: fix documentation for bufferLength
+         method (return milliseconds, not seconds); have
+         NetStream.bufferLength return in fractional seconds, as expected.
+
 2007-05-30 Tomas Groth Christensen <address@hidden>
 
        * libbase/LoadThread.cpp: Close the download thread even if

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/asobj/NetStream.cpp  29 May 2007 05:15:21 -0000      1.52
+++ server/asobj/NetStream.cpp  30 May 2007 08:49:44 -0000      1.53
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.52 2007/05/29 05:15:21 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.53 2007/05/30 08:49:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -326,7 +326,9 @@
 {
        boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
 
-       long ret = ns->bufferLength();
+       // NetStream::bufferLength returns milliseconds, we want
+       // to return *fractional* seconds.
+       double ret = ns->bufferLength()/1000.0;
        return as_value(ret);
 }
 
@@ -521,6 +523,7 @@
 NetStream::bufferLength()
 {
        if (m_parser.get() == NULL) return 0;
+
        return m_parser->getBufferLength();
 }
 

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/asobj/NetStream.h    28 May 2007 19:27:19 -0000      1.39
+++ server/asobj/NetStream.h    30 May 2007 08:49:44 -0000      1.40
@@ -19,7 +19,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.39 2007/05/28 19:27:19 tgc Exp $ */
+/*  $Id: NetStream.h,v 1.40 2007/05/30 08:49:44 strk Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -245,11 +245,12 @@
        ///
        long bytesTotal();
 
-       /// Returns the number of second of the media file that is buffered and 
+       /// Returns the number of millisecond of the media file that is 
buffered and 
        /// yet to be played
        //
-       /// @return Returns the number of second of the media file that is 
+       /// @return Returns the number of millisecond of the media file that is 
        /// buffered and yet to be played
+       ///
        long bufferLength();
 
        /// Tells us if there is a new video frame ready