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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/05/28 19:27:20

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

Log message:
                * server/asobj/NetStream*.{cpp,h}: Updated a comment and made 
play()
                  return void to be closer to defined behavoir.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3384&r2=1.3385
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3384
retrieving revision 1.3385
diff -u -b -r1.3384 -r1.3385
--- ChangeLog   28 May 2007 16:19:02 -0000      1.3384
+++ ChangeLog   28 May 2007 19:27:19 -0000      1.3385
@@ -1,3 +1,8 @@
+2007-05-28 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetStream*.{cpp,h}: Updated a comment and made play()
+         return void to be closer to defined behavoir.
+
 2007-05-28 Sandro Santilli <address@hidden>
 
        * server/asobj/: NetStream.{cpp,h},

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/asobj/NetStream.cpp  28 May 2007 16:19:03 -0000      1.50
+++ server/asobj/NetStream.cpp  28 May 2007 19:27:19 -0000      1.51
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.50 2007/05/28 16:19:03 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.51 2007/05/28 19:27:19 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -148,10 +148,8 @@
                return as_value();
        }
 
-       if (ns->play(fn.arg(0).to_string(&fn.env())) != 0)
-       {
-               ns->close();
-       };
+       ns->play(fn.arg(0).to_string(&fn.env()));
+
        return as_value();
 }
 

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/asobj/NetStream.h    28 May 2007 16:19:03 -0000      1.38
+++ server/asobj/NetStream.h    28 May 2007 19:27:19 -0000      1.39
@@ -19,7 +19,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.38 2007/05/28 16:19:03 strk Exp $ */
+/*  $Id: NetStream.h,v 1.39 2007/05/28 19:27:19 tgc Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -181,9 +181,7 @@
        /// @param source
        ///     Defines what file to play
        ///
-       /// @return 1 (true) on success, 0 (false) on failure
-       ///
-       virtual int play(const std::string& /*source*/){ log_error(_("FFMPEG or 
Gstreamer is needed to play video")); return 0; }
+       virtual void play(const std::string& /*source*/){ log_error(_("FFMPEG 
or Gstreamer is needed to play video")); }
 
        /// Seek in the media played by the current instance
        //
@@ -198,7 +196,9 @@
        ///
        virtual int64_t time() { return 0; }
 
-       /// Prepare for the rendering of next SWF frame
+       /// Called at the SWF framerate. Used to process queued status messages
+       /// and (re)start after a buffering pause. In NetStreamFfmpeg it is also
+       /// used to find the next video frame to be shown, though this might 
change.
        virtual void advance(){}
 
        /// Sets the NetConnection needed to access external files

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/asobj/NetStreamFfmpeg.cpp    28 May 2007 16:19:03 -0000      1.59
+++ server/asobj/NetStreamFfmpeg.cpp    28 May 2007 19:27:19 -0000      1.60
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.59 2007/05/28 16:19:03 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.60 2007/05/28 19:27:19 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -206,7 +206,7 @@
        return ns->inputPos;
 }
 
-int
+void
 NetStreamFfmpeg::play(const std::string& c_url)
 {
 
@@ -214,7 +214,7 @@
        if (m_go)
        {
                if (m_pause) unpauseDecoding();
-               return 0;
+               return;
        }
 
        // Does it have an associated NetConnection ?
@@ -223,7 +223,7 @@
                IF_VERBOSE_ASCODING_ERRORS(
                log_aserror(_("No NetConnection associated with this NetStream, 
won't play"));
                );
-               return 0;
+               return;
        }
 
        if (url.size() == 0) url += c_url;
@@ -238,7 +238,7 @@
        // This starts the decoding thread
        _decodeThread = new 
boost::thread(boost::bind(NetStreamFfmpeg::av_streamer, this)); 
 
-       return 0;
+       return;
 }
 
 /// Finds a decoder, allocates a context and initializes it.

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/NetStreamFfmpeg.h      28 May 2007 15:41:08 -0000      1.32
+++ server/asobj/NetStreamFfmpeg.h      28 May 2007 19:27:20 -0000      1.33
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.32 2007/05/28 15:41:08 ann Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.33 2007/05/28 19:27:20 tgc Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -181,7 +181,7 @@
        ~NetStreamFfmpeg();
        void close();
        void pause(int mode);
-       int play(const std::string& source);
+       void play(const std::string& source);
        void seek(double pos);
        int64_t time();
        void advance();

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/asobj/NetStreamGst.cpp       28 May 2007 16:19:04 -0000      1.49
+++ server/asobj/NetStreamGst.cpp       28 May 2007 19:27:20 -0000      1.50
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamGst.cpp,v 1.49 2007/05/28 16:19:04 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.50 2007/05/28 19:27:20 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -180,7 +180,7 @@
 }
 
 
-int
+void
 NetStreamGst::play(const std::string& c_url)
 {
 
@@ -190,7 +190,7 @@
                IF_VERBOSE_ASCODING_ERRORS(
                log_aserror(_("No NetConnection associated with this NetStream, 
won't play"));
                );
-               return 0;
+               return;
        }
 
        // Is it already playing ?
@@ -200,7 +200,7 @@
                {
                        playPipeline();
                }
-               return 0;
+               return;
        }
 
        if (url.size() == 0) url += c_url;
@@ -216,7 +216,7 @@
 #else
        startPlayback(this);
 #endif
-       return 0;
+       return;
 }
 
 
@@ -957,7 +957,7 @@
 {
        if (!pipeline) {
                if (m_parser.get())  {
-                       uint32_t newpos = 
m_parser->seek(static_cast<uint32_t>(pos*1000));
+                       m_parser->seek(static_cast<uint32_t>(pos*1000));
                        m_clock_offset = 0;
                }
                return;

Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/NetStreamGst.h 28 May 2007 15:41:08 -0000      1.25
+++ server/asobj/NetStreamGst.h 28 May 2007 19:27:20 -0000      1.26
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamGst.h,v 1.25 2007/05/28 15:41:08 ann Exp $ */
+/* $Id: NetStreamGst.h,v 1.26 2007/05/28 19:27:20 tgc Exp $ */
 
 #ifndef __NETSTREAMGST_H__
 #define __NETSTREAMGST_H__
@@ -52,7 +52,7 @@
        ~NetStreamGst();
        void close();
        void pause(int mode);
-       int play(const std::string& source);
+       void play(const std::string& source);
        void seek(double pos);
        int64_t time();
        void advance();