[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:57:59

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

Log message:
                  Change bufferTime to take milliseconds, convert from seconds
                  in the AS method (so we can accept fractional seconds..).

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3401
retrieving revision 1.3402
diff -u -b -r1.3401 -r1.3402
--- ChangeLog   30 May 2007 08:49:44 -0000      1.3401
+++ ChangeLog   30 May 2007 08:57:59 -0000      1.3402
@@ -2,7 +2,9 @@
 
        * server/asobj/NetStream.{h,cpp}: fix documentation for bufferLength
          method (return milliseconds, not seconds); have
-         NetStream.bufferLength return in fractional seconds, as expected.
+         NetStream.bufferLength return in fractional seconds, as expected;
+         Change bufferTime to take milliseconds, convert from seconds
+         in the AS method (so we can accept fractional seconds..).
 
 2007-05-30 Tomas Groth Christensen <address@hidden>
 

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/asobj/NetStream.cpp  30 May 2007 08:49:44 -0000      1.53
+++ server/asobj/NetStream.cpp  30 May 2007 08:57:59 -0000      1.54
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.53 2007/05/30 08:49:44 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.54 2007/05/30 08:57:59 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -173,12 +173,14 @@
 
        boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
 
-       uint32_t time = 0;
+       // TODO: should we do anything if given no args ?
+       //       are we sure setting bufferTime to 0 is what we have to do ?
+       double time = 0;
        if (fn.nargs > 0)
        {
-               time = static_cast<uint32_t>(fn.arg(0).to_number(&fn.env()));
+               time = fn.arg(0).to_number(&fn.env());
        }
-       ns->setBufferTime(time);
+       ns->setBufferTime(time*1000);
 
        return as_value();
 }
@@ -495,7 +497,7 @@
 NetStream::setBufferTime(uint32_t time)
 {
        // The argument is in seconds, but we store in milliseconds
-    m_bufferTime = time*1000;
+       m_bufferTime = time;
 }
 
 uint32_t

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/asobj/NetStream.h    30 May 2007 08:49:44 -0000      1.40
+++ server/asobj/NetStream.h    30 May 2007 08:57:59 -0000      1.41
@@ -19,7 +19,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.40 2007/05/30 08:49:44 strk Exp $ */
+/*  $Id: NetStream.h,v 1.41 2007/05/30 08:57:59 strk Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -220,10 +220,10 @@
                m_env = env;
        }
 
-       /// Specifies how long to buffer data before starting to display the 
stream.
+       /// Specifies the number of milliseconds to buffer before starting to 
display the stream.
        //
        /// @param time
-       /// The time in seconds that should be buffered.
+       /// The time in milliseconds that should be buffered.
        ///
        void setBufferTime(uint32_t time);