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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/05 13:31:44

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

Log message:
                * server/asobj/: NetStream.{cpp,h}, NetStreamFfmpeg.{cpp,h},
                  NetStreamGst.{cpp,h}: change play() method to take a 
std::string
                  ref instead of a char*; always pass environment when casting 
args
                  to numbers or strings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3104&r2=1.3105
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3104
retrieving revision 1.3105
diff -u -b -r1.3104 -r1.3105
--- ChangeLog   5 May 2007 13:16:09 -0000       1.3104
+++ ChangeLog   5 May 2007 13:31:43 -0000       1.3105
@@ -1,5 +1,12 @@
 2007-05-04 Sandro Santilli <address@hidden>
 
+       * server/asobj/: NetStream.{cpp,h}, NetStreamFfmpeg.{cpp,h},
+         NetStreamGst.{cpp,h}: change play() method to take a std::string
+         ref instead of a char*; always pass environment when casting args
+         to numbers or strings.
+
+2007-05-04 Sandro Santilli <address@hidden>
+
        * server/asobj/NetStream.cpp: stubbed missing methods and
          properties.
        * libbase/tu_file.cpp (std_get_stream_size_func): use fstat to 

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/asobj/NetStream.cpp  5 May 2007 13:20:36 -0000       1.41
+++ server/asobj/NetStream.cpp  5 May 2007 13:31:44 -0000       1.42
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.41 2007/05/05 13:20:36 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.42 2007/05/05 13:31:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -96,7 +96,7 @@
                                log_aserror(_("First argument "
                                        "to NetStream constructor "
                                        "doesn't cast to a NetConnection (%s)"),
-                                       fn.arg(0).to_string().c_str());
+                                       fn.arg(0).to_debug_string().c_str());
                        );
                }
        }
@@ -137,7 +137,7 @@
                return as_value();
        }
 
-       if (ns->play(fn.arg(0).to_string().c_str()) != 0)
+       if (ns->play(fn.arg(0).to_string(&fn.env())) != 0)
        {
                ns->close();
        };
@@ -150,19 +150,24 @@
        double time = 0;
        if (fn.nargs > 0)
        {
-               time = fn.arg(0).to_number();
+               time = fn.arg(0).to_number(&fn.env());
        }
        ns->seek(time);
 
        return as_value();
 }
-static as_value netstream_setbuffertime(const fn_call& fn) {
+
+static as_value netstream_setbuffertime(const fn_call& fn)
+{
+
+       //GNASH_REPORT_FUNCTION;
+
        boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
 
        double time = 0;
        if (fn.nargs > 0)
        {
-               time = fn.arg(0).to_number();
+               time = fn.arg(0).to_number(&fn.env());
        }
        ns->setBufferTime(time);
 
@@ -227,10 +232,12 @@
 static as_value
 netstream_time(const fn_call& fn)
 {
+       //GNASH_REPORT_FUNCTION;
 
        boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
 
-       return as_value(static_cast<double>(ns->time()));
+       assert(fn.nargs == 0); // we're a getter
+       return as_value(double(ns->time()));
 }
 
 // Both a getter and a (do-nothing) setter for bytesLoaded

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/NetStream.h    4 May 2007 15:21:00 -0000       1.28
+++ server/asobj/NetStream.h    5 May 2007 13:31:44 -0000       1.29
@@ -18,7 +18,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.28 2007/05/04 15:21:00 strk Exp $ */
+/*  $Id: NetStream.h,v 1.29 2007/05/05 13:31:44 strk Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -117,7 +117,7 @@
 
        virtual void pause(int /*mode*/){}
 
-       virtual int play(const char* /*source*/){ log_error("FFMPEG or 
Gstreamer is needed to play video"); return 0; }
+       virtual int play(const std::string& /*source*/){ log_error("FFMPEG or 
Gstreamer is needed to play video"); return 0; }
 
        virtual void seek(double /*pos*/){}
 

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/asobj/NetStreamFfmpeg.cpp    4 May 2007 21:40:50 -0000       1.45
+++ server/asobj/NetStreamFfmpeg.cpp    5 May 2007 13:31:44 -0000       1.46
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.45 2007/05/04 21:40:50 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.46 2007/05/05 13:31:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -198,7 +198,7 @@
 }
 
 int
-NetStreamFfmpeg::play(const char* c_url)
+NetStreamFfmpeg::play(const std::string& c_url)
 {
 
        // Is it already playing ?

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/NetStreamFfmpeg.h      1 May 2007 20:33:27 -0000       1.23
+++ server/asobj/NetStreamFfmpeg.h      5 May 2007 13:31:44 -0000       1.24
@@ -14,7 +14,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.23 2007/05/01 20:33:27 strk Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.24 2007/05/05 13:31:44 strk Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -178,7 +178,7 @@
        ~NetStreamFfmpeg();
        void close();
        void pause(int mode);
-       int play(const char* source);
+       int play(const std::string& source);
        void seek(double pos);
        void setBufferTime(double time);
        void setNetCon(as_object* nc);

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/NetStreamGst.cpp       4 May 2007 21:40:50 -0000       1.30
+++ server/asobj/NetStreamGst.cpp       5 May 2007 13:31:44 -0000       1.31
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamGst.cpp,v 1.30 2007/05/04 21:40:50 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.31 2007/05/05 13:31:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -135,7 +135,7 @@
 
 
 int
-NetStreamGst::play(const char* c_url)
+NetStreamGst::play(const std::string& c_url)
 {
 
        // Is it already playing ?

Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/NetStreamGst.h 1 May 2007 20:33:27 -0000       1.13
+++ server/asobj/NetStreamGst.h 5 May 2007 13:31:44 -0000       1.14
@@ -43,7 +43,7 @@
        ~NetStreamGst();
        void close();
        void pause(int mode);
-       int play(const char* source);
+       int play(const std::string& source);
        void seek(double pos);
        void setBufferTime(double time);
        void setNetCon(as_object* nc);