gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Sandro Santilli
Subject: [Gnash-commit] gnash/server/asobj NetStream.cpp NetStream.h
Date: Wed, 30 May 2007 09:19:02 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/30 09:19:01

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

Log message:
        update bufferTime to also use milliseconds. Fixed default to be 1000 ms 
as
        documented (not 100)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- NetStream.cpp       30 May 2007 08:57:59 -0000      1.54
+++ NetStream.cpp       30 May 2007 09:19:01 -0000      1.55
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.54 2007/05/30 08:57:59 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.55 2007/05/30 09:19:01 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -64,7 +64,7 @@
        as_object(getNetStreamInterface()),
        _netCon(NULL),
        m_env(NULL),
-       m_bufferTime(100), // The default size needed to begin playback of 
media is 1000 miliseconds
+       m_bufferTime(1000), // The default size needed to begin playback of 
media is 1000 miliseconds
        m_videoFrameFormat(gnash::render::videoFrameFormat()),
        m_newFrameReady(false),
        m_go(false),
@@ -496,17 +496,10 @@
 void
 NetStream::setBufferTime(uint32_t time)
 {
-       // The argument is in seconds, but we store in milliseconds
+       // The argument is in milliseconds,
        m_bufferTime = time;
 }
 
-uint32_t
-NetStream::bufferTime()
-{
-       // The argument is in seconds, but we store in milliseconds
-    return (m_bufferTime/1000);
-}
-
 long
 NetStream::bytesLoaded()
 {

Index: NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- NetStream.h 30 May 2007 08:57:59 -0000      1.41
+++ NetStream.h 30 May 2007 09:19:01 -0000      1.42
@@ -19,7 +19,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.41 2007/05/30 08:57:59 strk Exp $ */
+/*  $Id: NetStream.h,v 1.42 2007/05/30 09:19:01 strk Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -227,11 +227,11 @@
        ///
        void setBufferTime(uint32_t time);
 
-       /// Returns what the buffer has been set to. (100 miliseconds is 
default)
+       /// Returns what the buffer time has been set to. (1000 miliseconds is 
default)
        //
-       /// @return The size of the buffer in seconds.
+       /// @return The size of the buffer in milliseconds.
        ///
-       uint32_t bufferTime();
+       uint32_t bufferTime() { return m_bufferTime; }
 
        /// Returns the number of bytes loaded of the media file
        //




reply via email to

[Prev in Thread] Current Thread [Next in Thread]