[Gnash-commit] gnash ./ChangeLog plugin/klash/klash.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/24 10:11:45

Modified files:
        .              : ChangeLog 
        plugin/klash   : klash.cpp 

Log message:
        * plugin/klash/klash.cpp: made URL aware (patch by Bernhard 
Rosenkraenzer)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.374&tr2=1.375&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.374 gnash/ChangeLog:1.375
--- gnash/ChangeLog:1.374       Wed May 24 09:39:40 2006
+++ gnash/ChangeLog     Wed May 24 10:11:45 2006
@@ -1,3 +1,7 @@
+2006-05-24 Bernhard Rosenkraenzer <address@hidden>
+
+       * plugin/klash/klash.cpp: made URL aware.
+
 2006-05-24 Sandro Santilli <address@hidden>
 
        * plugin/klash/klash.cpp: removed oboleted
Index: gnash/plugin/klash/klash.cpp
diff -u gnash/plugin/klash/klash.cpp:1.6 gnash/plugin/klash/klash.cpp:1.7
--- gnash/plugin/klash/klash.cpp:1.6    Wed May 24 09:39:40 2006
+++ gnash/plugin/klash/klash.cpp        Wed May 24 10:11:45 2006
@@ -67,6 +67,7 @@
 #include "tu_types.h"
 #include "xmlsocket.h"
 #include "movie_definition.h"
+#include "URL.h"
 
 using namespace std;
 using namespace gnash;
@@ -431,7 +432,7 @@
     int        movie_width = 0;
     int        movie_height = 0;
     float      movie_fps = 30.0f;
-    gnash::get_movie_info(infiles[0], &movie_version, &movie_width,
+    gnash::get_movie_info(URL(infiles[0]), &movie_version, &movie_width,
                           &movie_height, &movie_fps, NULL, NULL);
     if (movie_version == 0) {
         fprintf(stderr, "error: can't get info about %s\n", infiles[0]);
@@ -492,7 +493,7 @@
     }
     
     // Load the actual movie.
-    gnash::movie_definition*   md = gnash::create_library_movie(infiles[0]);
+    gnash::movie_definition*   md = 
gnash::create_library_movie(URL(infiles[0]));
     if (md == NULL) {
         fprintf(stderr, "error: can't create a movie from '%s'\n", infiles[0]);
         exit(1);