[Gnash-commit] gnash ./ChangeLog gui/gnash.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Bastiaan Jacques <address@hidden>       06/05/17 00:27:30

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp 

Log message:
        Update to recent API changes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.341&tr2=1.342&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gnash.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.341 gnash/ChangeLog:1.342
--- gnash/ChangeLog:1.341       Tue May 16 23:50:15 2006
+++ gnash/ChangeLog     Wed May 17 00:27:30 2006
@@ -1,5 +1,9 @@
 2006-05-16 Bastiaan Jacques <address@hidden>
 
+       * gui/gnash.cpp: Update to recent API changes.
+
+2006-05-16 Bastiaan Jacques <address@hidden>
+
        * macros/gtkglext.m4: Prepend only one -I per added include dir.
 
 2006-05-16 Bastiaan Jacques <address@hidden>
Index: gnash/gui/gnash.cpp
diff -u gnash/gui/gnash.cpp:1.10 gnash/gui/gnash.cpp:1.11
--- gnash/gui/gnash.cpp:1.10    Sat May 13 05:45:27 2006
+++ gnash/gui/gnash.cpp Wed May 17 00:27:30 2006
@@ -61,6 +61,9 @@
 #include "gnash.h"
 #include "movie_definition.h"
 
+#include "URL.h"
+#include "GnashException.h"
+
 using namespace std;
 using namespace gnash;
 
@@ -258,7 +261,10 @@
        return EXIT_FAILURE;
     }
 
+#if 0
+    // strk removed this function..
     gnash::register_file_opener_callback(file_opener);
+#endif
     gnash::register_fscommand_callback(fs_callback);
 
     std::auto_ptr<gnash::sound_handler>  sound;
@@ -275,8 +281,14 @@
     int        movie_version = 0, movie_width = 0, movie_height = 0;
     float movie_fps = 30.0f;
 
-    gnash::get_movie_info(infile, &movie_version, &movie_width,
-                          &movie_height, &movie_fps, NULL, NULL);
+    try {
+      gnash::get_movie_info(URL(infile), &movie_version, &movie_width,
+      &movie_height, &movie_fps, NULL, NULL);
+    } catch (const GnashException& er) {
+      fprintf(stderr, "%s\n", er.what());
+      movie_version = 0;
+    }
+
     if (movie_version == 0) {
       std::cerr << "Error: can't get info about " << infile << "." << endl;
       return EXIT_FAILURE;
@@ -301,14 +313,19 @@
     gui.createWindow(width, height);
 
     // Load the actual movie.
-    smart_ptr<gnash::movie_definition> md = 
gnash::create_library_movie(infile);
-    if (!md.get_ptr())
-      return EXIT_FAILURE;
+    gnash::movie_definition *md;
+ 
+    try {
+      md = gnash::create_library_movie(URL(infile));
+    } catch (const GnashException& er) {
+      fprintf(stderr, "%s\n", er.what());
+      md = NULL;
+    }
 
-    smart_ptr<gnash::movie_interface>  m = 
create_library_movie_inst(md.get_ptr());
-    assert(m.get_ptr());
+    gnash::movie_interface *m = create_library_movie_inst(md);
+    assert(m);
 
-    gnash::set_current_root(m.get_ptr());
+    gnash::set_current_root(m);
 
     m->set_display_viewport(0, 0, width, height);
     m->set_background_alpha(background ? 1.0f : 0.05f);