[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:40:50

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

Log message:
        Drop the 'owner' argument of NetConnection::openConnection 

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3096
retrieving revision 1.3097
diff -u -b -r1.3096 -r1.3097
--- ChangeLog   4 May 2007 21:18:07 -0000       1.3096
+++ ChangeLog   4 May 2007 21:40:50 -0000       1.3097
@@ -1,8 +1,8 @@
 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).
+         to take url by ref (not by pointer) and nothing else (drop owner
+         arg). 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.

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/asobj/NetConnection.cpp      4 May 2007 21:18:07 -0000       1.42
+++ server/asobj/NetConnection.cpp      4 May 2007 21:40:50 -0000       1.43
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetConnection.cpp,v 1.42 2007/05/04 21:18:07 strk Exp $ */
+/* $Id: NetConnection.cpp,v 1.43 2007/05/04 21:40:50 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -53,7 +53,6 @@
        :
        as_object(getNetConnectionInterface()),
        _url(),
-       _owner(NULL),
        _loader()
 {
        attachProperties();
@@ -64,7 +63,7 @@
 }
 
 /*public*/
-bool NetConnection::openConnection(const std::string& url, as_object* owner)
+bool NetConnection::openConnection(const std::string& url)
 {
 
        // if already running there is no need to setup things again
@@ -74,7 +73,6 @@
                return true;
        }
 
-       _owner = owner;
        if (_url.size() > 0) {
                _url += "/";
        }

Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/NetConnection.h        4 May 2007 21:18:07 -0000       1.28
+++ server/asobj/NetConnection.h        4 May 2007 21:40:50 -0000       1.29
@@ -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.28 2007/05/04 21:18:07 strk Exp $ */
+/* $Id: NetConnection.h,v 1.29 2007/05/04 21:40:50 strk Exp $ */
 
 #ifndef __NETCONNECTION_H__
 #define __NETCONNECTION_H__
@@ -58,9 +58,6 @@
        /// @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
@@ -68,7 +65,7 @@
        /// 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);
+       bool openConnection(const std::string& url);
 
        /// 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.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/asobj/NetStreamFfmpeg.cpp    4 May 2007 21:18:07 -0000       1.44
+++ server/asobj/NetStreamFfmpeg.cpp    4 May 2007 21:40:50 -0000       1.45
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.44 2007/05/04 21:18:07 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.45 2007/05/04 21:40:50 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, ns) ) {
+       if ( !nc->openConnection(ns->url) ) {
                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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/asobj/NetStreamGst.cpp       4 May 2007 21:18:07 -0000       1.29
+++ server/asobj/NetStreamGst.cpp       4 May 2007 21:40:50 -0000       1.30
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamGst.cpp,v 1.29 2007/05/04 21:18:07 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.30 2007/05/04 21:40:50 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, ns) ) {
+       if ( !nc->openConnection(ns->url) ) {
                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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/Sound.cpp      4 May 2007 21:18:07 -0000       1.16
+++ server/asobj/Sound.cpp      4 May 2007 21:40:50 -0000       1.17
@@ -146,7 +146,7 @@
        externalURL = file;
 
        connection = new NetConnection();
-       connection->openConnection(externalURL, this);
+       connection->openConnection(externalURL);
 }
 
 void

Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/SoundFfmpeg.cpp        4 May 2007 21:18:07 -0000       1.8
+++ server/asobj/SoundFfmpeg.cpp        4 May 2007 21:40:50 -0000       1.9
@@ -88,7 +88,7 @@
 
        // Pass stuff from/to the NetConnection object.
        assert(so);
-       if ( !nc->openConnection(so->externalURL, so) ) {
+       if ( !nc->openConnection(so->externalURL) ) {
                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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/SoundGst.cpp   4 May 2007 21:18:07 -0000       1.6
+++ server/asobj/SoundGst.cpp   4 May 2007 21:40:50 -0000       1.7
@@ -138,7 +138,7 @@
 
        // Pass stuff from/to the NetConnection object.
        assert(so);
-       if ( !nc->openConnection(so->externalURL, so) ) {
+       if ( !nc->openConnection(so->externalURL) ) {
                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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/SoundMad.cpp   4 May 2007 21:18:07 -0000       1.6
+++ server/asobj/SoundMad.cpp   4 May 2007 21:40:50 -0000       1.7
@@ -79,7 +79,7 @@
 
        // Pass stuff from/to the NetConnection object.
        assert(so);
-       if ( !nc->openConnection(so->externalURL, so) ) {
+       if ( !nc->openConnection(so->externalURL) ) {
                log_error(_("Gnash could not open audio url: %s"), 
so->externalURL.c_str());
                delete so->lock;
                return;