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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/04 21:18:07

Modified files:
        .              : ChangeLog 
        server/asobj   : NetConnection.cpp NetConnection.h 
                         NetStreamFfmpeg.cpp NetStreamGst.cpp Sound.cpp 
                         SoundFfmpeg.cpp SoundGst.cpp SoundMad.cpp 

Log message:
                * server/asobj/NetConnection.{cpp,h}: change openConnection 
interface
                  to take url by ref (not by pointer). Stubbed documentation of 
the
                  method (needs more info).
                * server/asobj/: NetStreamFfmpeg.cpp, NetStreamGst.cpp, 
Sound.cpp,
                  SoundFfmpeg.cpp, SoundGst.cpp, SoundMad.cpp:
                  Updated calls to openConnection.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3095&r2=1.3096
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3095
retrieving revision 1.3096
diff -u -b -r1.3095 -r1.3096
--- ChangeLog   4 May 2007 20:42:42 -0000       1.3095
+++ ChangeLog   4 May 2007 21:18:07 -0000       1.3096
@@ -1,5 +1,14 @@
 2007-05-03 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetConnection.{cpp,h}: change openConnection interface
+         to take url by ref (not by pointer). Stubbed documentation of the
+         method (needs more info).
+       * server/asobj/: NetStreamFfmpeg.cpp, NetStreamGst.cpp, Sound.cpp,
+         SoundFfmpeg.cpp, SoundGst.cpp, SoundMad.cpp:
+         Updated calls to openConnection.
+
+2007-05-03 Sandro Santilli <address@hidden>
+
        * server/asobj/NetConnection.{cpp,h}: keep _loader by auto_ptr, some
          comments and interfaces cleanup.
        * server/asobj/: NetStreamFfmpeg.cpp, NetStreamGst.cpp: update calls

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/asobj/NetConnection.cpp      4 May 2007 20:42:42 -0000       1.41
+++ server/asobj/NetConnection.cpp      4 May 2007 21:18:07 -0000       1.42
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetConnection.cpp,v 1.41 2007/05/04 20:42:42 strk Exp $ */
+/* $Id: NetConnection.cpp,v 1.42 2007/05/04 21:18:07 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -63,16 +63,8 @@
 {
 }
 
-/// Open a connection to stream FLV files.
-//
-/// \param arg is the URL
-/// \return true on success, false on error.
-/// \note Older Flash movies can only take a NULL value as
-/// the parameter, which therefor only connects to the localhost using
-/// RTMP. Newer Flash movies have a parameter to connect which is a
-/// URL string like rtmp://foobar.com/videos/bar.flv
 /*public*/
