[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp gu... [relea
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp gu... [release_0_7_2] |
|
Date: |
Sat, 11 Nov 2006 14:06:53 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Sandro Santilli <strk> 06/11/11 14:06:53
Modified files:
. : ChangeLog
gui : Player.cpp gnash.cpp gtk.cpp
gtk_glue_gtkglext.cpp sdl_agg_glue.cpp
libamf : amf.cpp rtmp.cpp
libbase : log.cpp log.h network.cpp rc.cpp rc.h
server : as_function.cpp dlist.cpp movie_root.cpp
server/asobj : NetConnection.cpp
server/parser : action_buffer.cpp
server/swf : ASHandlers.cpp
testsuite/libbase: TCXXRc.cpp
testsuite/misc-ming.all: ButtonEventsTest-Runner.cpp
DefineEditTextVariableNameTest-Runner.cpp
RollOverOutTest-Runner.cpp
testsuite/movies.all: gravity_embedded-TestRunner.cpp
testsuite/samples: clip_as_button2-TestRunner.cpp
testsuite/server: GetterSetterTest.cpp PropertyListTest.cpp
utilities : parser.cpp processor.cpp
Log message:
global rcfile hidden as function-static of the new static
RcInitFile::getDefaultInstance() method.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.148&r2=1.1412.2.149
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.23.2.6&r2=1.23.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.53.2.7&r2=1.53.2.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.45.2.3&r2=1.45.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_gtkglext.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.7.2.2&r2=1.7.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_agg_glue.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.4.2.3&r2=1.4.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.19.2.1&r2=1.19.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/rtmp.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.9.2.1&r2=1.9.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.32.2.2&r2=1.32.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.30.2.5&r2=1.30.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.13.2.2&r2=1.13.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.11.2.5&r2=1.11.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.7.2.4&r2=1.7.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.31.2.3&r2=1.31.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.20.2.2&r2=1.20.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.8.2.2&r2=1.8.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.84.2.5&r2=1.84.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/RollOverOutTest-Runner.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/movies.all/gravity_embedded-TestRunner.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/clip_as_button2-TestRunner.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/GetterSetterTest.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/PropertyListTest.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.24.2.4&r2=1.24.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.29.2.6&r2=1.29.2.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.148
retrieving revision 1.1412.2.149
diff -u -b -r1.1412.2.148 -r1.1412.2.149
--- ChangeLog 11 Nov 2006 12:33:16 -0000 1.1412.2.148
+++ ChangeLog 11 Nov 2006 14:06:51 -0000 1.1412.2.149
@@ -1,3 +1,22 @@
+ * gui/Player.cpp, gui/gnash.cpp, gui/gtk.cpp,
+ gui/gtk_glue_gtkglext.cpp, gui/sdl_agg_glue.cpp, libamf/amf.cpp,
+ libamf/rtmp.cpp, libbase/log.cpp, libbase/log.h, libbase/network.cpp,
+ libbase/rc.cpp, libbase/rc.h, server/as_function.cpp,
+ server/dlist.cpp, server/movie_root.cpp,
+ server/asobj/NetConnection.cpp, server/parser/action_buffer.cpp,
+ server/swf/ASHandlers.cpp, testsuite/libbase/TCXXRc.cpp,
+ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,
+ testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp,
+ testsuite/misc-ming.all/RollOverOutTest-Runner.cpp,
+ testsuite/movies.all/gravity_embedded-TestRunner.cpp,
+ testsuite/samples/clip_as_button2-TestRunner.cpp,
+ testsuite/server/GetterSetterTest.cpp,
+ testsuite/server/PropertyListTest.cpp,
+ utilities/parser.cpp,
+ utilities/processor.cpp:
+ global rcfile hidden as function-static of the new
+ static RcInitFile::getDefaultInstance() method.
+
2006-11-11 Markus Gothe <address@hidden>
* backend/Makefile.am: Applied patch from Hiroyuki Ikezoe.
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.23.2.6
retrieving revision 1.23.2.7
diff -u -b -r1.23.2.6 -r1.23.2.7
--- gui/Player.cpp 11 Nov 2006 10:25:23 -0000 1.23.2.6
+++ gui/Player.cpp 11 Nov 2006 14:06:52 -0000 1.23.2.7
@@ -67,6 +67,9 @@
using namespace std;
using namespace gnash;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
/*static private*/
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.53.2.7
retrieving revision 1.53.2.8
diff -u -b -r1.53.2.7 -r1.53.2.8
--- gui/gnash.cpp 11 Nov 2006 10:25:23 -0000 1.53.2.7
+++ gui/gnash.cpp 11 Nov 2006 14:06:52 -0000 1.53.2.8
@@ -40,13 +40,18 @@
#include <iostream>
-using namespace gnash; // for dbglogfile
+//using namespace gnash; // for dbglogfile
using namespace std;
char* infile = NULL;
char* url = NULL;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
+};
+
static void
usage()
{
@@ -280,8 +285,7 @@
}
if ( ! specified_rendering_flag ) {
- RcInitFile& rcfile = RcInitFile::getDefaultInstance();
- log_msg("no rendering flags specified, using rcfile");
+ gnash::log_msg("no rendering flags specified, using rcfile");
if ( called_by_plugin ) {
player.setDoSound( rcfile.usePluginSound() );
} else {
@@ -313,7 +317,6 @@
{
gnash::Player player;
- RcInitFile& rcfile = RcInitFile::getDefaultInstance();
rcfile.loadFiles();
parseCommandLine(argc, argv, player);
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.45.2.3
retrieving revision 1.45.2.4
diff -u -b -r1.45.2.3 -r1.45.2.4
--- gui/gtk.cpp 5 Nov 2006 23:35:34 -0000 1.45.2.3
+++ gui/gtk.cpp 11 Nov 2006 14:06:52 -0000 1.45.2.4
@@ -40,6 +40,10 @@
using namespace std;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
namespace gnash
{
Index: gui/gtk_glue_gtkglext.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_gtkglext.cpp,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -b -r1.7.2.2 -r1.7.2.3
--- gui/gtk_glue_gtkglext.cpp 31 Oct 2006 19:31:49 -0000 1.7.2.2
+++ gui/gtk_glue_gtkglext.cpp 11 Nov 2006 14:06:52 -0000 1.7.2.3
@@ -14,13 +14,16 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: gtk_glue_gtkglext.cpp,v 1.7.2.2 2006/10/31 19:31:49 rsavoye Exp $ */
+/* $Id: gtk_glue_gtkglext.cpp,v 1.7.2.3 2006/11/11 14:06:52 strk Exp $ */
#include "gtk_glue_gtkglext.h"
#include "log.h"
using namespace std;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
namespace gnash
{
Index: gui/sdl_agg_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_agg_glue.cpp,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -b -r1.4.2.3 -r1.4.2.4
--- gui/sdl_agg_glue.cpp 1 Nov 2006 17:05:42 -0000 1.4.2.3
+++ gui/sdl_agg_glue.cpp 11 Nov 2006 14:06:52 -0000 1.4.2.4
@@ -23,6 +23,9 @@
using namespace std;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
namespace gnash
{
Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -b -r1.19.2.1 -r1.19.2.2
--- libamf/amf.cpp 30 Oct 2006 14:28:47 -0000 1.19.2.1
+++ libamf/amf.cpp 11 Nov 2006 14:06:52 -0000 1.19.2.2
@@ -18,7 +18,7 @@
//
//
-/* $Id: amf.cpp,v 1.19.2.1 2006/10/30 14:28:47 rsavoye Exp $ */
+/* $Id: amf.cpp,v 1.19.2.2 2006/11/11 14:06:52 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -43,6 +43,10 @@
using namespace std;
using namespace gnash;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
namespace amf
{
Index: libamf/rtmp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/rtmp.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- libamf/rtmp.cpp 30 Oct 2006 14:28:47 -0000 1.9.2.1
+++ libamf/rtmp.cpp 11 Nov 2006 14:06:52 -0000 1.9.2.2
@@ -35,6 +35,10 @@
using namespace amf;
using namespace std;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
namespace gnash
{
Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -u -b -r1.32.2.2 -r1.32.2.3
--- libbase/log.cpp 9 Nov 2006 10:13:12 -0000 1.32.2.2
+++ libbase/log.cpp 11 Nov 2006 14:06:52 -0000 1.32.2.3
@@ -18,7 +18,7 @@
//
//
-/* $Id: log.cpp,v 1.32.2.2 2006/11/09 10:13:12 strk Exp $ */
+/* $Id: log.cpp,v 1.32.2.3 2006/11/11 14:06:52 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -138,12 +138,24 @@
// This is a bit of a hack. We impleemnt wrappers for the old
// functions so we don't have to change files everywhere, but get the
// new behaviours, like logging to disk.
-LogFile dbglogfile;
+// THIS IS DANGEROUS AS TIME OF INITIALIZATION IS UNPREDICTABLE,
+// THUS WE NOW HAVE A LogFile::getDefaultInstance() TO MAKE SURE
+// INITIALIZATION OF THE GLOBAL data HAPPENS BEFORE USE
+//LogFile dbglogfile;
+
+LogFile&
+LogFile::getDefaultInstance()
+{
+ static LogFile o;
+ return o;
+}
// Printf-style informational log.
void
log_msg(const char* fmt, ...)
{
+ LogFile& dbglogfile = LogFile::getDefaultInstance();
+
va_list ap;
char tmp[BUFFER_SIZE];
@@ -179,6 +191,8 @@
void
log_trace(const char* fmt, ...)
{
+ LogFile& dbglogfile = LogFile::getDefaultInstance();
+
va_list ap;
char tmp[BUFFER_SIZE];
@@ -195,6 +209,7 @@
void
log_action(const char* fmt, ...)
{
+ LogFile& dbglogfile = LogFile::getDefaultInstance();
#if 0 // callers shoudl always use IF_VERBOSE_ACTION
if ( ! dbglogfile.getActionDump() )
{
@@ -218,6 +233,8 @@
void
log_parse(const char* fmt, ...)
{
+ LogFile& dbglogfile = LogFile::getDefaultInstance();
+
#if 0 // callers should always use IF_VERBOSE_PARSE
if ( ! dbglogfile.getParserDump() )
{
@@ -241,6 +258,8 @@
void
log_error(const char* fmt, ...)
{
+ LogFile& dbglogfile = LogFile::getDefaultInstance();
+
va_list ap;
char tmp[BUFFER_SIZE];
@@ -256,6 +275,8 @@
void
log_warning(const char* fmt, ...)
{
+ LogFile& dbglogfile = LogFile::getDefaultInstance();
+
va_list ap;
char tmp[BUFFER_SIZE];
@@ -271,6 +292,8 @@
void
log_security(const char* fmt, ...)
{
+ LogFile& dbglogfile = LogFile::getDefaultInstance();
+
va_list ap;
char tmp[BUFFER_SIZE];
Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.30.2.5
retrieving revision 1.30.2.6
diff -u -b -r1.30.2.5 -r1.30.2.6
--- libbase/log.h 9 Nov 2006 12:27:01 -0000 1.30.2.5
+++ libbase/log.h 11 Nov 2006 14:06:52 -0000 1.30.2.6
@@ -17,7 +17,7 @@
//
//
-/* $Id: log.h,v 1.30.2.5 2006/11/09 12:27:01 strk Exp $ */
+/* $Id: log.h,v 1.30.2.6 2006/11/11 14:06:52 strk Exp $ */
#ifndef GNASH_LOG_H
#define GNASH_LOG_H
@@ -62,6 +62,9 @@
public:
LogFile (void);
LogFile (const char *);
+
+ static LogFile& getDefaultInstance();
+
~LogFile(void) {
if (_state == OPEN) {
closeLog();
@@ -187,13 +190,13 @@
#ifdef VERBOSE_PARSE
-#define IF_VERBOSE_PARSE(x) do { if ( dbglogfile.getParserDump() ) { x; } }
while (0);
+#define IF_VERBOSE_PARSE(x) do { if (
LogFile::getDefaultInstance().getParserDump() ) { x; } } while (0);
#else
#define IF_VERBOSE_PARSE(x)
#endif
#ifdef VERBOSE_ACTION
-#define IF_VERBOSE_ACTION(x) do { if ( dbglogfile.getActionDump() ) { x; } }
while (0);
+#define IF_VERBOSE_ACTION(x) do { if (
LogFile::getDefaultInstance().getActionDump() ) { x; } } while (0);
#else
#define IF_VERBOSE_ACTION(x)
#endif
@@ -212,8 +215,6 @@
#define IF_VERBOSE_MALFORMED_SWF(x)
#endif
-extern DSOEXPORT LogFile dbglogfile;
-
class DSOEXPORT __Host_Function_Report__ {
public:
const char *func;
@@ -235,7 +236,7 @@
}
~__Host_Function_Report__(void) {
- if (dbglogfile.getVerbosity() >= TRACELEVEL+1) {
+ if (LogFile::getDefaultInstance().getVerbosity() >= TRACELEVEL+1) {
log_trace("returning");
}
}
Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -b -r1.13.2.2 -r1.13.2.3
--- libbase/network.cpp 31 Oct 2006 17:38:47 -0000 1.13.2.2
+++ libbase/network.cpp 11 Nov 2006 14:06:52 -0000 1.13.2.3
@@ -54,6 +54,10 @@
using namespace std;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
namespace gnash {
static const char *DEFAULTPROTO = "tcp";
Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -b -r1.11.2.5 -r1.11.2.6
--- libbase/rc.cpp 11 Nov 2006 10:25:23 -0000 1.11.2.5
+++ libbase/rc.cpp 11 Nov 2006 14:06:52 -0000 1.11.2.6
@@ -129,7 +129,7 @@
// Parse the config file and set the variables.
bool
-RcInitFile::parseFile(string filespec)
+RcInitFile::parseFile(const string& filespec)
{
// GNASH_REPORT_FUNCTION;
struct stat stats;
@@ -147,7 +147,7 @@
in.open(filespec.c_str());
if (!in) {
- dbglogfile << "ERROR: Couldn't open file: " << filespec << endl;
+ log_error("Couldn't open file: %s", filespec.c_str());
return false;
}
@@ -222,7 +222,7 @@
// Write the changed settings to the config file
bool
-RcInitFile::updateFile(string /* filespec */)
+RcInitFile::updateFile(const string& /* filespec */)
{
cerr << __PRETTY_FUNCTION__ << "ERROR: unimplemented!" << endl;
return false;
Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -b -r1.7.2.4 -r1.7.2.5
--- libbase/rc.h 11 Nov 2006 10:25:23 -0000 1.7.2.4
+++ libbase/rc.h 11 Nov 2006 14:06:52 -0000 1.7.2.5
@@ -42,8 +42,8 @@
bool loadFiles();
- bool parseFile(std::string filespec);
- bool updateFile(std::string filespec);
+ bool parseFile(const std::string& filespec);
+ bool updateFile(const std::string& filespec);
bool useSplashScreen() { return _splash_screen; };
void useSplashScreen(bool value);
Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- server/as_function.cpp 8 Nov 2006 08:24:17 -0000 1.1.2.5
+++ server/as_function.cpp 11 Nov 2006 14:06:52 -0000 1.1.2.6
@@ -35,6 +35,10 @@
using namespace std;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
namespace gnash {
// should be static, probably
Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -b -r1.31.2.3 -r1.31.2.4
--- server/dlist.cpp 7 Nov 2006 16:24:04 -0000 1.31.2.3
+++ server/dlist.cpp 11 Nov 2006 14:06:52 -0000 1.31.2.4
@@ -26,6 +26,10 @@
#include <iostream>
#include <algorithm>
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
namespace gnash {
class DepthEquals {
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -b -r1.20.2.2 -r1.20.2.3
--- server/movie_root.cpp 7 Nov 2006 16:24:04 -0000 1.20.2.2
+++ server/movie_root.cpp 11 Nov 2006 14:06:52 -0000 1.20.2.3
@@ -24,12 +24,6 @@
#include <string>
#include "movie_root.h"
-//#include "tu_file.h"
-//#include "zlib_adapter.h"
-//#include "stream.h"
-//#include "jpeg.h"
-//#include "fontlib.h"
-//#include "font.h"
#include "log.h"
#include "sprite_instance.h"
#include "render.h"
@@ -38,6 +32,10 @@
using namespace std;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
namespace gnash
{
Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -b -r1.8.2.2 -r1.8.2.3
--- server/asobj/NetConnection.cpp 31 Oct 2006 17:38:47 -0000 1.8.2.2
+++ server/asobj/NetConnection.cpp 11 Nov 2006 14:06:52 -0000 1.8.2.3
@@ -33,6 +33,10 @@
using namespace std;
using namespace amf;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
namespace gnash {
/// \class NetConnection
Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- server/parser/action_buffer.cpp 30 Oct 2006 14:28:54 -0000 1.7.2.1
+++ server/parser/action_buffer.cpp 11 Nov 2006 14:06:52 -0000 1.7.2.2
@@ -16,7 +16,7 @@
//
-/* $Id: action_buffer.cpp,v 1.7.2.1 2006/10/30 14:28:54 rsavoye Exp $ */
+/* $Id: action_buffer.cpp,v 1.7.2.2 2006/11/11 14:06:52 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -26,7 +26,6 @@
#include "ActionExec.h"
#include "log.h"
#include "stream.h"
-
#include "swf.h"
#include "ASHandlers.h"
#include "as_environment.h"
@@ -39,16 +38,16 @@
#include <string>
-using namespace gnash;
-using namespace SWF;
using std::string;
using std::endl;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
+}
namespace gnash {
-static const SWFHandlers& ash = SWFHandlers::instance();
-
action_buffer::action_buffer()
:
m_decl_dict_processed_at(-1)
@@ -192,6 +191,8 @@
disasm(const unsigned char* instruction_data)
{
+ using namespace gnash::SWF;
+
as_arg_t fmt = ARG_HEX;
action_type action_id = (action_type)instruction_data[0];
unsigned char num[10];
Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.84.2.5
retrieving revision 1.84.2.6
diff -u -b -r1.84.2.5 -r1.84.2.6
--- server/swf/ASHandlers.cpp 7 Nov 2006 11:47:21 -0000 1.84.2.5
+++ server/swf/ASHandlers.cpp 11 Nov 2006 14:06:52 -0000 1.84.2.6
@@ -16,7 +16,7 @@
//
-/* $Id: ASHandlers.cpp,v 1.84.2.5 2006/11/07 11:47:21 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.84.2.6 2006/11/11 14:06:52 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -50,6 +50,10 @@
using namespace std;
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+};
+
// Define this to have WaitForFrame actions really
// wait for target frame (and never skip actions)
// See:
Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- testsuite/libbase/TCXXRc.cpp 9 Nov 2006 17:08:32 -0000 1.4.2.2
+++ testsuite/libbase/TCXXRc.cpp 11 Nov 2006 14:06:52 -0000 1.4.2.3
@@ -67,9 +67,10 @@
TestState runtest;
int
-main (int argc, char **argv) {
+main (int /*argc*/, char** /*argv*/) {
RcInitFile rc;
+ gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity();
// Parse the test config file
Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp 30 Oct 2006 14:28:55
-0000 1.3.2.1
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp 11 Nov 2006 14:06:52
-0000 1.3.2.2
@@ -43,6 +43,7 @@
// I wouldn't want the first advance to be needed
tester.advance();
+ gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity(1);
sprite_instance* root = tester.getRootMovie();
Index: testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp 6 Nov
2006 11:07:33 -0000 1.1.2.2
+++ testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner.cpp 11 Nov
2006 14:06:52 -0000 1.1.2.3
@@ -39,6 +39,7 @@
string filename = INPUT_FILENAME;
MovieTester tester(filename);
+ gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity(1);
sprite_instance* root = tester.getRootMovie();
Index: testsuite/misc-ming.all/RollOverOutTest-Runner.cpp
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/misc-ming.all/RollOverOutTest-Runner.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- testsuite/misc-ming.all/RollOverOutTest-Runner.cpp 30 Oct 2006 14:28:55
-0000 1.1.2.1
+++ testsuite/misc-ming.all/RollOverOutTest-Runner.cpp 11 Nov 2006 14:06:52
-0000 1.1.2.2
@@ -43,6 +43,7 @@
// I wouldn't want the first advance to be needed
tester.advance();
+ gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity(1);
sprite_instance* root = tester.getRootMovie();
Index: testsuite/movies.all/gravity_embedded-TestRunner.cpp
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/movies.all/gravity_embedded-TestRunner.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- testsuite/movies.all/gravity_embedded-TestRunner.cpp 2 Nov 2006
14:34:18 -0000 1.1.2.1
+++ testsuite/movies.all/gravity_embedded-TestRunner.cpp 11 Nov 2006
14:06:52 -0000 1.1.2.2
@@ -43,6 +43,7 @@
// I wouldn't want the first advance to be needed
tester.advance();
+ gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity(1);
sprite_instance* root = tester.getRootMovie();
Index: testsuite/samples/clip_as_button2-TestRunner.cpp
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/samples/clip_as_button2-TestRunner.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- testsuite/samples/clip_as_button2-TestRunner.cpp 30 Oct 2006 14:28:55
-0000 1.1.2.1
+++ testsuite/samples/clip_as_button2-TestRunner.cpp 11 Nov 2006 14:06:52
-0000 1.1.2.2
@@ -43,6 +43,7 @@
// I wouldn't want the first advance to be needed
tester.advance();
+ gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity(1);
sprite_instance* root = tester.getRootMovie();
Index: testsuite/server/GetterSetterTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/GetterSetterTest.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- testsuite/server/GetterSetterTest.cpp 5 Nov 2006 00:20:42 -0000
1.1.2.2
+++ testsuite/server/GetterSetterTest.cpp 11 Nov 2006 14:06:52 -0000
1.1.2.3
@@ -75,6 +75,7 @@
main(int /*argc*/, char** /*argv*/)
{
+ gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity();
test_object obj("initial text");
Index: testsuite/server/PropertyListTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/PropertyListTest.cpp,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- testsuite/server/PropertyListTest.cpp 5 Nov 2006 00:20:42 -0000
1.2.2.2
+++ testsuite/server/PropertyListTest.cpp 11 Nov 2006 14:06:52 -0000
1.2.2.3
@@ -35,7 +35,7 @@
int
main(int /*argc*/, char** /*argv*/)
{
-
+ gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
dbglogfile.setVerbosity();
as_object obj;
Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -b -r1.24.2.4 -r1.24.2.5
--- utilities/parser.cpp 11 Nov 2006 10:25:24 -0000 1.24.2.4
+++ utilities/parser.cpp 11 Nov 2006 14:06:53 -0000 1.24.2.5
@@ -16,7 +16,7 @@
//
//
-/* $Id: parser.cpp,v 1.24.2.4 2006/11/11 10:25:24 strk Exp $ */
+/* $Id: parser.cpp,v 1.24.2.5 2006/11/11 14:06:53 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -76,7 +76,11 @@
using namespace gnash;
static void usage (const char *);
-//static RcInitFile rcfile;
+
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
+};
namespace parser
{
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -b -r1.29.2.6 -r1.29.2.7
--- utilities/processor.cpp 11 Nov 2006 10:25:24 -0000 1.29.2.6
+++ utilities/processor.cpp 11 Nov 2006 14:06:53 -0000 1.29.2.7
@@ -17,7 +17,7 @@
//
//
-/* $Id: processor.cpp,v 1.29.2.6 2006/11/11 10:25:24 strk Exp $ */
+/* $Id: processor.cpp,v 1.29.2.7 2006/11/11 14:06:53 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -70,9 +70,13 @@
using namespace std;
using namespace gnash;
-//static RcInitFile rcfile;
static void usage (const char *);
+namespace {
+gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
+};
+
struct movie_data
{
gnash::movie_definition* m_movie;
- [Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp gu... [release_0_7_2],
Sandro Santilli <=