[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11503: make all the extensions comp
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11503: make all the extensions compile after they bit-rotted due to avm API changes. |
Date: |
Wed, 09 Sep 2009 14:27:25 -0600 |
User-agent: |
Bazaar (1.16.1) |
------------------------------------------------------------
revno: 11503
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2009-09-09 14:27:25 -0600
message:
make all the extensions compile after they bit-rotted due to avm API changes.
modified:
extensions/dbus/dbus_ext.cpp
extensions/dejagnu/dejagnu.cpp
extensions/fileio/fileio.cpp
extensions/lirc/lirc_ext.cpp
extensions/metome/metome_ext.cpp
extensions/mysql/mysql_db.cpp
=== modified file 'extensions/dbus/dbus_ext.cpp'
--- a/extensions/dbus/dbus_ext.cpp 2009-07-29 06:12:26 +0000
+++ b/extensions/dbus/dbus_ext.cpp 2009-09-09 20:27:25 +0000
@@ -31,6 +31,7 @@
#include "dbus_ext.h"
#include "fn_call.h"
#include "as_object.h"
+#include "Globals.h"
#include "builtin_function.h" // need builtin_function
using namespace std;
@@ -69,6 +70,7 @@
attachInterface(as_object *obj)
{
GNASH_REPORT_FUNCTION;
+ Global_as* gl = getGlobal(*obj);
obj->init_member("setSocketName",
gl->createFunction(dbus_ext_setsockname));
}
@@ -121,17 +123,17 @@
{
// GNASH_REPORT_FUNCTION;
// This is going to be the global "class"/"function"
- static boost::intrusive_ptr<builtin_function> cl;
+ as_object *cl;
if (cl == NULL) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(obj);
as_object* proto = getInterface();
cl = gl->createClass(&dbus_ctor, proto);
// // replicate all interface to class, to be able to access
// // all methods as static functions
- attachInterface(cl.get());
+ attachInterface(cl);
}
- obj.init_member("Dbus", cl.get());
+ obj.init_member("Dbus", cl);
}
} // end of extern C
=== modified file 'extensions/dejagnu/dejagnu.cpp'
--- a/extensions/dejagnu/dejagnu.cpp 2009-07-29 06:12:26 +0000
+++ b/extensions/dejagnu/dejagnu.cpp 2009-09-09 20:27:25 +0000
@@ -26,6 +26,7 @@
#include "dejagnu.h"
#include "fn_call.h"
#include "as_object.h"
+#include "Globals.h"
#include "builtin_function.h" // need builtin_function
using namespace std;
@@ -47,7 +48,8 @@
attachInterface(as_object *obj)
{
// GNASH_REPORT_FUNCTION;
-
+ Global_as* gl = getGlobal(*obj);
+
obj->init_member("pass", gl->createFunction(dejagnu_pass));
obj->init_member("fail", gl->createFunction(dejagnu_fail));
obj->init_member("totals", gl->createFunction(dejagnu_totals));
@@ -158,17 +160,17 @@
{
// GNASH_REPORT_FUNCTION;
// 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);
+ Global_as* gl = getGlobal(obj);
cl = gl->createClass(&dejagnu_ctor, proto);
// // replicate all interface to class, to be able to access
// // all methods as static functions
- attachInterface(cl.get());
+ attachInterface(cl);
}
- obj.init_member("DejaGnu", cl.get());
+ obj.init_member("DejaGnu", cl);
}
} // end of extern C
=== modified file 'extensions/fileio/fileio.cpp'
--- a/extensions/fileio/fileio.cpp 2009-09-09 19:30:55 +0000
+++ b/extensions/fileio/fileio.cpp 2009-09-09 20:27:25 +0000
@@ -602,13 +602,13 @@
extern "C" {
void
- fileio_class_init(as_object& where, const ObjectURI& uri)
+ 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"
- as_object *cl;
+ as_object *cl = 0;
if (cl == NULL) {
as_object* proto = getInterface();
cl = gl->createClass(&fileio_ctor, proto);
@@ -616,10 +616,12 @@
// // all methods as static functions
//attachInterface(*cl);
}
-
+#if 0
where.init_member(getName(uri), cl, as_object::DefaultFlags,
getNamespace(uri));
- // where.init_member("FileIO", cl.get());
+#else
+ where.init_member("FileIO", cl);
+#endif
}
} // end of extern C
=== modified file 'extensions/lirc/lirc_ext.cpp'
--- a/extensions/lirc/lirc_ext.cpp 2009-07-29 06:12:26 +0000
+++ b/extensions/lirc/lirc_ext.cpp 2009-09-09 20:27:25 +0000
@@ -32,6 +32,7 @@
#include "lirc_ext.h"
#include "fn_call.h"
#include "as_object.h"
+#include "Globals.h"
#include "builtin_function.h" // need builtin_function
using namespace std;
@@ -53,6 +54,8 @@
attachInterface(as_object *obj)
{
GNASH_REPORT_FUNCTION;
+ Global_as* gl = getGlobal(*obj);
+
obj->init_member("lirc_init", gl->createFunction(lirc_ext_init));
obj->init_member("lirc_getKey", gl->createFunction(lirc_ext_getkey));
obj->init_member("lirc_getButton", gl->createFunction(lirc_ext_getbutton));
@@ -143,17 +146,17 @@
{
// GNASH_REPORT_FUNCTION;
// This is going to be the global "class"/"function"
- static boost::intrusive_ptr<builtin_function> cl;
+ as_object *cl;
if (cl == NULL) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(obj);
as_object* proto = getInterface();
cl = gl->createClass(&lirc_ctor, proto);
// // replicate all interface to class, to be able to access
// // all methods as static functions
- attachInterface(cl.get());
+ attachInterface(cl);
}
- obj.init_member("Lirc", cl.get());
+ obj.init_member("Lirc", cl);
}
} // end of extern C
=== modified file 'extensions/metome/metome_ext.cpp'
--- a/extensions/metome/metome_ext.cpp 2009-07-29 06:12:26 +0000
+++ b/extensions/metome/metome_ext.cpp 2009-09-09 20:27:25 +0000
@@ -31,6 +31,7 @@
#include "metome_ext.h"
#include "fn_call.h"
#include "as_object.h"
+#include "Globals.h"
#include "builtin_function.h" // need builtin_function
using namespace std;
@@ -69,6 +70,7 @@
attachInterface(as_object *obj)
{
GNASH_REPORT_FUNCTION;
+ Global_as* gl = getGlobal(*obj);
obj->init_member("connect", gl->createFunction(metome_ext_connect));
}
@@ -121,17 +123,17 @@
{
// GNASH_REPORT_FUNCTION;
// This is going to be the global "class"/"function"
- static boost::intrusive_ptr<builtin_function> cl;
+ as_object *cl;
if (cl == NULL) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(obj);
as_object* proto = getInterface();
cl = gl->createClass(&metome_ctor, proto);
// // replicate all interface to class, to be able to access
// // all methods as static functions
- attachInterface(cl.get());
+ attachInterface(cl);
}
- obj.init_member("Metome", cl.get());
+ obj.init_member("Metome", cl);
}
} // end of extern C
=== modified file 'extensions/mysql/mysql_db.cpp'
--- a/extensions/mysql/mysql_db.cpp 2009-07-29 06:12:26 +0000
+++ b/extensions/mysql/mysql_db.cpp 2009-09-09 20:27:25 +0000
@@ -32,6 +32,7 @@
#include "as_value.h"
#include "fn_call.h"
#include "mysql_db.h"
+#include "Globals.h"
#include "builtin_function.h" // need builtin_function
using namespace std;
@@ -62,6 +63,7 @@
attachInterface(as_object *obj)
{
// GNASH_REPORT_FUNCTION;
+ Global_as* gl = getGlobal(*obj);
obj->init_member("connect", gl->createFunction(mysql_connect));
obj->init_member("qetData", gl->createFunction(mysql_qetData));
@@ -419,16 +421,16 @@
{
// GNASH_REPORT_FUNCTION;
// This is going to be the global "class"/"function"
- static boost::intrusive_ptr<builtin_function> cl;
+ as_object *cl;
if (cl == NULL) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(obj);
as_object* proto = getInterface();
cl = gl->createClass(&mysql_ctor, proto);
// // replicate all interface to class, to be able to access
// // all methods as static functions
- attachInterface(cl.get());
+ attachInterface(cl);
}
- obj.init_member("MySQL", cl.get());
+ obj.init_member("MySQL", cl);
}
} // end of extern C
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11503: make all the extensions compile after they bit-rotted due to avm API changes.,
Rob Savoye <=