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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/28 16:05:57

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

Log message:
                * server/asobj/NetStream.h: drop playing() method (unclear
                  and unnecessary).
                * server/video_stream_instance.cpp (display): stop
                  callign NetStream::playing().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3382&r2=1.3383
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3382
retrieving revision 1.3383
diff -u -b -r1.3382 -r1.3383
--- ChangeLog   28 May 2007 15:40:56 -0000      1.3382
+++ ChangeLog   28 May 2007 16:05:56 -0000      1.3383
@@ -1,4 +1,11 @@
-2007-05-27 Ann Barcomb <address@hidden>
+2007-05-28 Sandro Santilli <address@hidden>
+
+       * server/asobj/NetStream.h: drop playing() method (unclear
+         and unnecessary).
+       * server/video_stream_instance.cpp (display): stop
+         calling NetStream::playing().
+
+2007-05-28 Ann Barcomb <address@hidden>
 
        * many files: Add a paragraph break before the line 'You should
          have received...' in the copyright notice.

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/asobj/NetStream.h    28 May 2007 15:40:03 -0000      1.36
+++ server/asobj/NetStream.h    28 May 2007 16:05:57 -0000      1.37
@@ -19,7 +19,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.36 2007/05/28 15:40:03 ann Exp $ */
+/*  $Id: NetStream.h,v 1.37 2007/05/28 16:05:57 strk Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -220,15 +220,6 @@
                m_env = env;
        }
 
-       /// Tells whether we're playing or not
-       //
-       /// @return true if playing, false if not.
-       ///
-       inline bool playing()
-       {
-               return m_go;
-       }
-
        /// Specifies how long to buffer data before starting to display the 
stream.
        //
        /// @param time

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/video_stream_instance.cpp    28 May 2007 13:26:35 -0000      1.24
+++ server/video_stream_instance.cpp    28 May 2007 16:05:57 -0000      1.25
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-// $Id: video_stream_instance.cpp,v 1.24 2007/05/28 13:26:35 strk Exp $
+// $Id: video_stream_instance.cpp,v 1.25 2007/05/28 16:05:57 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -88,15 +88,12 @@
        {
                boost::intrusive_ptr<NetStream> nso = _ns;
 
-               if (nso->playing())
-               {
                        image::image_base* i = nso->get_video();
                        if (i)
                        {
                                gnash::render::drawVideoFrame(i, &m, &bounds);
                                delete i;
                        }
-               }
 
        // If this is a video from a VideoFrame tag, retrieve a video frame 
from there.
        } else if (m_decoder.get()) {