[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash backend/Makefile.am gui/Makefile.am libam...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash backend/Makefile.am gui/Makefile.am libam... |
|
Date: |
Fri, 27 Apr 2007 01:08:51 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/04/27 01:08:51
Modified files:
backend : Makefile.am
gui : Makefile.am
libamf : Makefile.am
libbase : Makefile.am
libgeometry : Makefile.am
server/asobj : Makefile.am
server/parser : Makefile.am
server/vm : Makefile.am
server : Makefile.am
extensions/dejagnu: dejagnu.cpp
extensions/mysql: mysql_db.cpp
extensions/gtk2: gtkext.cpp
Added files:
po : Makefile.am
Log message:
* libbase/Makefile.am: Build all libraries with a release
number,
and add --export-dynamic and -no-undefined. Add gettext.h.
* backend/Makefile.am: Build all libraries with a release
number,
and add --export-dynamic and -no-undefined.
* server/Makefile.am: Build all libraries with a release number,
and add --export-dynamic and -no-undefined.
* libgeometry/Makefile.am: Build all libraries with a release
number, and add --export-dynamic and -no-undefined.
* server/vm/Makefile.am: Build all libraries with a release
number, and add --export-dynamic and -no-undefined.
* server/parser/Makefile.am: Build all libraries with a release
number, and add --export-dynamic and -no-undefined.
* server/asobjs/Makefile.am: Build all libraries with a release
number, and add --export-dynamic and -no-undefined.
* extensions/dejagnu/dejagnu.cpp: Use instrusive pointers
instead
of hard pointers for handlers.
* extensions/fileio/fileio.cpp: Use instrusive pointers instead
of hard pointers for handlers.
* extensions/mysql/mysql_db.cpp: Use instrusive pointers instead
of hard pointers for handlers.
* extensions/gtk2/gtkext.cpp: Use instrusive pointers instead
of hard pointers for handlers.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/gnash/po/Makefile.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/dejagnu.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/mysql/mysql_db.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/gtk2/gtkext.cpp?cvsroot=gnash&r1=1.2&r2=1.3
Patches:
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- backend/Makefile.am 28 Mar 2007 23:42:19 -0000 1.52
+++ backend/Makefile.am 27 Apr 2007 01:08:50 -0000 1.53
@@ -125,7 +125,7 @@
$(RENDER_SOURCES) \
$(SOUND_SOURCES)
-libgnashbackend_la_LDFLAGS = -avoid-version
+libgnashbackend_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- gui/Makefile.am 10 Apr 2007 18:18:45 -0000 1.64
+++ gui/Makefile.am 27 Apr 2007 01:08:50 -0000 1.65
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.64 2007/04/10 18:18:45 rsavoye Exp $
+# $Id: Makefile.am,v 1.65 2007/04/27 01:08:50 rsavoye Exp $
AUTOMAKE_OPTIONS =
localedir = $(datadir)/locale
@@ -224,7 +224,8 @@
$(top_builddir)/server/parser/libgnashparser.la \
$(top_builddir)/libgeometry/libgnashgeo.la \
$(top_builddir)/libbase/libgnashbase.la \
- libgnashplayer.la
+ libgnashplayer.la \
+ libgnashgui.la
libgnashplayer_la_SOURCES = \
Player.cpp Player.h
@@ -237,7 +238,7 @@
gnash_SOURCES = gnash.cpp
# export our symbols so they can be used by Gnash plugins
-gnash_LDFLAGS = -export-dynamic
+gnash_LDFLAGS = -no-undefined -export-dynamic
gnash_DEPENDENCIES = $(GNASH_LIBS)
gnash_LDADD = \
$(MYSQL_LIBS) \
@@ -274,8 +275,8 @@
#guitest_SOURCES = guitest.cpp #fltk.cpp #fltksup.h fltksupp.h gnash.cpp
gtk.cpp
# gtksup.h gui.cpp gui.h menu.cpp menu.h sdl.cpp sdlsup.h [21~sdlsupp.h
#guitest_LDADD = $(gnash_LDADD)
-libgnashplayer_la_LDFLAGS = -avoid-version
-libgnashgui_la_LDFLAGS = -avoid-version
+libgnashplayer_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashgui_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libamf/Makefile.am 16 Mar 2007 15:00:49 -0000 1.21
+++ libamf/Makefile.am 27 Apr 2007 01:08:50 -0000 1.22
@@ -15,22 +15,20 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.21 2007/03/16 15:00:49 rsavoye Exp $
+# $Id: Makefile.am,v 1.22 2007/04/27 01:08:50 rsavoye Exp $
AUTOMAKE_OPTIONS =
#AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(AM_CPPFLAGS)
#AM_CPPFLAGS =
AM_LDFLAGS = \
- $(top_builddir)/libbase/libgnashbase.la \
- $(DMALLOC_LIBS)
-
+ $(top_builddir)/libbase/libgnashbase.la
# AM_LDFLAGS = $(OPENGL_LIBNS) $(SDL_LIBS)
lib_LTLIBRARIES = libgnashamf.la
libgnashamf_la_SOURCES = amf.cpp rtmp.cpp
-libgnashamf_la_LDFLAGS = -avoid-version
+libgnashamf_la_LDFLAGS = -release $(VERSION) -export-dynamic -no-undefined
# noinst_HEADERS = amf.h amfutf8.h
AM_CPPFLAGS = -I.. -I$(srcdir) \
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- libbase/Makefile.am 13 Apr 2007 07:35:55 -0000 1.62
+++ libbase/Makefile.am 27 Apr 2007 01:08:50 -0000 1.63
@@ -108,6 +108,7 @@
extension.h \
embedVideoDecoder.h \
GnashException.h \
+ gettext.h \
grid_index.h \
image.h \
jpeg.h \
@@ -156,7 +157,7 @@
# libgnashbase_la_LDFLAGS = -export-dynamic
-libgnashbase_la_LDFLAGS = -avoid-version
+libgnashbase_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
# We use our own rule to build the demo so it isn't built by default.
# Since it doesn't contain a main() routine, we only try to compile,
Index: libgeometry/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- libgeometry/Makefile.am 28 Feb 2007 17:25:26 -0000 1.25
+++ libgeometry/Makefile.am 27 Apr 2007 01:08:50 -0000 1.26
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.25 2007/02/28 17:25:26 udog Exp $
+# $Id: Makefile.am,v 1.26 2007/04/27 01:08:50 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -67,10 +67,9 @@
view_state.h \
visual.h
-#libgeometry_la_LDFLAGS = -module -avoid-version -no-undefined
#libgeometry_la_LIBDADD = address@hidden@ # $(LIBLTDL)
libgnashgeo_la_LIBADD = $(top_builddir)/libbase/libgnashbase.la
-libgnashgeo_la_LDFLAGS = -avoid-version
+libgnashgeo_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/asobj/Makefile.am 10 Apr 2007 18:18:46 -0000 1.34
+++ server/asobj/Makefile.am 27 Apr 2007 01:08:50 -0000 1.35
@@ -15,7 +15,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: Makefile.am,v 1.34 2007/04/10 18:18:46 rsavoye Exp $
+# $Id: Makefile.am,v 1.35 2007/04/27 01:08:50 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -137,7 +137,7 @@
libgnashasobjs_la_LIBADD += $(MAD_LIBS)
endif
-libgnashasobjs_la_LDFLAGS = -avoid-version
+libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/parser/Makefile.am 10 Apr 2007 18:18:45 -0000 1.28
+++ server/parser/Makefile.am 27 Apr 2007 01:08:51 -0000 1.29
@@ -15,7 +15,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: Makefile.am,v 1.28 2007/04/10 18:18:45 rsavoye Exp $
+# $Id: Makefile.am,v 1.29 2007/04/27 01:08:51 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -78,9 +78,7 @@
libgnashparser_la_LIBADD = \
$(top_builddir)/libbase/libgnashbase.la
-libgnashparser_la_LDFLAGS = \
- -avoid-version \
- $(BOOST_LIBS)
+libgnashparser_la_LDFLAGS = $(BOOST_LIBS) -release $(VERSION) -no-undefined
-export-dynamic
if USE_SOUND_GST
AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/vm/Makefile.am 10 Apr 2007 18:18:45 -0000 1.9
+++ server/vm/Makefile.am 27 Apr 2007 01:08:51 -0000 1.10
@@ -15,7 +15,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: Makefile.am,v 1.9 2007/04/10 18:18:45 rsavoye Exp $
+# $Id: Makefile.am,v 1.10 2007/04/27 01:08:51 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -58,10 +58,9 @@
$(NULL)
libgnashvm_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libbase/libgnashbase.la
-libgnashvm_la_LDFLAGS = -avoid-version -export-dynamic
+libgnashvm_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- server/Makefile.am 11 Apr 2007 14:20:20 -0000 1.109
+++ server/Makefile.am 27 Apr 2007 01:08:51 -0000 1.110
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.109 2007/04/11 14:20:20 strk Exp $
+# $Id: Makefile.am,v 1.110 2007/04/27 01:08:51 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -174,9 +174,8 @@
libgnashserver_la_SOURCES += debugger.cpp
endif
-#libserver_la_LDFLAGS = -module -avoid-version -no-undefined
#libserver_la_LIBDADD = address@hidden@ # $(LIBLTDL)
-libgnashserver_la_LDFLAGS = -avoid-version
+libgnashserver_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: extensions/dejagnu/dejagnu.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/dejagnu.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- extensions/dejagnu/dejagnu.cpp 22 Mar 2007 22:37:45 -0000 1.7
+++ extensions/dejagnu/dejagnu.cpp 27 Apr 2007 01:08:51 -0000 1.8
@@ -66,7 +66,7 @@
}
static as_value
-dejagnu_ctor(const fn_call& fn)
+dejagnu_ctor(const fn_call& /* fn */)
{
// GNASH_REPORT_FUNCTION;
dejagnu_as_object* obj = new dejagnu_as_object();
@@ -112,12 +112,11 @@
dejagnu_pass(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- dejagnu_as_object *ptr = (dejagnu_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<dejagnu_as_object> ptr =
ensureType<dejagnu_as_object>(fn.this_ptr);
if (fn.nargs > 0) {
- const char *text = fn.arg(0).to_string();
- return as_value(ptr->obj.pass(text));
+ string text = fn.arg(0).to_string();
+ return as_value(ptr->obj.pass(text.c_str()));
}
}
@@ -125,12 +124,11 @@
dejagnu_fail(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- dejagnu_as_object *ptr = (dejagnu_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<dejagnu_as_object> ptr =
ensureType<dejagnu_as_object>(fn.this_ptr);
if (fn.nargs > 0) {
- const char *text = fn.arg(0).to_string();
- return as_value(ptr->obj.fail(text));
+ string text = fn.arg(0).to_string();
+ return as_value(ptr->obj.fail(text.c_str()));
}
}
@@ -138,8 +136,7 @@
dejagnu_totals(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- dejagnu_as_object *ptr = (dejagnu_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<dejagnu_as_object> ptr =
ensureType<dejagnu_as_object>(fn.this_ptr);
ptr->obj.totals();
return as_value(true);
Index: extensions/mysql/mysql_db.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/mysql_db.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- extensions/mysql/mysql_db.cpp 18 Apr 2007 09:35:41 -0000 1.8
+++ extensions/mysql/mysql_db.cpp 27 Apr 2007 01:08:51 -0000 1.9
@@ -16,6 +16,10 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <cstdarg>
#include <mysql/errmsg.h>
@@ -241,7 +245,7 @@
case CR_SERVER_LOST:
case CR_COMMANDS_OUT_OF_SYNC:
case CR_SERVER_GONE_ERROR:
- log_error(_("MySQL connection error: %s", mysql_error(_db));
+ log_error(_("MySQL connection error: %s"), mysql_error(_db));
// Try to reconnect to the database
// closeDB();
// openDB();
@@ -298,15 +302,15 @@
{
// GNASH_REPORT_FUNCTION;
- mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
if (fn.nargs == 4) {
- const char *host = fn.arg(0).to_string();
- const char *db = fn.arg(1).to_string();
- const char *user = fn.arg(2).to_string();
- const char *passwd = fn.arg(3).to_string();
- return as_value(ptr->obj.connect(host, db, user, passwd));
+ string host = fn.arg(0).to_string();
+ string db = fn.arg(1).to_string();
+ string user = fn.arg(2).to_string();
+ string passwd = fn.arg(3).to_string();
+ return as_value(ptr->obj.connect(host.c_str(), db.c_str(),
+ user.c_str(), passwd.c_str()));
} else {
return as_value(false);
}
@@ -317,12 +321,11 @@
{
// GNASH_REPORT_FUNCTION;
- mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
if (fn.nargs > 0) {
- const char *sql = fn.arg(0).to_string();
- as_array_object *arr = (as_array_object *)fn.arg(1).to_object();
+ string sql = fn.arg(0).to_string();
+ as_array_object *arr = (as_array_object *)fn.arg(1).to_object().get();
// std::vector< std::vector<const char *> >
MySQL::query_t qresult;
#if 0
@@ -348,8 +351,7 @@
mysql_free(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
ptr->obj.free_result();
return as_value(true);
}
@@ -358,8 +360,7 @@
mysql_fields(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
return as_value(ptr->obj.num_fields());
}
@@ -368,7 +369,7 @@
{
// GNASH_REPORT_FUNCTION;
if (fn.nargs > 0) {
- mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
+ boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
assert(ptr);
MYSQL_ROW res = ptr->obj.fetch_row();
as_value aaa = *res;
@@ -382,8 +383,7 @@
mysql_store(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
return as_value(ptr->obj.store_result());
}
@@ -391,11 +391,10 @@
mysql_query(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
+ boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
if (fn.nargs > 0) {
- const char *sql = fn.arg(0).to_string();
- assert(ptr);
- return as_value(ptr->obj.guery(sql));
+ string sql = fn.arg(0).to_string();
+ return as_value(ptr->obj.guery(sql.c_str()));
}
}
@@ -404,8 +403,7 @@
{
// GNASH_REPORT_FUNCTION;
- mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
- assert(ptr);
+ boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
return as_value(ptr->obj.disconnect());
}
Index: extensions/gtk2/gtkext.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/gtk2/gtkext.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- extensions/gtk2/gtkext.cpp 19 Mar 2007 17:11:14 -0000 1.2
+++ extensions/gtk2/gtkext.cpp 27 Apr 2007 01:08:51 -0000 1.3
@@ -37,6 +37,7 @@
#include "builtin_function.h" // need builtin_function
#include "debugger.h"
#include "gtkext.h"
+//#include "Player.h"
using namespace std;
@@ -47,6 +48,7 @@
#ifdef USE_DEBUGGER
static Debugger& debugger = Debugger::getDefaultInstance();
#endif
+//Player& player = Player::getDefaultInstance();
// prototypes for the callbacks required by Gnash
as_value gtkext_window_new(const fn_call& fn);
@@ -93,7 +95,7 @@
// FIXME: Delete events don't seem to pass in data in a form we
// can access it. So for now we just hack in a quit, since we know
// we're done, we hope...
- if (*event == NULL) {
+ if (*event == 0) {
gtk_main_quit();
return;
} else {
@@ -105,9 +107,10 @@
env.push_val(handler.to_object());
env.push(event);
env.push(handler.to_string());
+ as_object obj = val.to_object();
// Call the AS function defined in the source file using this extension
- (*as_func)(fn_call(&val, handler.to_object(), &env, 2, 2));
+ (*as_func)(fn_call(&obj, &env, 2, 2));
}
static void
@@ -164,6 +167,9 @@
GtkExt::window_new()
{
GNASH_REPORT_FUNCTION;
+// std::auto_ptr<Gui> ggg = player.getGuiHandle();
+// player.getGuiHandle();
+// gui.getWindow();
_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
}
@@ -202,8 +208,7 @@
as_value gtkext_window_new(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
- assert(ptr);
+ boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
GtkExt *obj = new GtkExt;
obj->window_new();
@@ -215,12 +220,11 @@
as_value gtkext_signal_connect(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
- assert(ptr);
+ boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
if (fn.nargs > 0) {
- GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
- string name = fn.arg(1).to_std_string();
+ GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
+ string name = fn.arg(1).to_string();
as_value func = fn.arg(2).to_as_function();
int data = fn.arg(3).to_number();
@@ -239,11 +243,10 @@
{
// GNASH_REPORT_FUNCTION;
- GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
- assert(ptr);
+ boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
if (fn.nargs > 0) {
- GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
+ GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
int width = fn.arg(1).to_number();
window->container_set_border_width(width);
dbglogfile << "set container border width to " << width << " !" << endl;
@@ -256,13 +259,12 @@
as_value gtkext_button_new_with_label(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
- assert(ptr);
+ boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
if (fn.nargs > 0) {
- const char *label = fn.arg(0).to_string();
+ string label = fn.arg(0).to_string();
GtkExt *obj = new GtkExt;
- obj->button_new_with_label(label);
+ obj->button_new_with_label(label.c_str());
return as_value(obj);
}
return as_value();
@@ -281,15 +283,14 @@
as_value gtkext_signal_connect_swapped(const fn_call& fn)
{
GNASH_REPORT_FUNCTION;
- GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
- assert(ptr);
-
+ boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
if (fn.nargs > 0) {
- GtkExt *parent = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
+ GtkExt *parent = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
string name = (fn.arg(1).to_string());
- GtkExt *child = dynamic_cast<GtkExt *>(fn.arg(3).to_object());
- as_value *callback = dynamic_cast<as_value *>(fn.arg(2).to_object());
+ GtkExt *child = dynamic_cast<GtkExt *>(fn.arg(3).to_object().get());
+// currently unused
+// as_value *callback = dynamic_cast<as_value *>(fn.arg(2).to_object());
// FIXME: This seems to cause an Gobject warning
g_signal_connect_swapped (G_OBJECT (child->getWindow()), name.c_str(),
@@ -303,12 +304,11 @@
as_value gtkext_container_add(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
- assert(ptr);
+ boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
if (fn.nargs > 0) {
- GtkExt *parent = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
- GtkExt *child = dynamic_cast<GtkExt *>(fn.arg(1).to_object());
+ GtkExt *parent = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
+ GtkExt *child = dynamic_cast<GtkExt *>(fn.arg(1).to_object().get());
gtk_container_add (GTK_CONTAINER (parent->getWindow()),
child->getWindow());
return as_value(true);
}
@@ -318,11 +318,10 @@
as_value gtkext_widget_show(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
- assert(ptr);
+ boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
if (fn.nargs > 0) {
- GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
+ GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
gtk_widget_show(window->getWindow());
}
return as_value();
@@ -332,8 +331,7 @@
as_value gtkext_main(const fn_call& fn)
{
// GNASH_REPORT_FUNCTION;
- GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
- assert(ptr);
+ boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
gtk_main();
return as_value();
@@ -354,8 +352,8 @@
static boost::intrusive_ptr<builtin_function> cl;
if (cl == NULL) {
cl = new builtin_function(>kext_ctor, getInterface());
-// // replicate all interface to class, to be able to access
-// // all methods as static functions
+ // replicate all interface to class, to be able to access
+ // all methods as static functions
attachInterface(cl.get());
}
Index: po/Makefile.am
===================================================================
RCS file: po/Makefile.am
diff -N po/Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/Makefile.am 27 Apr 2007 01:08:51 -0000 1.1
@@ -0,0 +1,65 @@
+POFILES = AUTO
+
+
+CLEANFILES = \
+ *.gmo \
+ gnash.pot \
+ POTFILES \
+ update-po
+
+translations = es fr
+
+pofiles := $(patsubst %,%.po,$(translations))
+gmofiles := $(patsubst %,%.gmo,$(translations))
+
+dirs = $(top_srcdir)/libbase \
+ $(top_srcdir)/backend \
+ $(top_srcdir)/server \
+ $(top_srcdir)/server/vm \
+ $(top_srcdir)/server/swf \
+ $(top_srcdir)/server/parser \
+ $(top_srcdir)/server/asobjs \
+ $(top_srcdir)/libgeometry \
+ $(top_srcdir)/utilities \
+ $(top_srcdir)/gui
+srcfiles := $(foreach dir,$(dirs),$(wildcard $(dir)/*.cpp))
+
+EXTRA_DIST = $(gmofiles)
+
+all: $(gmofiles)
+
+if HAS_GETTEXT
+POTFILES: $(srcfiles)
+ @echo "Building POTFILES..."
+ @rm -f POTFILES
+ @for i in $(srcfiles) ; do \
+ echo "$$i" >> POTFILES;\
+ done
+
+gnash.pot: POTFILES
+ $(XGETTEXT) --language=C++ --files-from=POTFILES -o gnash.pot \
+ --default-domain=gnash --force \
+ --copyright-holder='Free Software Foundation, Inc.'
+
+update-po: gnash.pot
+ @for i in $(pofiles); do \
+ echo "Merging $$i..." ; \
+ $(MSGMERGE) --update $(srcdir)/$$i gnash.pot; \
+ done
+ touch update-po
+
+$(gmofiles): update-po
+
+SUFFIXES = .po .gmo
+.po.gmo:
+ msgfmt --statistics --directory=$(srcdir) -o $*.gmo $*.po
+else
+$(gmofiles): force
+ @for i in $(gmofiles); do \
+ ln -fs $(srcdir)/$$i.in $$i; \
+ done
+endif
+
+force:
+
+# install-hook: rename the es.gmo files to gnash.mo at installtion time
- [Gnash-commit] gnash backend/Makefile.am gui/Makefile.am libam...,
Rob Savoye <=