-bool NetConnection::openConnection(const char* char_url, as_object* owner)
+bool NetConnection::openConnection(const std::string& url, as_object* owner)
 {
 
        // if already running there is no need to setup things again
@@ -86,7 +78,7 @@
        if (_url.size() > 0) {
                _url += "/";
        }
-       _url += char_url;
+       _url += url;
 
        URL uri(_url, get_base_url());
 

Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/NetConnection.h        4 May 2007 20:42:42 -0000       1.27
+++ server/asobj/NetConnection.h        4 May 2007 21:18:07 -0000       1.28
@@ -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: NetConnection.h,v 1.27 2007/05/04 20:42:42 strk Exp $ */
+/* $Id: NetConnection.h,v 1.28 2007/05/04 21:18:07 strk Exp $ */
 
 #ifndef __NETCONNECTION_H__
 #define __NETCONNECTION_H__
@@ -53,8 +53,22 @@
        NetConnection();
        ~NetConnection();
 
-       /// Opens the connection to char_url
-       bool openConnection(const char* char_url, as_object* owner);
+       /// Open a connection to stream FLV files.
+       //
+       /// @param url
+       ///     An url portion to append to the base url (???)
+       ///
+       /// @param owner 
+       ///     ???
+       ///
+       /// @return true on success, false on error.
+       ///
+       /// @note Older Flash movies can only take a NULL value as
+       /// the parameter, which therefor only connects to the localhost using
+       /// RTMP. Newer Flash movies have a parameter to connect which is a
+       /// URL string like rtmp://foobar.com/videos/bar.flv
+       ///
+       bool openConnection(const std::string& url, as_object* owner);
 
        /// Put read pointer at given position
        bool seek(size_t pos);

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/asobj/NetStreamFfmpeg.cpp    4 May 2007 20:42:42 -0000       1.43
+++ server/asobj/NetStreamFfmpeg.cpp    4 May 2007 21:18:07 -0000       1.44
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.43 2007/05/04 20:42:42 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.44 2007/05/04 21:18:07 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -365,7 +365,7 @@
 
        // Pass stuff from/to the NetConnection object.
        assert(ns);
-       if ( !nc->openConnection(ns->url.c_str(), ns) ) {
+       if ( !nc->openConnection(ns->url, ns) ) {
                log_error(_("Gnash could not open movie: %s"), ns->url.c_str());
                ns->setStatus(streamNotFound);
                return;

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/NetStreamGst.cpp       4 May 2007 20:42:42 -0000       1.28
+++ server/asobj/NetStreamGst.cpp       4 May 2007 21:18:07 -0000       1.29
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamGst.cpp,v 1.28 2007/05/04 20:42:42 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.29 2007/05/04 21:18:07 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -326,7 +326,7 @@
 
        // Pass stuff from/to the NetConnection object.
        assert(ns);
-       if ( !nc->openConnection(ns->url.c_str(), ns) ) {
+       if ( !nc->openConnection(ns->url, ns) ) {
                ns->setStatus(streamNotFound);
                log_debug(_("Gnash could not open movie: %s"), ns->url.c_str());
                return;

Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/Sound.cpp      18 Apr 2007 14:07:32 -0000      1.15
+++ server/asobj/Sound.cpp      4 May 2007 21:18:07 -0000       1.16
@@ -146,7 +146,7 @@
        externalURL = file;
 
        connection = new NetConnection();
-       connection->openConnection(externalURL.c_str(), this);
+       connection->openConnection(externalURL, this);
 }
 
 void

Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/SoundFfmpeg.cpp        18 Apr 2007 14:07:32 -0000      1.7
+++ server/asobj/SoundFfmpeg.cpp        4 May 2007 21:18:07 -0000       1.8
@@ -88,7 +88,7 @@
 
        // Pass stuff from/to the NetConnection object.
        assert(so);
-       if ( !nc->openConnection(so->externalURL.c_str(), so) ) {
+       if ( !nc->openConnection(so->externalURL, so) ) {
                log_error(_("%s could not open audio url: %s"), 
                                __FUNCTION__, so->externalURL.c_str());
                delete so->lock;

Index: server/asobj/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/asobj/SoundGst.cpp   18 Apr 2007 14:07:32 -0000      1.5
+++ server/asobj/SoundGst.cpp   4 May 2007 21:18:07 -0000       1.6
@@ -138,7 +138,7 @@
 
        // Pass stuff from/to the NetConnection object.
        assert(so);
-       if ( !nc->openConnection(so->externalURL.c_str(), so) ) {
+       if ( !nc->openConnection(so->externalURL, so) ) {
                log_error(_("could not open audio url: %s"), 
so->externalURL.c_str());
                delete so->lock;
                return;

Index: server/asobj/SoundMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/asobj/SoundMad.cpp   2 May 2007 19:47:33 -0000       1.5
+++ server/asobj/SoundMad.cpp   4 May 2007 21:18:07 -0000       1.6
@@ -79,7 +79,7 @@
 
        // Pass stuff from/to the NetConnection object.
        assert(so);
-       if ( !nc->openConnection(so->externalURL.c_str(), so) ) {
+       if ( !nc->openConnection(so->externalURL, so) ) {
                log_error(_("Gnash could not open audio url: %s"), 
so->externalURL.c_str());
                delete so->lock;
                return;