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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/03/01 10:05:51

Modified files:
        .              : ChangeLog 
        server/asobj   : NetConnection.cpp NetStreamFfmpeg.cpp 

Log message:
        * server/asobj/NetConnection.cpp: Added support for relative path.
        * server/asobj/NetStreamFfmpeg.cpp: include sound_handler.h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2506&r2=1.2507
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2506
retrieving revision 1.2507
diff -u -b -r1.2506 -r1.2507
--- ChangeLog   1 Mar 2007 09:38:18 -0000       1.2506
+++ ChangeLog   1 Mar 2007 10:05:51 -0000       1.2507
@@ -1,3 +1,8 @@
+2007-03-01 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetConnection.cpp: Added support for relative path.
+       * server/asobj/NetStreamFfmpeg.cpp: include sound_handler.h.
+
 2007-03-01 Udo Giacomozzi <address@hidden>
 
        * server/video_stream_instance.cpp: simplify add_invalidated_bounds()

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/NetConnection.cpp      25 Feb 2007 16:31:48 -0000      1.24
+++ server/asobj/NetConnection.cpp      1 Mar 2007 10:05:51 -0000       1.25
@@ -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.cpp,v 1.24 2007/02/25 16:31:48 strk Exp $ */
+/* $Id: NetConnection.cpp,v 1.25 2007/03/01 10:05:51 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -214,7 +214,9 @@
        localFile = false;
 
 
-       URL uri(_url);
+       URL uri(_url, get_base_url());
+
+       _url = uri.str().c_str();
 
        // Check if we're allowed to open url
        if (URLAccessManager::allow(uri)) {
@@ -223,16 +225,19 @@
                {
                        localFile = true;
                }
+
        } else {
+               log_warning("Gnash is not allowed to open this url.");
                return false;
        }
 
        if (localFile) {
-               _cache = fopen(char_url, "rb");
+               _cache = fopen(uri.path().c_str(), "rb");
                if (_cache) {
                        _cachefd = fileno(_cache);
                        return true;
                } else {
+                       log_warning("Gnash failed to open local file.");
                        _cachefd = -1;
                        return false;
                }
@@ -273,7 +278,7 @@
        }
 
        // set url
-       ccode = curl_easy_setopt(_handle, CURLOPT_URL, char_url);
+       ccode = curl_easy_setopt(_handle, CURLOPT_URL, _url.c_str());
        if ( ccode != CURLE_OK ) {
                throw gnash::GnashException(curl_easy_strerror(ccode));
        }
@@ -318,6 +323,7 @@
                throw gnash::GnashException(curl_multi_strerror(mcode));
        }
        fill_cache(50000); // pre-cache 50 Kbytes
+
 #endif // defined USE_CURL
 
        return true;
@@ -327,7 +333,9 @@
 void
 NetConnection::addToURL(const char* url)
 {
+       if (strcmp(url, "null") != 0 && strcmp(url, "NULL") != 0) {
        _url += url;
+       }
 }
 
 /*public*/

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/asobj/NetStreamFfmpeg.cpp    21 Feb 2007 14:51:01 -0000      1.18
+++ server/asobj/NetStreamFfmpeg.cpp    1 Mar 2007 10:05:51 -0000       1.19
@@ -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.cpp,v 1.18 2007/02/21 14:51:01 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.19 2007/03/01 10:05:51 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,6 +29,7 @@
 #include "render.h"    
 #include "movie_root.h"
 #include "NetConnection.h"
+#include "sound_handler.h"
 
 #include "tu_file.h"