[Gnash-commit] /srv/bzr/gnash/trunk r11497: build with the newer avm changes.

[Rob Savoye]

------------------------------------------------------------
revno: 11497
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2009-09-09 13:30:55 -0600
message:
  build with the newer avm changes.
modified:
  extensions/fileio/fileio.cpp
  extensions/fileio/fileio.h

=== modified file 'extensions/fileio/fileio.cpp'
--- a/extensions/fileio/fileio.cpp      2009-08-23 04:20:56 +0000
+++ b/extensions/fileio/fileio.cpp      2009-09-09 19:30:55 +0000
@@ -34,6 +34,7 @@
 #include "fn_call.h"
 #include "as_object.h"
 #include "builtin_function.h" // need builtin_function
+#include "Globals.h"
 #include "fileio.h"
 #include "Array_as.h"  // used by scandir()
 
@@ -78,6 +79,8 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
+    Global_as* gl = getGlobal(obj);
+    
     obj.init_member("fopen", gl->createFunction(fileio_fopen));
     obj.init_member("fread", gl->createFunction(fileio_fread));
     obj.init_member("fgetc", gl->createFunction(fileio_fgetc));
@@ -599,21 +602,24 @@
 
 extern "C" {
     void
-    fileio_class_init(as_object &obj)
+    fileio_class_init(as_object& where, const ObjectURI& uri)
     {
 //     GNASH_REPORT_FUNCTION;
+       Global_as* gl = getGlobal(where);
+       
        // This is going to be the global "class"/"function"
-       static boost::intrusive_ptr<builtin_function> cl;
+       as_object *cl;
        if (cl == NULL) {
         as_object* proto = getInterface();
-        Global_as* gl = getGlobal(global);
         cl = gl->createClass(&fileio_ctor, proto);
 //         // replicate all interface to class, to be able to access
 //         // all methods as static functions
            //attachInterface(*cl);
        }
        
-       obj.init_member("FileIO", cl.get());
+       where.init_member(getName(uri), cl, as_object::DefaultFlags,
+                         getNamespace(uri));
+       // where.init_member("FileIO", cl.get());
     }
 } // end of extern C
 

=== modified file 'extensions/fileio/fileio.h'
--- a/extensions/fileio/fileio.h        2009-02-25 22:30:19 +0000
+++ b/extensions/fileio/fileio.h        2009-09-09 19:30:55 +0000
@@ -62,7 +62,7 @@
 };
 
 extern "C" {
-    void fileio_class_init(as_object &obj);  
+    void fileio_class_init(as_object& global, const ObjectURI& uri);  
     /// Return an  instance
 }