[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp backe...
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp backe... |
|
Date: |
Tue, 19 Feb 2008 19:20:59 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/02/19 19:20:58
Modified files:
. : ChangeLog
testsuite : MovieTester.cpp
backend : render_handler.h render_handler_agg.cpp
render_handler_agg_style.h
render_handler_ogl.cpp
cygnal : crc.cpp cygnal.cpp http.cpp statistics.cpp
stream.cpp
extensions/dejagnu: dejagnu.cpp
extensions/mysql: mysql_db.cpp
gui : Player.cpp fb.cpp gnash.cpp gtk.cpp
gtk_glue_agg.cpp gtk_glue_gtkglext.cpp gui.cpp
riscos.cpp riscos_glue_agg.cpp sdl.cpp
sdl_agg_glue.cpp
libamf : amf.cpp rtmp.cpp sol.cpp
libbase : curl_adapter.cpp extension.cpp log.cpp log.h
network.cpp sharedlib.cpp shm.cpp
libmedia/gst : VideoDecoderGst.cpp
plugin : plugin.cpp
plugin/win32 : plugin.cpp
server : BitmapMovieInstance.cpp
FreetypeGlyphsProvider.cpp
LoadVariablesThread.cpp LoadVariablesThread.h
PropertyList.cpp PropertyList.h
URLAccessManager.cpp array.cpp
as_environment.cpp as_function.cpp
as_object.cpp as_object.h character.cpp
debugger.cpp dlist.cpp edit_text_character.cpp
font.cpp impl.cpp matrix.cpp movie_root.cpp
sprite_instance.cpp sprite_instance.h
stream.cpp swf_function.cpp text.cpp
textformat.cpp timers.cpp tools.cpp
server/asobj : Global.cpp LoadVars.cpp LocalConnection.cpp
MovieClipLoader.cpp NetConnection.cpp
NetStreamFfmpeg.cpp NetStreamGst.cpp Object.cpp
SharedObject.cpp Sound.cpp SoundGst.cpp
Stage.cpp string.cpp xml.cpp xmlattrs.h
xmlnode.cpp xmlnode.h xmlsocket.cpp
server/parser : BitmapMovieDefinition.cpp action_buffer.cpp
movie_def_impl.cpp shape_character_def.cpp
sprite_definition.cpp sprite_definition.h
server/swf : PlaceObject2Tag.cpp tag_loaders.cpp
server/vm : ASHandlers.cpp ActionExec.cpp ExecutableCode.h
action.cpp
testsuite/libamf.all: test_lc.cpp
testsuite/misc-ming.all: loadMovieTestRunner.cpp
utilities : dumpshm.cpp processor.cpp
Log message:
* libbase/log.{h,cpp}: drop log_msg.
* everywhere: replace unspecific log_msg with appropriate log
call; mainly
log_debug but occasionally error, parse or security.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5694&r2=1.5695
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg_style.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/crc.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/http.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/statistics.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/stream.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/dejagnu.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/mysql/mysql_db.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fb.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.146&r2=1.147
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_gtkglext.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/riscos.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/riscos_glue_agg.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_agg_glue.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/rtmp.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/sol.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/shm.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/VideoDecoderGst.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapMovieInstance.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/LoadVariablesThread.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/LoadVariablesThread.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.160&r2=1.161
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.478&r2=1.479
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.169&r2=1.170
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/tools.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LocalConnection.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlattrs.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.185&r2=1.186
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.195&r2=1.196
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ExecutableCode.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_lc.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.83&r2=1.84
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5694
retrieving revision 1.5695
diff -u -b -r1.5694 -r1.5695
--- ChangeLog 19 Feb 2008 16:04:25 -0000 1.5694
+++ ChangeLog 19 Feb 2008 19:20:46 -0000 1.5695
@@ -1,3 +1,9 @@
+2008-02-19 Benjamin Wolsey <address@hidden>
+
+ * libbase/log.{h,cpp}: drop log_msg.
+ * everywhere: replace unspecific log_msg with appropriate log call;
mainly
+ log_debug but occasionally error, parse or security.
+
2008-02-19 Rob Savoye <address@hidden>
* macros/docbook.m4: Look for the scripts with a .pl extension if
Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- testsuite/MovieTester.cpp 21 Jan 2008 23:26:49 -0000 1.66
+++ testsuite/MovieTester.cpp 19 Feb 2008 19:20:47 -0000 1.67
@@ -271,7 +271,7 @@
{
std::stringstream ss;
ss << "exp:" << color.toShortString() << " ";
- log_msg("UNTESTED: NORENDERER: pix:%d,%d %s %s", x, y,
ss.str().c_str(), label.c_str());
+ log_debug("UNTESTED: NORENDERER: pix:%d,%d %s %s", x, y,
ss.str().c_str(), label.c_str());
}
FuzzyPixel exp(color, tolerance);
@@ -296,7 +296,7 @@
if ( ! handler.getAveragePixel(obt_col, x, y, radius) )
{
ss << " is out of rendering buffer";
- log_msg("%sFAILED: %s (%s)", X,
+ log_debug("%sFAILED: %s (%s)", X,
ss.str().c_str(),
label.c_str()
);
@@ -323,14 +323,14 @@
FuzzyPixel obt(obt_col, tol);
if (exp == obt) // equality operator would use tolerance of
most tolerating FuzzyPixel
{
- log_msg("%sPASSED: %s %s", X,
+ log_debug("%sPASSED: %s %s", X,
ss.str().c_str(),
label.c_str()
);
}
else
{
- log_msg("%sFAILED: %s %s", X,
+ log_debug("%sFAILED: %s %s", X,
ss.str().c_str(),
label.c_str()
);
@@ -445,7 +445,7 @@
handler.reset( create_render_handler_agg(pixelFormat) );
if ( handler.get() )
{
- //log_msg("Renderer %s initialized", name.c_str());
+ //log_debug("Renderer %s initialized", name.c_str());
std::cout << "Renderer " << name << " initialized" <<
std::endl;
addTestingRenderer(handler, name);
}
Index: backend/render_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- backend/render_handler.h 21 Jan 2008 20:56:04 -0000 1.56
+++ backend/render_handler.h 19 Feb 2008 19:20:47 -0000 1.57
@@ -18,7 +18,7 @@
//
//
-/* $Id: render_handler.h,v 1.56 2008/01/21 20:56:04 rsavoye Exp $ */
+/* $Id: render_handler.h,v 1.57 2008/02/19 19:20:47 bwy Exp $ */
#ifndef RENDER_HANDLER_H
#define RENDER_HANDLER_H
@@ -495,7 +495,7 @@
virtual bool getPixel(rgba& /*color_return*/, int /*x*/, int /*y*/)
{
- log_msg("getPixel() not implemented for this renderer");
+ log_debug("getPixel() not implemented for this renderer");
abort();
return false; // avoid compiler warning
}
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- backend/render_handler_agg.cpp 21 Jan 2008 20:56:05 -0000 1.126
+++ backend/render_handler_agg.cpp 19 Feb 2008 19:20:47 -0000 1.127
@@ -17,7 +17,7 @@
-/* $Id: render_handler_agg.cpp,v 1.126 2008/01/21 20:56:05 rsavoye Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.127 2008/02/19 19:20:47 bwy Exp $ */
// Original version by Udo Giacomozzi and Hannes Mayr,
// INDUNET GmbH (www.indunet.it)
@@ -620,7 +620,7 @@
// by default allow drawing everywhere
set_invalidated_region_world();
- log_msg("initialized AGG buffer <%p>, %d bytes, %dx%d, rowsize is %d
bytes",
+ log_debug("initialized AGG buffer <%p>, %d bytes, %dx%d, rowsize is %d
bytes",
mem, size, x, y, rowstride);
}
@@ -690,10 +690,10 @@
{
if (m_drawing_mask)
- log_msg("warning: rendering ended while drawing a mask");
+ log_debug("warning: rendering ended while drawing a mask");
while (! m_alpha_mask.empty()) {
- log_msg("warning: rendering ended while masks were still active");
+ log_debug("warning: rendering ended while masks were still active");
disable_mask();
}
@@ -890,7 +890,7 @@
rect ch_bounds = def->get_bound();
if (ch_bounds.is_null()) {
- log_msg("warning: select_clipbounds encountered a character definition "
+ log_debug("warning: select_clipbounds encountered a character definition
"
"with null bounds");
return;
}
@@ -979,7 +979,7 @@
select_clipbounds(def, mat);
if (_clipbounds_selected.empty()) {
- log_msg("warning: AGG renderer skipping a whole character");
+ log_debug("warning: AGG renderer skipping a whole character");
return; // nothing to draw!?
}
@@ -1549,7 +1549,7 @@
rasc.add_path(curve);
}
- //log_msg("%d edges\n", edge_count);
+ //log_debug("%d edges\n", edge_count);
agg::render_scanlines_compound_layered(rasc, sl, rbase, alloc, sh);
@@ -2000,7 +2000,7 @@
count++;
}
- //log_msg("%d inv. bounds in frame", count);
+ //log_debug("%d inv. bounds in frame", count);
}
@@ -2111,9 +2111,9 @@
if (!pixelformat) return NULL;
if (is_little_endian_host())
- log_msg("framebuffer pixel format is %s (little-endian host)",
pixelformat);
+ log_debug("framebuffer pixel format is %s (little-endian host)",
pixelformat);
else
- log_msg("framebuffer pixel format is %s (big-endian host)", pixelformat);
+ log_debug("framebuffer pixel format is %s (big-endian host)", pixelformat);
#ifdef PIXELFORMAT_RGB555
if (!strcmp(pixelformat, "RGB555"))
Index: backend/render_handler_agg_style.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg_style.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- backend/render_handler_agg_style.h 21 Jan 2008 20:56:05 -0000 1.29
+++ backend/render_handler_agg_style.h 19 Feb 2008 19:20:47 -0000 1.30
@@ -328,7 +328,7 @@
if (bi==NULL) {
// See server/styles.h comments about when NULL return is possible.
// Don't warn here, we already warn at parse-time
- //log_msg("WARNING: add_bitmap called with bi=NULL");
+ //log_debug("WARNING: add_bitmap called with bi=NULL");
add_color(agg::rgba8_pre(0,0,0,0));
return;
}
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- backend/render_handler_ogl.cpp 27 Jan 2008 07:18:17 -0000 1.105
+++ backend/render_handler_ogl.cpp 19 Feb 2008 19:20:48 -0000 1.106
@@ -137,7 +137,7 @@
// FIXME: is there any reason to do this?
OSMesaColorClamp(GL_TRUE);
- log_msg("OSMesa handle successfully created. with width " SIZET_FMT \
+ log_debug("OSMesa handle successfully created. with width " SIZET_FMT \
" and height " SIZET_FMT ".", width, height);
}
Index: cygnal/crc.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/crc.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cygnal/crc.cpp 21 Jan 2008 20:56:06 -0000 1.3
+++ cygnal/crc.cpp 19 Feb 2008 19:20:48 -0000 1.4
@@ -113,7 +113,7 @@
StringNoCaseEqual noCaseCompare;
-// log_msg ("Seeing if %s exists", filespec);
+// log_debug ("Seeing if %s exists", filespec);
if (filespec.size() == 0) {
return false;
}
Index: cygnal/cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- cygnal/cygnal.cpp 21 Jan 2008 20:56:06 -0000 1.20
+++ cygnal/cygnal.cpp 19 Feb 2008 19:20:48 -0000 1.21
@@ -65,7 +65,7 @@
#include <boost/thread/thread.hpp>
#include <boost/bind.hpp>
-using gnash::log_msg;
+using gnash::log_debug;
using namespace std;
using namespace cygnal;
using namespace gnash;
@@ -152,7 +152,7 @@
if (crcfile.getDocumentRoot().size() > 0) {
docroot = crcfile.getDocumentRoot().c_str();
- log_msg (_("Document Root for media files is: %s"),
+ log_debug (_("Document Root for media files is: %s"),
docroot);
} else {
docroot = "/var/www/html/software/gnash/tests/";
@@ -165,7 +165,7 @@
exit(0);
case 'v':
dbglogfile.setVerbosity();
- log_msg (_("Verbose output turned on"));
+ log_debug (_("Verbose output turned on"));
break;
case 'p':
port_offset = strtol(optarg, NULL, 0);
@@ -211,7 +211,7 @@
http_port.join();
// ssl_port.join();
- log_msg (_("All done I think..."));
+ log_debug (_("All done I think..."));
return(0);
}
@@ -233,7 +233,7 @@
www.createServer(port);
while (retries++ < thread_retries) {
- log_msg(_("%s: Thread for port %d looping..."), __PRETTY_FUNCTION__,
port);
+ log_debug(_("%s: Thread for port %d looping..."), __PRETTY_FUNCTION__,
port);
www.newConnection(true);
conndata->statistics->setFileType(NetStats::RTMPT);
@@ -255,16 +255,16 @@
// Keep track of the network statistics
conndata->statistics->stopClock();
-// log_msg (_("Bytes read: %d"), www.getBytesIn());
-// log_msg (_("Bytes written: %d"), www.getBytesOut());
+// log_debug (_("Bytes read: %d"), www.getBytesIn());
+// log_debug (_("Bytes written: %d"), www.getBytesOut());
// st.setBytes(www.getBytesIn() + www.getBytesOut());
conndata->statistics->addStats();
// www.resetBytesIn();
// www.resetBytesOut();
if (url != docroot) {
- log_msg (_("File to load is: %s"), filespec.c_str());
- log_msg (_("Parameters are: %s"), parameters.c_str());
+ log_debug (_("File to load is: %s"), filespec.c_str());
+ log_debug (_("Parameters are: %s"), parameters.c_str());
memset(conndata->filespec, 0, 256);
memcpy(conndata->filespec, filespec.c_str(), filespec.size());
boost::thread sendthr(boost::bind(&stream_thread, conndata));
@@ -289,11 +289,11 @@
Statistics st;
st.setFileType(NetStats::RTMP);
- log_msg("Param port is: %d", conndata->port);
+ log_debug("Param port is: %d", conndata->port);
proto.createServer(RTMP);
while (retries++ < thread_retries) {
- log_msg(_("%s: Thread for RTMP port looping..."), __PRETTY_FUNCTION__);
+ log_debug(_("%s: Thread for RTMP port looping..."),
__PRETTY_FUNCTION__);
proto.newConnection(true);
st.startClock();
proto.handShakeWait();
@@ -302,8 +302,8 @@
// Keep track of the network statistics
st.stopClock();
- log_msg (_("Bytes read: %d"), proto.getBytesIn());
- log_msg (_("Bytes written: %d"), proto.getBytesOut());
+ log_debug (_("Bytes read: %d"), proto.getBytesIn());
+ log_debug (_("Bytes written: %d"), proto.getBytesOut());
st.setBytes(proto.getBytesIn() + proto.getBytesOut());
st.addStats();
proto.resetBytesIn();
@@ -329,9 +329,9 @@
www.createServer(port);
- log_msg("Param port is: %d", conndata->port);
+ log_debug("Param port is: %d", conndata->port);
while (retries++ < thread_retries) {
- log_msg (_("%s: Thread for port %d looping..."), __PRETTY_FUNCTION__,
port);
+ log_debug (_("%s: Thread for port %d looping..."), __PRETTY_FUNCTION__,
port);
www.newConnection(true);
loadfile.netfd = www.getFileFd();
strcpy(loadfile.filespec, "Hello World");
@@ -349,7 +349,7 @@
//struct stat stats;
//struct thread_params loadfile;
- log_msg ("%s: %s", __PRETTY_FUNCTION__, params->filespec);
+ log_debug ("%s: %s", __PRETTY_FUNCTION__, params->filespec);
Stream str;
str.open(params->filespec, params->netfd, params->statistics);
@@ -362,7 +362,7 @@
static void
cntrlc_handler (int /*sig*/)
{
- log_msg(_("Got an interrupt"));
+ log_debug(_("Got an interrupt"));
exit(-1);
}
Index: cygnal/http.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/http.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- cygnal/http.cpp 21 Jan 2008 20:56:06 -0000 1.15
+++ cygnal/http.cpp 19 Feb 2008 19:20:48 -0000 1.16
@@ -97,7 +97,7 @@
char buffer[readsize+1];
memset(buffer, 0, readsize+1);
if (readNet(buffer, readsize) > 0) {
- log_msg (_("Read initial GET Request"));
+ log_debug (_("Read initial GET Request"));
} else {
log_error (_("Couldn't read initial GET Request"));
}
@@ -117,7 +117,7 @@
// See if we got a legit GET request
if (strncmp(buffer, "GET ", 4) == 0) {
- log_msg (_("Got legit GET request"));
+ log_debug (_("Got legit GET request"));
} else {
log_error (_("Got bogus GET request"));
}
@@ -343,11 +343,11 @@
}
if (ret >= 0) {
- log_msg (_("Sent GET Reply"));
-// log_msg (_("Sent GET Reply: %s"), _header.str().c_str());
+ log_debug (_("Sent GET Reply"));
+// log_debug (_("Sent GET Reply: %s"), _header.str().c_str());
clearHeader();
} else {
- log_msg (_("Couldn't send GET Reply, writeNet returned %d"), ret);
+ log_debug (_("Couldn't send GET Reply, writeNet returned %d"), ret);
return false;
}
// cout << "GET Header is:" << endl << _header.str() << endl;
@@ -763,7 +763,7 @@
// does, which is to load the index.html file in that
// directry if it exists.
if (S_ISDIR(st.st_mode)) {
- log_msg("%s is a directory\n", actual_filespec.c_str());
+ log_debug("%s is a directory\n", actual_filespec.c_str());
if (actual_filespec[actual_filespec.size()-1] != '/') {
actual_filespec += '/';
}
@@ -771,26 +771,26 @@
try_again = true;
continue;
} else { // not a directory
- log_msg("%s is not a directory\n", actual_filespec.c_str());
+ log_debug("%s is not a directory\n", actual_filespec.c_str());
string::size_type pos;
pos = filespec.rfind(".");
if (pos != string::npos) {
string suffix = filespec.substr(pos, filespec.size());
if (suffix == "html") {
_filetype = HTML;
- log_msg("HTML content found");
+ log_debug("HTML content found");
}
if (suffix == "swf") {
_filetype = SWF;
- log_msg("SWF content found");
+ log_debug("SWF content found");
}
if (suffix == "flv") {
_filetype = VIDEO;
- log_msg("FLV content found");
+ log_debug("FLV content found");
}
if (suffix == "mp3") {
_filetype = AUDIO;
- log_msg("MP3 content found");
+ log_debug("MP3 content found");
}
}
}
@@ -810,34 +810,34 @@
boost::mutex::scoped_lock lock(stl_mutex);
vector<string>::iterator it;
- log_msg (_("==== The HTTP header breaks down as follows: ===="));
- log_msg (_("Filespec: %s"), _filespec.c_str());
- log_msg (_("URL: %s"), _url.c_str());
- log_msg (_("Version: %s"), _version.c_str());
+ log_debug (_("==== The HTTP header breaks down as follows: ===="));
+ log_debug (_("Filespec: %s"), _filespec.c_str());
+ log_debug (_("URL: %s"), _url.c_str());
+ log_debug (_("Version: %s"), _version.c_str());
for (it = _accept.begin(); it != _accept.end(); it++) {
- log_msg("Accept param: \"%s\"", (*(it)).c_str());
+ log_debug("Accept param: \"%s\"", (*(it)).c_str());
}
- log_msg (_("Method: %s"), _method.c_str());
- log_msg (_("Referer: %s"), _referer.c_str());
- log_msg (_("Connections:"));
+ log_debug (_("Method: %s"), _method.c_str());
+ log_debug (_("Referer: %s"), _referer.c_str());
+ log_debug (_("Connections:"));
for (it = _connections.begin(); it != _connections.end(); it++) {
- log_msg("Connection param is: \"%s\"", (*(it)).c_str());
+ log_debug("Connection param is: \"%s\"", (*(it)).c_str());
}
- log_msg (_("Host: %s"), _host.c_str());
- log_msg (_("User Agent: %s"), _agent.c_str());
+ log_debug (_("Host: %s"), _host.c_str());
+ log_debug (_("User Agent: %s"), _agent.c_str());
for (it = _language.begin(); it != _language.end(); it++) {
- log_msg("Language param: \"%s\"", (*(it)).c_str());
+ log_debug("Language param: \"%s\"", (*(it)).c_str());
}
for (it = _charset.begin(); it != _charset.end(); it++) {
- log_msg("Charset param: \"%s\"", (*(it)).c_str());
+ log_debug("Charset param: \"%s\"", (*(it)).c_str());
}
for (it = _encoding.begin(); it != _encoding.end(); it++) {
- log_msg("Encodings param: \"%s\"", (*(it)).c_str());
+ log_debug("Encodings param: \"%s\"", (*(it)).c_str());
}
for (it = _te.begin(); it != _te.end(); it++) {
- log_msg("TE param: \"%s\"", (*(it)).c_str());
+ log_debug("TE param: \"%s\"", (*(it)).c_str());
}
- log_msg (_("==== ==== ===="));
+ log_debug (_("==== ==== ===="));
}
} // end of cygnal namespace
Index: cygnal/statistics.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/statistics.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cygnal/statistics.cpp 21 Jan 2008 20:56:06 -0000 1.5
+++ cygnal/statistics.cpp 19 Feb 2008 19:20:48 -0000 1.6
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: statistics.cpp,v 1.5 2008/01/21 20:56:06 rsavoye Exp $ */
+/* $Id: statistics.cpp,v 1.6 2008/02/19 19:20:48 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -113,13 +113,13 @@
for (it = _netstats.begin(); it != _netstats.end(); it++) {
NetStats *stats = (*it);
if (stats->getFileType() <= VIDEO) {
- log_msg (_("Stream type is: %s"),
filetype_names[stats->getFileType()]);
+ log_debug (_("Stream type is: %s"),
filetype_names[stats->getFileType()]);
}
if (((stats->getFileType() == VIDEO) || (stats->getFileType() ==
AUDIO)) &&
stats->getCodec() <= VP7) {
- log_msg (_("Stream codec is: %s"), codec_names[stats->getCodec()]);
+ log_debug (_("Stream codec is: %s"),
codec_names[stats->getCodec()]);
}
- log_msg (_("%d bytes were transfered in %s seconds"),
+ log_debug (_("%d bytes were transfered in %s seconds"),
stats->getBytes(),
to_simple_string(stats->getTimeSpan()).c_str());
}
Index: cygnal/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/stream.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cygnal/stream.cpp 21 Jan 2008 20:56:06 -0000 1.9
+++ cygnal/stream.cpp 19 Feb 2008 19:20:48 -0000 1.10
@@ -64,7 +64,7 @@
if (stat(loadfile.filespec, &stats) == 0) {
fd = open(loadfile.filespec, O_RDONLY);
-// log_msg ("File %s is %lld bytes in size",
+// log_debug ("File %s is %lld bytes in size",
// loadfile.filespec, (long long int)(stats.st_size));
if (fd) {
fdptr = static_cast<char *>(mmap(0, stats.st_size,
@@ -78,7 +78,7 @@
log_error (_("Couldn't map file %s into memory: %s"),
loadfile.filespec, strerror(errno));
} else {
- log_msg (_("File %s mapped to: %p"), loadfile.filespec,
+ log_debug (_("File %s mapped to: %p"), loadfile.filespec,
(void *)fdptr);
}
@@ -112,7 +112,7 @@
}
if (nbytes <= 0) {
- log_msg (_("Done..."));
+ log_debug (_("Done..."));
return &nbytes;
}
}
@@ -178,7 +178,7 @@
_filesize = st.st_size;
boost::mutex::scoped_lock lock(io_mutex);
_filefd = ::open(filespec, O_RDONLY);
- log_msg (_("File %s is %lld bytes in size."), filespec,
+ log_debug (_("File %s is %lld bytes in size."), filespec,
(long long int) _filesize);
if (_filefd) {
_dataptr = static_cast<unsigned char *>(mmap(0, _filesize,
@@ -193,7 +193,7 @@
filespec, strerror(errno));
return false;
} else {
- log_msg (_("File %s mapped to: %p"), filespec,
+ log_debug (_("File %s mapped to: %p"), filespec,
(void *)_dataptr);
_seekptr = _dataptr;
_state = OPEN;
Index: extensions/dejagnu/dejagnu.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/dejagnu.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- extensions/dejagnu/dejagnu.cpp 22 Jan 2008 21:23:14 -0000 1.14
+++ extensions/dejagnu/dejagnu.cpp 19 Feb 2008 19:20:48 -0000 1.15
@@ -93,7 +93,7 @@
// GNASH_REPORT_FUNCTION;
passed++;
- log_msg("PASSED: %s\n", msg);
+ log_debug("PASSED: %s\n", msg);
return NULL;
}
@@ -103,7 +103,7 @@
// GNASH_REPORT_FUNCTION;
failed++;
- log_msg("FAILED: %s\n", msg);
+ log_debug("FAILED: %s\n", msg);
return NULL;
}
Index: extensions/mysql/mysql_db.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/mysql_db.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- extensions/mysql/mysql_db.cpp 22 Jan 2008 21:13:16 -0000 1.13
+++ extensions/mysql/mysql_db.cpp 19 Feb 2008 19:20:48 -0000 1.14
@@ -266,14 +266,14 @@
#if 0
for (size_t i=0; i<mysql_num_fields(_result); i++) {
MYSQL_FIELD *fields = mysql_fetch_fields(_result);
- log_msg(_("Field name is: %s: "), fields->name);
+ log_debug(_("Field name is: %s: "), fields->name);
}
#endif
while((_row = mysql_fetch_row(_result))) {
vector<const char *> row_vec;
for (size_t i=0; i<mysql_num_fields(_result); i++) {
-// log_msg("Column[%d] is: \"%s\"", i, row[i]);
+// log_debug("Column[%d] is: \"%s\"", i, row[i]);
row_vec.push_back(_row[i]);
}
qresult.push_back(row_vec);
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- gui/Player.cpp 19 Feb 2008 00:47:17 -0000 1.81
+++ gui/Player.cpp 19 Feb 2008 19:20:49 -0000 1.82
@@ -145,7 +145,7 @@
//
if (!delay && rcfile.getTimerDelay() > 0) {
delay = rcfile.getTimerDelay();
- log_msg (_("Timer delay set to %d milliseconds"), delay);
+ log_debug (_("Timer delay set to %d milliseconds"), delay);
}
}
@@ -392,7 +392,7 @@
Player::fs_callback(gnash::sprite_instance* movie, const char* command, const
char* args)
// For handling notification callbacks from ActionScript.
{
- log_msg(_("fs_callback(%p): %s %s"), (void*)movie, command, args);
+ log_debug(_("fs_callback(%p): %s %s"), (void*)movie, command, args);
}
/* private */
Index: gui/fb.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fb.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- gui/fb.cpp 21 Jan 2008 20:55:40 -0000 1.48
+++ gui/fb.cpp 19 Feb 2008 19:20:49 -0000 1.49
@@ -187,7 +187,7 @@
if (fd>0) {
enable_terminal();
- log_msg("Closing framebuffer device\n");
+ log_debug("Closing framebuffer device\n");
close(fd);
}
@@ -195,7 +195,7 @@
#ifdef DOUBLE_BUFFER
if (buffer) {
- log_msg("Free'ing offscreen buffer\n");
+ log_debug("Free'ing offscreen buffer\n");
free(buffer);
}
#endif
@@ -209,7 +209,7 @@
struct fb_cmap cmap;
int i;
- log_msg("LUT8: Setting up colormap\n");
+ log_debug("LUT8: Setting up colormap\n");
cmap.start=0;
cmap.len=256;
@@ -247,12 +247,12 @@
// Initialize mouse (don't abort if no mouse found)
if (!init_mouse()) {
// just report to the user, keep on going...
- log_msg("You won't have any pointing input device, sorry.");
+ log_debug("You won't have any pointing input device, sorry.");
}
// Initialize keyboard (still not critical)
if (!init_keyboard()) {
- log_msg("You won't have any keyboard input device, sorry.");
+ log_debug("You won't have any keyboard input device, sorry.");
}
// Open the framebuffer device
@@ -265,9 +265,9 @@
// Load framebuffer properties
ioctl(fd, FBIOGET_VSCREENINFO, &var_screeninfo);
ioctl(fd, FBIOGET_FSCREENINFO, &fix_screeninfo);
- log_msg("Framebuffer device uses %d bytes of memory.\n",
+ log_debug("Framebuffer device uses %d bytes of memory.\n",
fix_screeninfo.smem_len);
- log_msg("Video mode: %dx%d with %d bits per pixel.\n",
+ log_debug("Video mode: %dx%d with %d bits per pixel.\n",
var_screeninfo.xres, var_screeninfo.yres, var_screeninfo.bits_per_pixel);
// map framebuffer into memory
@@ -307,10 +307,10 @@
#ifdef DOUBLE_BUFFER
- log_msg("Double buffering enabled");
+ log_debug("Double buffering enabled");
_mem = buffer;
#else
- log_msg("Double buffering disabled");
+ log_debug("Double buffering disabled");
_mem = fbmem;
#endif
@@ -319,13 +319,13 @@
// choose apropriate pixel format
- log_msg("red channel: %d / %d", var_screeninfo.red.offset,
+ log_debug("red channel: %d / %d", var_screeninfo.red.offset,
var_screeninfo.red.length);
- log_msg("green channel: %d / %d", var_screeninfo.green.offset,
+ log_debug("green channel: %d / %d", var_screeninfo.green.offset,
var_screeninfo.green.length);
- log_msg("blue channel: %d / %d", var_screeninfo.blue.offset,
+ log_debug("blue channel: %d / %d", var_screeninfo.blue.offset,
var_screeninfo.blue.length);
- log_msg("Total bits per pixel: %d", var_screeninfo.bits_per_pixel);
+ log_debug("Total bits per pixel: %d", var_screeninfo.bits_per_pixel);
/* NOTE: agg_detect_pixel_format() assumes bit positions in host byte order.
I don't know if this matches the information provided by var_screeninfo, so
@@ -546,7 +546,7 @@
int fd;
if (!tty) {
- log_msg("WARNING: Could not detect controlling TTY");
+ log_debug("WARNING: Could not detect controlling TTY");
return false;
}
@@ -556,53 +556,53 @@
fd = open(tty, O_RDWR);
if (fd<0) {
- log_msg("WARNING: Could not open %s", tty);
+ log_debug("WARNING: Could not open %s", tty);
return false;
}
if (ioctl(fd, VT_GETSTATE, &vts) == -1) {
- log_msg("WARNING: Could not get current VT state");
+ log_debug("WARNING: Could not get current VT state");
close(fd);
return false;
}
original_vt = vts.v_active;
- log_msg("Original TTY NO = %d", original_vt);
+ log_debug("Original TTY NO = %d", original_vt);
#ifdef REQUEST_NEW_VT
// Request a new VT number
if (ioctl(fd, VT_OPENQRY, &own_vt) == -1) {
- log_msg("WARNING: Could not request a new VT");
+ log_debug("WARNING: Could not request a new VT");
close(fd);
return false;
}
- log_msg("Own TTY NO = %d", own_vt);
+ log_debug("Own TTY NO = %d", own_vt);
close(fd);
// Activate our new VT
tty = find_accessible_tty(own_vt);
if (!tty) {
- log_msg("WARNING: Could not find device for VT number %d", own_vt);
+ log_debug("WARNING: Could not find device for VT number %d", own_vt);
return false;
}
fd = open(tty, O_RDWR);
if (fd<0) {
- log_msg("WARNING: Could not open %s", tty);
+ log_debug("WARNING: Could not open %s", tty);
return false;
}
if (ioctl(fd, VT_ACTIVATE, own_vt) == -1) {
- log_msg("WARNING: Could not activate VT number %d", own_vt);
+ log_debug("WARNING: Could not activate VT number %d", own_vt);
close(fd);
return false;
}
if (ioctl(fd, VT_WAITACTIVE, own_vt) == -1) {
- log_msg("WARNING: Error waiting for VT %d becoming active", own_vt);
+ log_debug("WARNING: Error waiting for VT %d becoming active", own_vt);
//close(tty);
//return false; don't abort
}
@@ -616,13 +616,13 @@
// Activate our new VT
tty = find_accessible_tty(own_vt);
if (!tty) {
- log_msg("WARNING: Could not find device for VT number %d", own_vt);
+ log_debug("WARNING: Could not find device for VT number %d", own_vt);
return false;
}
fd = open(tty, O_RDWR);
if (fd<0) {
- log_msg("WARNING: Could not open %s", tty);
+ log_debug("WARNING: Could not open %s", tty);
return false;
}
@@ -630,7 +630,7 @@
// Become session leader and attach to terminal
setsid();
if (ioctl(fd, TIOCSCTTY, 0) == -1) {
- log_msg("WARNING: Could not attach controlling terminal (%s)", tty);
+ log_debug("WARNING: Could not attach controlling terminal (%s)", tty);
}
*/
@@ -640,16 +640,16 @@
// Disable keyboard cursor
if (ioctl(fd, KDGETMODE, &original_kd) == -1) {
- log_msg("WARNING: Could not query current keyboard mode on VT");
+ log_debug("WARNING: Could not query current keyboard mode on VT");
}
if (ioctl(fd, KDSETMODE, KD_GRAPHICS) == -1) {
- log_msg("WARNING: Could not switch to graphics mode on new VT");
+ log_debug("WARNING: Could not switch to graphics mode on new VT");
}
close(fd);
- log_msg("VT %d ready", own_vt);
+ log_debug("VT %d ready", own_vt);
// NOTE: We could also implement virtual console switching by using
@@ -662,28 +662,28 @@
bool FBGui::enable_terminal()
{
- log_msg("Restoring terminal...");
+ log_debug("Restoring terminal...");
char* tty = find_accessible_tty(own_vt);
if (!tty) {
- log_msg("WARNING: Could not find device for VT number %d", own_vt);
+ log_debug("WARNING: Could not find device for VT number %d", own_vt);
return false;
}
int fd = open(tty, O_RDWR);
if (fd<0) {
- log_msg("WARNING: Could not open %s", tty);
+ log_debug("WARNING: Could not open %s", tty);
return false;
}
if (ioctl(fd, VT_ACTIVATE, original_vt)) {
- log_msg("WARNING: Could not activate VT number %d", original_vt);
+ log_debug("WARNING: Could not activate VT number %d", original_vt);
close(fd);
return false;
}
if (ioctl(fd, VT_WAITACTIVE, original_vt)) {
- log_msg("WARNING: Error waiting for VT %d becoming active", original_vt);
+ log_debug("WARNING: Error waiting for VT %d becoming active", original_vt);
//close(tty);
//return false; don't abort
}
@@ -693,7 +693,7 @@
// Restore keyboard
if (ioctl(fd, KDSETMODE, original_kd)) {
- log_msg("WARNING: Could not restore keyboard mode");
+ log_debug("WARNING: Could not restore keyboard mode");
}
close(fd);
@@ -737,7 +737,7 @@
do {
n = read(input_fd, trash, sizeof trash);
if (n>0)
- log_msg("mouse_command: discarded %d bytes from input buffer", n);
+ log_debug("mouse_command: discarded %d bytes from input buffer", n);
} while (n>0);
// send command
@@ -770,7 +770,7 @@
input_fd = open(MOUSE_DEVICE, O_RDWR);
if (input_fd<0) {
- log_msg("Could not open " MOUSE_DEVICE ": %s", strerror(errno));
+ log_debug("Could not open " MOUSE_DEVICE ": %s", strerror(errno));
return false;
}
@@ -788,7 +788,7 @@
// Reset mouse
if ((!mouse_command(0xFF, buf, 3)) || (buf[0]!=0xFA)) {
- log_msg("Mouse reset failed");
+ log_debug("Mouse reset failed");
close(input_fd);
input_fd=-1;
return false;
@@ -796,23 +796,23 @@
// Get Device ID (not crucial, debug only)
if ((!mouse_command(0xF2, buf, 2)) || (buf[0]!=0xFA)) {
- log_msg("WARNING: Could not detect mouse device ID");
+ log_debug("WARNING: Could not detect mouse device ID");
} else {
unsigned char devid = buf[1];
if (devid!=0)
- log_msg("WARNING: Non-standard mouse device ID %d", devid);
+ log_debug("WARNING: Non-standard mouse device ID %d", devid);
}
// Enable mouse data reporting
if ((!mouse_command(0xF4, &byte, 1)) || (byte!=0xFA)) {
- log_msg("Could not activate Data Reporting mode for mouse");
+ log_debug("Could not activate Data Reporting mode for mouse");
close(input_fd);
input_fd=-1;
return false;
}
- log_msg("Mouse enabled.");
+ log_debug("Mouse enabled.");
mouse_x = 0;
mouse_y = 0;
@@ -859,7 +859,7 @@
ymove *= -1; // vertical movement is upside-down
- log_msg("x/y %d/%d btn %d", xmove, ymove, btn);
+ log_debug("x/y %d/%d btn %d", xmove, ymove, btn);
// movement
mouse_x += xmove;
@@ -870,7 +870,7 @@
if (mouse_x>m_stage_width) mouse_x=m_stage_width;
if (mouse_y>m_stage_height) mouse_y=m_stage_height;
- //log_msg("mouse @ %d / %d, btn %d", mouse_x, mouse_y, mouse_btn);
+ //log_debug("mouse @ %d / %d, btn %d", mouse_x, mouse_y, mouse_btn);
float xscale = getXScale();
float yscale = getYScale();
@@ -881,7 +881,7 @@
mouse_btn = btn;
notify_mouse_clicked(btn, 1); // mark=??
- //log_msg("mouse click! %d", btn);
+ //log_debug("mouse click! %d", btn);
}
// remove from buffer
@@ -902,7 +902,7 @@
input_fd = open(MOUSE_DEVICE, O_RDWR);
if (input_fd<0) {
- log_msg("Could not open " MOUSE_DEVICE ": %s", strerror(errno));
+ log_debug("Could not open " MOUSE_DEVICE ": %s", strerror(errno));
return false;
}
@@ -920,7 +920,7 @@
mouse_buf_size=0;
- log_msg("Touchpad enabled.");
+ log_debug("Touchpad enabled.");
return true;
}
#endif
@@ -1008,11 +1008,11 @@
input_fd = open(devname, O_RDONLY);
if (input_fd<0) {
- log_msg("Could not open %s: %s", devname, strerror(errno));
+ log_debug("Could not open %s: %s", devname, strerror(errno));
return false;
}
- log_msg("Pointing device %s open", devname);
+ log_debug("Pointing device %s open", devname);
if (fcntl(input_fd, F_SETFL, fcntl(input_fd, F_GETFL) | O_NONBLOCK)<0) {
log_error("Could not set non-blocking mode for pointing device: %s",
strerror(errno));
@@ -1098,13 +1098,13 @@
} while (0);
if (!ok)
- log_msg("WARNING: Error parsing calibration data!");
+ log_debug("WARNING: Error parsing calibration data!");
- log_msg("Using touchscreen calibration data: %.0f / %.0f / %.0f / %.0f",
+ log_debug("Using touchscreen calibration data: %.0f / %.0f / %.0f /
%.0f",
cal1x, cal1y, cal2x, cal2y);
} else {
- log_msg("WARNING: No touchscreen calibration settings found. "
+ log_debug("WARNING: No touchscreen calibration settings found. "
"The mouse pointer most probably won't work precisely. Set "
"TSCALIB environment variable with correct values for better results");
}
@@ -1225,11 +1225,11 @@
keyb_fd = open(devname, O_RDONLY);
if (keyb_fd<0) {
- log_msg("Could not open %s: %s", devname, strerror(errno));
+ log_debug("Could not open %s: %s", devname, strerror(errno));
return false;
}
- log_msg("Keyboard device %s open", devname);
+ log_debug("Keyboard device %s open", devname);
if (fcntl(keyb_fd, F_SETFL, fcntl(keyb_fd, F_GETFL) | O_NONBLOCK)<0) {
log_error("Could not set non-blocking mode for keyboard device: %s",
strerror(errno));
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- gui/gnash.cpp 19 Feb 2008 00:47:17 -0000 1.100
+++ gui/gnash.cpp 19 Feb 2008 19:20:49 -0000 1.101
@@ -241,7 +241,7 @@
exit(EXIT_SUCCESS);
case 'v':
dbglogfile.setVerbosity();
- log_msg (_("Verbose output turned on"));
+ log_debug (_("Verbose output turned on"));
break;
case 'V':
version_and_copyright();
@@ -249,7 +249,7 @@
exit(EXIT_SUCCESS);
case 'w':
rcfile.useWriteLog(true); // dbglogfile.setWriteDisk(true);
- log_msg (_("Logging to disk enabled"));
+ log_debug (_("Logging to disk enabled"));
break;
case 'a':
#if VERBOSE_ACTION
@@ -273,11 +273,11 @@
break;
case 'u':
url = optarg;
- log_msg (_("Setting root URL to %s"), url);
+ log_debug (_("Setting root URL to %s"), url);
break;
case 'U': // Set base URL
player.setBaseUrl(optarg);
- log_msg (_("Setting base URL to %s"), optarg);
+ log_debug (_("Setting base URL to %s"), optarg);
break;
case 'F':
{
@@ -293,11 +293,11 @@
case 'j':
width_given = true;
player.setWidth ( strtol(optarg, NULL, 0) );
- log_msg (_("Setting width to " SIZET_FMT), player.getWidth());
+ log_debug (_("Setting width to " SIZET_FMT), player.getWidth());
break;
case 'g':
#ifdef USE_DEBUGGER
- log_msg (_("Setting debugger ON"));
+ log_debug (_("Setting debugger ON"));
debugger.enabled(true);
// debugger.startServer(&debugger);
debugger.console();
@@ -309,7 +309,7 @@
case 'k':
height_given = true;
player.setHeight ( strtol(optarg, NULL, 0) );
- log_msg (_("Setting height to " SIZET_FMT), player.getHeight());
+ log_debug (_("Setting height to " SIZET_FMT),
player.getHeight());
break;
case 'x':
called_by_plugin = true;
@@ -382,7 +382,7 @@
}
if ( ! specified_rendering_flag ) {
- log_msg (_("No rendering flags specified, using rcfile"));
+ log_debug (_("No rendering flags specified, using rcfile"));
if ( called_by_plugin ) {
player.setDoSound( rcfile.usePluginSound() );
} else {
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- gui/gtk.cpp 17 Feb 2008 10:01:14 -0000 1.146
+++ gui/gtk.cpp 19 Feb 2008 19:20:49 -0000 1.147
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: gtk.cpp,v 1.146 2008/02/17 10:01:14 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.147 2008/02/19 19:20:49 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -106,7 +106,7 @@
if (_xid) {
_window = gtk_plug_new(_xid);
- log_msg (_("Created XEmbedded window"));
+ log_debug (_("Created XEmbedded window"));
} else {
#ifdef GUI_HILDON
_window = hildon_window_new();
@@ -114,7 +114,7 @@
#else
_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
#endif
- log_msg (_("Created top level window"));
+ log_debug (_("Created top level window"));
}
// XXXbjacques: why do we need this?
@@ -175,7 +175,7 @@
int fd = lirc->getFileFd();
addFDListener(fd, lirc_handler, &fd);
} else {
- log_msg(_("LIRC daemon not running"));
+ log_debug(_("LIRC daemon not running"));
}
#endif
@@ -254,7 +254,7 @@
_overlay = gtk_window_new (GTK_WINDOW_TOPLEVEL);
addGnashIcon(GTK_WINDOW(_overlay));
gtk_window_fullscreen(GTK_WINDOW(_overlay));
- log_msg (_("Created fullscreen window"));
+ log_debug (_("Created fullscreen window"));
// Reparent drawing area from GtkPlug to fullscreen window
gtk_widget_realize(_overlay);
@@ -300,7 +300,7 @@
setupWindowEvents();
if (_overlay) {
gtk_widget_destroy(_overlay);
- log_msg (_("Destroyed fullscreen window"));
+ log_debug (_("Destroyed fullscreen window"));
}
}
@@ -2134,7 +2134,7 @@
// int* fd = static_cast<int*>(data);
// want to remove this handler. You may want to close fd.
- log_msg("%s\n", lirc->getButton());
+ log_debug("%s\n", lirc->getButton());
// Want to keep this handler
return true;
Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- gui/gtk_glue_agg.cpp 21 Jan 2008 20:55:40 -0000 1.31
+++ gui/gtk_glue_agg.cpp 19 Feb 2008 19:20:49 -0000 1.32
@@ -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: gtk_glue_agg.cpp,v 1.31 2008/01/21 20:55:40 rsavoye Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.32 2008/02/19 19:20:49 bwy Exp $ */
/// \page gtk_shm_support GTK shared memory extension support
@@ -106,7 +106,7 @@
return false;
}
- log_msg("Your X server expects %s pixmap data for standard mode.",
_pixelformat);
+ log_debug("Your X server expects %s pixmap data for standard mode.",
_pixelformat);
return true;
}
@@ -118,23 +118,23 @@
int major, minor, dummy;
Bool pixmaps;
- log_msg("Checking support for MIT-SHM...");
+ log_debug("Checking support for MIT-SHM...");
if (!XQueryExtension(display, "MIT-SHM", &dummy, &dummy, &dummy))
{
- log_msg("WARNING: No MIT-SHM extension available, using standard XLib "
+ log_debug("WARNING: No MIT-SHM extension available, using standard XLib "
"calls (slower)");
return false;
}
if (XShmQueryVersion(display, &major, &minor, &pixmaps )!=True)
{
- log_msg("WARNING: MIT-SHM not ready (network link?), using standard XLib "
+ log_debug("WARNING: MIT-SHM not ready (network link?), using standard XLib
"
"calls (slower)");
return false;
}
- log_msg("NOTICE: MIT-SHM available (version %d.%d)!", major, minor);
+ log_debug("NOTICE: MIT-SHM available (version %d.%d)!", major, minor);
return true;
@@ -165,7 +165,7 @@
ZPixmap, NULL, _shm_info, width, height);
if (!_shm_image) {
- log_msg("Failed creating the shared memory XImage!");
+ log_debug("Failed creating the shared memory XImage!");
destroy_shm_image();
return;
}
@@ -175,7 +175,7 @@
_shm_image->bytes_per_line * _shm_image->height, IPC_CREAT|0777);
if (_shm_info->shmid == -1) {
- log_msg("Failed requesting shared memory segment (%s). Perhaps the "
+ log_debug("Failed requesting shared memory segment (%s). Perhaps the "
"required memory size is bigger than the limit set by the kernel.",
strerror(errno));
destroy_shm_image();
@@ -186,7 +186,7 @@
_shm_info->shmaddr = _shm_image->data = (char*) shmat(_shm_info->shmid, 0,
0);
if (_shm_info->shmaddr == (char*) -1) {
- log_msg("Failed attaching to shared memory segment: %s", strerror(errno));
+ log_debug("Failed attaching to shared memory segment: %s",
strerror(errno));
destroy_shm_image();
return;
}
@@ -198,7 +198,7 @@
// Finally, tell the server to attach to our shared memory segment
if (!XShmAttach(gdk_display, _shm_info)) {
- log_msg("Server failed attaching to the shared memory segment");
+ log_debug("Server failed attaching to the shared memory segment");
destroy_shm_image();
return;
}
@@ -206,7 +206,7 @@
// Disable double buffering, otherwise gtk tries to update widget
// contents from offscreen buffer at the end of expose event
gtk_widget_set_double_buffered(_drawing_area, FALSE);
- //log_msg("create_shm_image() OK"); // <-- remove this
+ //log_debug("create_shm_image() OK"); // <-- remove this
#endif // ENABLE_MIT_SHM
}
@@ -297,7 +297,7 @@
decode_mask(_shm_image->blue_mask, &blue_shift, &blue_prec);
- log_msg("X server pixel format is (R%d:%d, G%d:%d, B%d:%d, %d bpp)",
+ log_debug("X server pixel format is (R%d:%d, G%d:%d, B%d:%d, %d bpp)",
red_shift, red_prec,
green_shift, green_prec,
blue_shift, blue_prec,
@@ -313,7 +313,7 @@
destroy_shm_image();
if (!pixelformat) {
- log_msg("Pixel format of X server not recognized!");
+ log_debug("Pixel format of X server not recognized!");
// disable use of shared memory pixmaps
_have_shm = false;
@@ -321,12 +321,12 @@
return NULL;
}
- log_msg("X server is using %s pixel format", pixelformat);
+ log_debug("X server is using %s pixel format", pixelformat);
render_handler* res = create_render_handler_agg(pixelformat);
if (!res) {
- log_msg("Failed creating a renderer instance for this pixel format. "
+ log_debug("Failed creating a renderer instance for this pixel format. "
"Most probably Gnash has not compiled in (configured) support "
"for this pixel format - using standard pixmaps instead");
@@ -381,7 +381,7 @@
// ==> use shared memory image (faster)
- log_msg("GTK-AGG: Using shared memory image");
+ log_debug("GTK-AGG: Using shared memory image");
if (_offscreenbuf) {
free(_offscreenbuf);
@@ -411,13 +411,13 @@
_offscreenbuf = static_cast<unsigned char *>(
realloc(_offscreenbuf, new_bufsize) );
if (!_offscreenbuf) {
- log_msg("Could not allocate %i bytes for offscreen buffer:
%s\n",
+ log_debug("Could not allocate %i bytes for offscreen buffer:
%s\n",
new_bufsize, strerror(errno)
);
return;
}
- log_msg("GTK-AGG: %i bytes offscreen buffer allocated\n",
new_bufsize);
+ log_debug("GTK-AGG: %i bytes offscreen buffer allocated\n",
new_bufsize);
_offscreenbuf_size = new_bufsize;
memset(_offscreenbuf, 0, new_bufsize);
Index: gui/gtk_glue_gtkglext.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_gtkglext.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gui/gtk_glue_gtkglext.cpp 21 Jan 2008 20:55:40 -0000 1.15
+++ gui/gtk_glue_gtkglext.cpp 19 Feb 2008 19:20:49 -0000 1.16
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: gtk_glue_gtkglext.cpp,v 1.15 2008/01/21 20:55:40 rsavoye Exp $ */
+/* $Id: gtk_glue_gtkglext.cpp,v 1.16 2008/02/19 19:20:49 bwy Exp $ */
#include "gtk_glue_gtkglext.h"
#include "log.h"
@@ -65,7 +65,7 @@
gint major, minor;
gdk_gl_query_version (&major, &minor);
- log_msg (_("OpenGL extension version - %d.%d"),
+ log_debug (_("OpenGL extension version - %d.%d"),
(int)major, (int)minor);
GdkGLConfigMode glcmode = (GdkGLConfigMode)(GDK_GL_MODE_RGB |
@@ -84,10 +84,10 @@
log_error (_("No appropriate OpenGL-capable visual found."));
gtk_main_quit(); // XXX
} else {
- log_msg (_("Got single-buffered visual."));
+ log_debug (_("Got single-buffered visual."));
}
} else {
- log_msg (_("Got double-buffered visual."));
+ log_debug (_("Got double-buffered visual."));
}
return true;
Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- gui/gui.cpp 25 Jan 2008 11:33:36 -0000 1.131
+++ gui/gui.cpp 19 Feb 2008 19:20:49 -0000 1.132
@@ -230,7 +230,7 @@
}
else
{
- //log_msg(_("Resize request received while there's still"
+ //log_debug(_("Resize request received while there's still"
// " no movie loaded, can't correctly set movie scale"));
}
@@ -242,7 +242,7 @@
_width = width;
_height = height;
_validbounds.setTo(0, 0, _width-1, _height-1);
- //log_msg(_("new size (in twips) is: %dx%d"), _width*20, _height*20);
+ //log_debug(_("new size (in twips) is: %dx%d"), _width*20, _height*20);
}
void
@@ -345,7 +345,7 @@
if ( _stopped ) return;
#ifdef DEBUG_MOUSE_COORDINATES
- log_msg(_("mouse @ %d,%d"), x, y);
+ log_debug(_("mouse @ %d,%d"), x, y);
#endif
if ( m->notify_mouse_moved(x, y) )
{
@@ -732,7 +732,7 @@
m->get_movie_definition()->ensure_frame_loaded(tot_frames);
m->goto_frame(cur_frame+1);
m->set_play_state(gnash::sprite_instance::PLAY);
- log_msg(_("Frame %d"), m->get_current_frame());
+ log_debug(_("Frame %d"), m->get_current_frame());
#endif
@@ -964,7 +964,7 @@
float avg = fps_counter_total / secs_total;
- //log_msg("Effective frame rate: %0.2f fps", (float)(fps_counter/secs));
+ //log_debug("Effective frame rate: %0.2f fps", (float)(fps_counter/secs));
printf("Effective frame rate: %0.2f fps (min %0.2f, avg %0.2f, max %0.2f, "
"%u frames in %0.1f secs total)\n", rate, fps_rate_min, avg,
fps_rate_max,
fps_counter_total, secs_total);
Index: gui/riscos.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/riscos.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/riscos.cpp 21 Jan 2008 20:55:41 -0000 1.7
+++ gui/riscos.cpp 19 Feb 2008 19:20:49 -0000 1.8
@@ -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: riscos.cpp,v 1.7 2008/01/21 20:55:41 rsavoye Exp $ */
+/* $Id: riscos.cpp,v 1.8 2008/02/19 19:20:49 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -65,7 +65,7 @@
(wimp_message_list *)0/*&messages*/,
0, &_task);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
return false;
}
@@ -79,7 +79,7 @@
error = xos_read_vdu_variables((const os_vdu_var_list *)&vduvars,
vduvals);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
return false;
}
@@ -89,7 +89,7 @@
/* read current screenmode details */
error = xosscreenmode_current(&mode);
if (error) {
- log_msg("%s", error->errmess);
+ log_debug("%s", error->errmess);
return false;
}
@@ -101,8 +101,8 @@
/** \todo Mode specifiers */
- log_msg("Framebuffer address: %p\n", (void *)vduvals[0]);
- log_msg("Screen Res: %d x %d\n", _screen_width, _screen_height);
+ log_debug("Framebuffer address: %p\n", (void *)vduvals[0]);
+ log_debug("Screen Res: %d x %d\n", _screen_width, _screen_height);
glue.prepFramebuffer((void *)vduvals[0], _screen_width, _screen_height);
#endif
@@ -130,7 +130,7 @@
state.w = _window;
error = xwimp_get_window_state(&state);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
return false;
}
@@ -139,7 +139,7 @@
error = xwimp_open_window((wimp_open *)&state);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
return false;
}
@@ -168,7 +168,7 @@
state.w = _window;
error = xwimp_get_window_state(&state);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
}
glue.render(state.visible.x0 / 2,
@@ -219,7 +219,7 @@
m_draw_maxy = valid_coord(m_draw_maxy + 2, _height);
}
-// log_msg("DrawRect: (%i, %i), (%i, %i)\n",
+// log_debug("DrawRect: (%i, %i), (%i, %i)\n",
// m_draw_minx, m_draw_miny, m_draw_maxx, m_draw_maxy);
#endif
}
@@ -240,7 +240,7 @@
while (!_quit) {
error = xwimp_poll_idle(wimp_SAVE_FP, &block, t, NULL, &event);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
return false;
}
@@ -263,13 +263,13 @@
case wimp_REDRAW_WINDOW_REQUEST:
error = xwimp_redraw_window(&block.redraw, &more);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
return false;
}
while (more) {
// rect bounds(block.redraw.clip.x0 / 2, block.redraw.clip.y0 / 2,
// block.redraw.clip.x1 / 2, block.redraw.clip.y1 / 2);
-// log_msg("Clip rect: (%d, %d)(%d, %d)\n",
+// log_debug("Clip rect: (%d, %d)(%d, %d)\n",
// block.redraw.clip.x0 / 2, block.redraw.clip.y0 / 2,
// block.redraw.clip.x1 / 2, block.redraw.clip.y1 / 2);
// TODO: Make this use the clipping rectangle (convert to TWIPS)
@@ -280,7 +280,7 @@
renderBuffer();
error = xwimp_get_rectangle(&block.redraw, &more);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
return false;
}
}
@@ -288,7 +288,7 @@
case wimp_OPEN_WINDOW_REQUEST:
error = xwimp_open_window(&block.open);
if (error)
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
break;
case wimp_CLOSE_WINDOW_REQUEST:
_quit = true;
@@ -376,7 +376,7 @@
error = xwimp_create_window((wimp_window *)&window, &_window);
if (error) {
- log_msg("%s\n", error->errmess);
+ log_debug("%s\n", error->errmess);
return false;
}
Index: gui/riscos_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/riscos_glue_agg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/riscos_glue_agg.cpp 21 Jan 2008 20:55:41 -0000 1.7
+++ gui/riscos_glue_agg.cpp 19 Feb 2008 19:20:49 -0000 1.8
@@ -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: riscos_glue_agg.cpp,v 1.7 2008/01/21 20:55:41 rsavoye Exp $ */
+/* $Id: riscos_glue_agg.cpp,v 1.8 2008/02/19 19:20:49 bwy Exp $ */
#include <cstdio>
#include <cerrno>
@@ -91,12 +91,12 @@
_offscreenbuf = static_cast<unsigned char *>( realloc(_offscreenbuf,
new_bufsize) );
if (!_offscreenbuf) {
- log_msg("Could not allocate %i bytes for offscreen buffer: %s\n",
+ log_debug("Could not allocate %i bytes for offscreen buffer: %s\n",
new_bufsize, strerror(errno) );
return;
}
- log_msg("RISC OS-AGG: %i bytes offscreen buffer allocated\n", new_bufsize);
+ log_debug("RISC OS-AGG: %i bytes offscreen buffer allocated\n",
new_bufsize);
_offscreenbuf_size = new_bufsize;
memset(_offscreenbuf, 0, new_bufsize);
Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- gui/sdl.cpp 21 Jan 2008 20:55:41 -0000 1.62
+++ gui/sdl.cpp 19 Feb 2008 19:20:49 -0000 1.63
@@ -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: sdl.cpp,v 1.62 2008/01/21 20:55:41 rsavoye Exp $ */
+/* $Id: sdl.cpp,v 1.63 2008/02/19 19:20:49 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -325,7 +325,7 @@
void
SDLGui::resize_event()
{
- log_msg("got resize_event ");
+ log_debug("got resize_event ");
}
void
Index: gui/sdl_agg_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_agg_glue.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gui/sdl_agg_glue.cpp 6 Feb 2008 13:44:06 -0000 1.18
+++ gui/sdl_agg_glue.cpp 19 Feb 2008 19:20:49 -0000 1.19
@@ -128,7 +128,7 @@
_offscreenbuf = new unsigned char[bufsize];
- log_msg (_("SDL-AGG: %i byte offscreen buffer allocated"), bufsize);
+ log_debug (_("SDL-AGG: %i byte offscreen buffer allocated"), bufsize);
// Only the AGG renderer has the function init_buffer, which is *not* part
of
Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- libamf/amf.cpp 1 Feb 2008 01:42:40 -0000 1.59
+++ libamf/amf.cpp 19 Feb 2008 19:20:50 -0000 1.60
@@ -174,18 +174,18 @@
AMF::amf_element_t el;
- log_msg(_("Type is %s"), astype_str[type]);
+ log_debug(_("Type is %s"), astype_str[type]);
// x++; // skip the type byte
switch (type) {
case Element::NUMBER:
// AMF numbers are 64-bit big-endian integers.
num = extractNumber(x);
-// log_msg(_("Number is " AMFNUM_F), num));
+// log_debug(_("Number is " AMFNUM_F), num));
break;
case Element::BOOLEAN:
boolshift = *x;
- log_msg(_("Boolean is %d"), boolshift);
+ log_debug(_("Boolean is %d"), boolshift);
break;
case Element::STRING:
string str = extractString(x);
@@ -199,7 +199,7 @@
// *src to a sequence of wide characters as if by repeated
// calls of the form:
// mbsrtowcs
- log_msg(_("String is %s"), mstr);
+ log_debug(_("String is %s"), mstr);
break;
case Element::OBJECT:
// return reinterpret_cast<uint8_t *>(extractObject(x));
@@ -216,7 +216,7 @@
log_unimpl("Null AMF decoder");
break;
case Element::UNDEFINED:
- log_msg(_("Undefined element"));
+ log_debug(_("Undefined element"));
break;
case Element::REFERENCE:
log_unimpl("Reference AMF decoder");
@@ -232,14 +232,14 @@
break;
case Element::DATE:
nanosecs = *(double *)swapBytes(x+1, 8);
-// log_msg(_("Date is " AMFNUM_F " nanoseconds"), nanosecs);
+// log_debug(_("Date is " AMFNUM_F " nanoseconds"), nanosecs);
break;
case Element::LONG_STRING:
// int length = *(short *)swapBytes(x, 4);
x+=4; // skip the length bytes
// mstr = new char[length+1];
// memcpy(mstr, x, length);
-// log_msg(_("String is %s"), mstr);
+// log_debug(_("String is %s"), mstr);
break;
case Element::RECORD_SET:
log_unimpl("Recordset AMF decoder");
@@ -677,7 +677,7 @@
hexint = new boost::uint8_t[(el->getLength() + 4) *3];
hexify((boost::uint8_t *)hexint, (boost::uint8_t *)tmp,
el->getLength() + AMF_HEADER_SIZE, true);
- log_msg(_("The packet head is: 0x%s"), hexint);
+ log_debug(_("The packet head is: 0x%s"), hexint);
#endif
// The 'pad' in this case is a serious hack. I think it
// may be an artifact, but one guess is it's a 16bit word
@@ -1373,26 +1373,26 @@
boost::uint8_t *tmpptr = in;
- log_msg (_("AMF header byte is: 0x%X"), *in);
+ log_debug (_("AMF header byte is: 0x%X"), *in);
_amf_index = *tmpptr & AMF_INDEX_MASK;
- log_msg (_("The AMF channel index is %d"), _amf_index);
+ log_debug (_("The AMF channel index is %d"), _amf_index);
_header_size = headerSize(*tmpptr++);
- log_msg (_("The header size is %d"), _header_size);
+ log_debug (_("The header size is %d"), _header_size);
#if 1
boost::uint8_t *hexint;
hexint = new boost::uint8_t[(_header_size + 3) *3];
hexify((boost::uint8_t *)hexint, (uint8_t *)in, _header_size, false);
- log_msg(_("The packet head is: 0x%s"), hexint);
+ log_debug(_("The packet head is: 0x%s"), hexint);
#endif
if (_header_size >= 4) {
hexify((boost::uint8_t *)hexint, (boost::uint8_t *)tmpptr, 3, false);
_mystery_word = *tmpptr++;
_mystery_word = (_mystery_word << 12) + *tmpptr++;
_mystery_word = (_mystery_word << 8) + *tmpptr++;
- log_msg(_("The mystery word is: %d or 0x%s"), _mystery_word, hexint);
+ log_debug(_("The mystery word is: %d or 0x%s"), _mystery_word, hexint);
}
if (_header_size >= 8) {
@@ -1401,7 +1401,7 @@
_total_size = (_total_size << 12) + *tmpptr++;
_total_size = (_total_size << 8) + *tmpptr++;
_total_size = _total_size & 0xffffff;
- log_msg(_("The body size is: %d, or 0x%s"), _total_size, hexint);
+ log_debug(_("The body size is: %d, or 0x%s"), _total_size, hexint);
_amf_data = new uint8_t(_total_size+1);
_seekptr = _amf_data;
// memset(_amf_data, 0, _total_size+1);
@@ -1411,7 +1411,7 @@
hexify((boost::uint8_t *)hexint, (boost::uint8_t *)tmpptr, 1, false);
_type = *(content_types_e *)tmpptr;
tmpptr++;
- log_msg(_("The type is: %d, or 0x%s"), _type, hexint);
+ log_debug(_("The type is: %d, or 0x%s"), _type, hexint);
}
switch(_type) {
@@ -1438,7 +1438,7 @@
hexify((boost::uint8_t *)hexint, (boost::uint8_t *)tmpptr, 3, false);
_src_dest = *(reinterpret_cast<amfsource_e *>(tmpptr));
tmpptr += sizeof(unsigned int);
- log_msg(_("The source/destination is: %d, or 0x%s"), _src_dest,
hexint);
+ log_debug(_("The source/destination is: %d, or 0x%s"), _src_dest,
hexint);
}
return _packet_size;
@@ -1485,7 +1485,7 @@
boost::uint8_t* hexint;
hexint = (boost::uint8_t*) malloc((bytes * 3) + 12);
hexify((boost::uint8_t *)hexint, (boost::uint8_t *)in, bytes, true);
- log_msg(_("The packet body is: 0x%s"), hexint);
+ log_debug(_("The packet body is: 0x%s"), hexint);
free(hexint);
#endif
@@ -1514,11 +1514,11 @@
// get the length of the name
length = ntohs((*(short *)tmpptr) & 0xffff);
tmpptr += 2;
-// log_msg(_("AMF String length is: %d"), length);
+// log_debug(_("AMF String length is: %d"), length);
if (length > 0) {
// get the name of the element
el->makeString(tmpptr, length);
-// log_msg(_("AMF String is: %s"), el->to_string());
+// log_debug(_("AMF String is: %s"), el->to_string());
tmpptr += length;
} else {
el->setType(Element::STRING);
@@ -1575,7 +1575,7 @@
el->setLength(length);
if (length == 0) {
if (*(tmpptr+2) == Element::OBJECT_END) {
-// log_msg(_("End of Object definition"));
+// log_debug(_("End of Object definition"));
el->setLength(0);
el->setType(Element::OBJECT_END);
tmpptr+=3;
@@ -1587,7 +1587,7 @@
#if 0
uint8_t hexint[AMF_PACKET_SIZE];
hexify((uint8_t *)hexint, (uint8_t *)tmpptr, length*3, true);
- log_msg(_("The element is: 0x%s"), hexint);
+ log_debug(_("The element is: 0x%s"), hexint);
#endif
tmpptr += 2;
// get the name of the element
@@ -1597,17 +1597,17 @@
return 0;
}
-// log_msg(_("AMF element length is: %d"), length);
+// log_debug(_("AMF element length is: %d"), length);
memcpy(buffer, tmpptr, length);
el->setName(buffer);
tmpptr += length;
}
-// log_msg(_("AMF element name is: %s"), buffer);
+// log_debug(_("AMF element name is: %s"), buffer);
Element::astype_e type = (Element::astype_e)((*tmpptr++) & 0xff);
if (type <= Element::TYPED_OBJECT) {
-// log_msg(_("AMF type is: %s"), Element::astype_str[(int)type]);
+// log_debug(_("AMF type is: %s"), Element::astype_str[(int)type]);
el->setType(type);
}
@@ -1624,7 +1624,7 @@
uint8_t hexint[AMF_NUMBER_SIZE*3];
hexify((uint8_t *)hexint, (uint8_t *)buffer,
AMF_NUMBER_SIZE, false);
- log_msg(_("Number \"%s\" is: 0x%s"), el->getName().c_str(), hexint);
+ log_debug(_("Number \"%s\" is: 0x%s"), el->getName().c_str(),
hexint);
// double *num = extractNumber(tmpptr);
#endif
tmpptr += 8;
@@ -1649,12 +1649,12 @@
memcpy(str, tmpptr, length);
el->setData(str);
// string v(reinterpret_cast<const char *>(str) + 3, (int)length);
-// log_msg(_("Variable \"%s\" is: %s"), el->getName().c_str(),
v.c_str());
+// log_debug(_("Variable \"%s\" is: %s"), el->getName().c_str(),
v.c_str());
tmpptr += length;
break;
case Element::OBJECT:
while (*(tmpptr++) != Element::OBJECT_END) {
- log_msg("Look for end of object...");
+ log_debug("Look for end of object...");
}
break;
@@ -1669,7 +1669,7 @@
case Element::ECMA_ARRAY:
// FIXME this shouldn't fall thru
case Element::OBJECT_END:
-// log_msg(_("End of Object definition"));
+// log_debug(_("End of Object definition"));
el->makeObjectEnd();
break;
case Element::TYPED_OBJECT:
Index: libamf/rtmp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/rtmp.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libamf/rtmp.cpp 21 Jan 2008 22:55:27 -0000 1.20
+++ libamf/rtmp.cpp 19 Feb 2008 19:20:50 -0000 1.21
@@ -84,7 +84,7 @@
memset(buffer, 0, RTMP_BODY_SIZE+16);
if (readNet(buffer, 1) == 1) {
- log_msg (_("Read initial Handshake Request"));
+ log_debug (_("Read initial Handshake Request"));
} else {
log_error (_("Couldn't read initial Handshake Request"));
return false;
@@ -92,7 +92,7 @@
_inbytes += 1;
if (*buffer == 0x3) {
- log_msg (_("Handshake is correct"));
+ log_debug (_("Handshake is correct"));
} else {
log_error (_("Handshake isn't correct; "
"Data read is: 0x%x"), *buffer);
@@ -101,7 +101,7 @@
if (readNet(buffer, RTMP_BODY_SIZE) == RTMP_BODY_SIZE) {
_inbytes += RTMP_BODY_SIZE;
- log_msg (_("Read Handshake Data"));
+ log_debug (_("Read Handshake Data"));
// _body = new char(RTMP_BODY_SIZE+1);
memcpy(_body, buffer, RTMP_BODY_SIZE);
} else {
@@ -173,14 +173,14 @@
memset(buffer, 0, RTMP_BODY_SIZE+1);
if (readNet(buffer, RTMP_BODY_SIZE) == RTMP_BODY_SIZE) {
- log_msg (_("Read first data block in handshake"));
+ log_debug (_("Read first data block in handshake"));
} else {
log_error (_("Couldn't read first data block in handshake"));
return false;
}
_inbytes += RTMP_BODY_SIZE;
if (readNet(buffer, RTMP_BODY_SIZE) == RTMP_BODY_SIZE) {
- log_msg (_("Read second data block in handshake"));
+ log_debug (_("Read second data block in handshake"));
// _body = new char(RTMP_BODY_SIZE+1);
// memcpy(_body, buffer, RTMP_BODY_SIZE);
} else {
@@ -205,7 +205,7 @@
memset(buffer, 0, RTMP_BODY_SIZE+1);
if (readNet(buffer, RTMP_BODY_SIZE) == RTMP_BODY_SIZE) {
- log_msg (_("Read Handshake Finish Data"));
+ log_debug (_("Read Handshake Finish Data"));
} else {
log_error (_("Couldn't read Handshake Finish Data"));
return false;
@@ -215,7 +215,7 @@
// FIXME: These should match, and appear to in GDB, but this triggers
// an error of some kind.
// if (memcmp(buffer, _body, 10) == 0) {
-// log_msg (_("Handshake Finish Data matches"));
+// log_debug (_("Handshake Finish Data matches"));
// } else {
// log_error (_("Handshake Finish Data doesn't match"));
// return false;
@@ -264,7 +264,7 @@
//
address@hidden@\000\000\000\000\000\000\003\000\003app\002\000#software/gnash/tests/1153948634.flv\000\bflashVer\002\000\fLNX
6,0,82,0\000\006swfUrl\002\000\035file:///file|address@hidden://localhost/software/gnash/tests/1153948634
if ((ret = readNet(reinterpret_cast<char *>(buffer), 1)) > 0) {
- log_msg (_("Read first RTMP header byte"));
+ log_debug (_("Read first RTMP header byte"));
} else {
log_error (_("Couldn't read first RTMP header byte"));
return false;
@@ -272,12 +272,12 @@
amf_index = *tmpptr & AMF_INDEX_MASK;
headersize = AMF::headerSize(*tmpptr++);
- log_msg (_("The Header size is: %d"), headersize);
- log_msg (_("The AMF index is: 0x%x"), amf_index);
+ log_debug (_("The Header size is: %d"), headersize);
+ log_debug (_("The AMF index is: 0x%x"), amf_index);
if (headersize > 1) {
if ((ret = readNet(reinterpret_cast<char *>(tmpptr), headersize-1)) >
0) {
- log_msg (_("Read first RTMP packet header of header size %d"),
+ log_debug (_("Read first RTMP packet header of header size %d"),
ret);
_inbytes += ret;
} else {
@@ -294,19 +294,19 @@
tmpptr = buffer;
while ((ret = readNet(reinterpret_cast<char *>(buffer), packetsize, 1)) >
0) {
- log_msg (_("Reading AMF packets till we're done..."));
+ log_debug (_("Reading AMF packets till we're done..."));
amf->addPacketData(tmpptr, ret);
tmpptr = buffer + ret;
_inbytes += ret;
#if 1
hexify(hexint, buffer, packetsize, true);
- log_msg (_("The packet data is: 0x%s"), (char *)hexint);
+ log_debug (_("The packet data is: 0x%s"), (char *)hexint);
hexify(hexint, buffer, packetsize, false);
- log_msg (_("The packet data is: 0x%s"), (char *)hexint);
+ log_debug (_("The packet data is: 0x%s"), (char *)hexint);
#endif
}
- log_msg (_("Done reading packet"));
+ log_debug (_("Done reading packet"));
amf->parseBody();
return true;
Index: libamf/sol.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/sol.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libamf/sol.cpp 13 Feb 2008 14:02:47 -0000 1.22
+++ libamf/sol.cpp 19 Feb 2008 19:20:50 -0000 1.23
@@ -190,7 +190,7 @@
hexint = new unsigned char[(_header.size() + 3) *3];
hexify(hexint, (unsigned char *)_header, _header.size(), true);
- log_msg (_("%s: SOL file header is: \n%s"), __FUNCTION__, (char *)hexint);
+ log_debug (_("%s: SOL file header is: \n%s"), __FUNCTION__, (char
*)hexint);
delete hexint;
#endif
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- libbase/curl_adapter.cpp 21 Jan 2008 20:55:44 -0000 1.46
+++ libbase/curl_adapter.cpp 19 Feb 2008 19:20:50 -0000 1.47
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: curl_adapter.cpp,v 1.46 2008/01/21 20:55:44 rsavoye Exp $ */
+/* $Id: curl_adapter.cpp,v 1.47 2008/02/19 19:20:50 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -420,7 +420,7 @@
_error = TU_FILE_OPEN_ERROR;
_running = false;
} else {
- gnash::log_msg ("HTTP response %ld from
url %s",
+ gnash::log_debug ("HTTP response %ld
from url %s",
code, _url.c_str());
}
Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/extension.cpp 21 Jan 2008 20:55:44 -0000 1.16
+++ libbase/extension.cpp 19 Feb 2008 19:20:50 -0000 1.17
@@ -16,7 +16,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: extension.cpp,v 1.16 2008/01/21 20:55:44 rsavoye Exp $ */
+/* $Id: extension.cpp,v 1.17 2008/02/19 19:20:50 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -78,7 +78,7 @@
_pluginsdir = env;
}
- log_msg("Plugins path: %s", _pluginsdir);
+ log_debug("Plugins path: %s", _pluginsdir);
lt_dlsetsearchpath(_pluginsdir);
}
@@ -122,7 +122,7 @@
vector<string>::iterator it;
for (it = _modules.begin(); it != _modules.end(); it++) {
mod = *(it);
- log_msg(_("Loading module: %s"), mod.c_str());
+ log_security(_("Loading module: %s"), mod.c_str());
SharedLib sl;
initModule(mod.c_str(), obj);
}
@@ -138,7 +138,7 @@
SharedLib *sl;
string symbol;
- log_msg(_("Initializing module: \"%s\""), module);
+ log_security(_("Initializing module: \"%s\""), module);
symbol = module;
if (_plugins[module] == 0) {
@@ -168,7 +168,7 @@
SharedLib::initentry *symptr;
SharedLib *sl;
- log_msg(_("Initializing module: \"%s\""), module);
+ log_security(_("Initializing module: \"%s\""), module);
if (_plugins[module] == 0) {
sl = new SharedLib(module);
@@ -220,7 +220,7 @@
while (dir) {
- log_msg(_("Scanning directory \"%s\" for plugins"), dir);
+ log_debug(_("Scanning directory \"%s\" for plugins"), dir);
DIR *library_dir = opendir(dir);
if (library_dir == NULL) {
@@ -247,11 +247,11 @@
continue;
}
- log_msg(_("Gnash Plugin name: %s"), entry->d_name);
+ log_debug(_("Gnash Plugin name: %s"), entry->d_name);
if (strcmp(suffix, ".so") == 0) {
*suffix = 0;
- log_msg(_("Gnash Plugin name: %s"), entry->d_name);
+ log_debug(_("Gnash Plugin name: %s"), entry->d_name);
_modules.push_back(entry->d_name);
} else {
continue;
Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- libbase/log.cpp 19 Feb 2008 00:47:17 -0000 1.61
+++ libbase/log.cpp 19 Feb 2008 19:20:50 -0000 1.62
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: log.cpp,v 1.61 2008/02/19 00:47:17 strk Exp $ */
+/* $Id: log.cpp,v 1.62 2008/02/19 19:20:50 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -190,22 +190,6 @@
LogFile& dbglogfile = LogFile::getDefaultInstance();
}
-// Printf-style log for debugging info.
-void
-log_msg(const char* fmt, ...)
-{
- va_list ap;
- char tmp[BUFFER_SIZE];
-
- va_start (ap, fmt);
- vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
- tmp[BUFFER_SIZE-1] = '\0';
-
- dbglogfile.log(tmp);
-
- va_end (ap);
-}
-
void
log_trace(const char* fmt, ...)
{
Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- libbase/log.h 23 Jan 2008 16:33:45 -0000 1.63
+++ libbase/log.h 19 Feb 2008 19:20:50 -0000 1.64
@@ -219,14 +219,6 @@
#define GNUC_LOG_ATTRS
#endif
-/// Log a generic message
-//
-/// This is usually used for debugging, so most
-/// such calls should be in comments, unless you're actively debugging
-/// that piece of code right now.
-///
-DSOEXPORT void log_msg(const char* fmt, ...) GNUC_LOG_ATTRS;
-
/// Log a runtime error
//
/// Runtime errors, such as un-openable files, un-allocatable memory,
Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- libbase/network.cpp 21 Jan 2008 20:55:44 -0000 1.33
+++ libbase/network.cpp 19 Feb 2008 19:20:50 -0000 1.34
@@ -188,7 +188,7 @@
// char ascip[INET_ADDRSTRLEN];
// inet_ntop(sock_in.sin_family, &_ipaddr, ascip, INET_ADDRSTRLEN);
char *ascip = ::inet_ntoa(sock_in.sin_addr);
- log_msg(_("Server bound to service on %s, port %hd, using fd
%d"),
+ log_debug(_("Server bound to service on %s, port %hd, using fd
%d"),
ascip, ntohs(sock_in.sin_port),
_listenfd);
}
@@ -231,7 +231,7 @@
alen = sizeof(struct sockaddr_in);
if (_debug) {
- log_msg(_("Trying to accept net traffic on fd %d"), _sockfd);
+ log_debug(_("Trying to accept net traffic on fd %d"), _sockfd);
}
if (_listenfd <= 2) {
@@ -261,25 +261,25 @@
if (FD_ISSET(0, &fdset)) {
if (_debug) {
- log_msg(_("There is data at the console for stdin"));
+ log_debug(_("There is data at the console for stdin"));
}
return true;
}
// If interupted by a system call, try again
if (ret == -1 && errno == EINTR) {
- log_msg(_("The accept() socket for fd %d was interupted by a
system call"), _listenfd);
+ log_debug(_("The accept() socket for fd %d was interupted by a
system call"), _listenfd);
}
if (ret == -1) {
- log_msg(_("The accept() socket for fd %d never was available for
writing"),
+ log_debug(_("The accept() socket for fd %d never was available for
writing"),
_listenfd);
return false;
}
if (ret == 0) {
if (_debug) {
- log_msg(_("The accept() socket for fd %d timed out waiting to
write"),
+ log_debug(_("The accept() socket for fd %d timed out waiting
to write"),
_listenfd);
}
}
@@ -296,7 +296,7 @@
}
if (_debug) {
- log_msg(_("Accepting tcp/ip connection on fd %d"), _sockfd);
+ log_debug(_("Accepting tcp/ip connection on fd %d"), _sockfd);
}
return true;
@@ -343,14 +343,14 @@
// If interupted by a system call, try again
if (ret == -1 && errno == EINTR)
{
- log_msg(_("The connect() socket for fd %d was interupted by a
system call"),
+ log_debug(_("The connect() socket for fd %d was interupted by
a system call"),
_sockfd);
continue;
}
if (ret == -1)
{
- log_msg(_("The connect() socket for fd %d never was available
for writing"),
+ log_debug(_("The connect() socket for fd %d never was
available for writing"),
_sockfd);
#ifdef HAVE_WINSOCK_H
::shutdown(_sockfd, 0); // FIXME: was SHUT_BOTH
@@ -369,7 +369,7 @@
if (ret > 0) {
ret = ::connect(_sockfd, reinterpret_cast<struct sockaddr
*>(&addr), sizeof(addr));
if (ret == 0) {
- log_msg(_("\tsocket name %s for fd %d"), sockname, _sockfd);
+ log_debug(_("\tsocket name %s for fd %d"), sockname, _sockfd);
_connected = true;
assert(_sockfd > 0);
return true;
@@ -439,15 +439,15 @@
return false;
}
- log_msg(_("%s: to host %s at port %d"), __FUNCTION__, hostname, port);
+ log_debug(_("%s: to host %s at port %d"), __FUNCTION__, hostname, port);
memset(&sock_in, 0, sizeof(struct sockaddr_in));
memset(&thishostname, 0, MAXHOSTNAMELEN);
if (strlen(hostname) == 0) {
if (gethostname(thishostname, MAXHOSTNAMELEN) == 0) {
- log_msg(_("The hostname for this machine is %s"), thishostname);
+ log_debug(_("The hostname for this machine is %s"), thishostname);
} else {
- log_msg(_("Couldn't get the hostname for this machine"));
+ log_debug(_("Couldn't get the hostname for this machine"));
return false;
}
}
@@ -461,7 +461,7 @@
#if 0
char ascip[INET_ADDRSTRLEN];
inet_ntop(sock_in.sin_family, &sock_in.sin_addr.s_addr, ascip,
INET_ADDRSTRLEN);
- log_msg(_("The IP address for this client socket is %s"), ascip);
+ log_debug(_("The IP address for this client socket is %s"), ascip);
#endif
proto = ::getprotobyname("TCP");
@@ -491,14 +491,14 @@
// If interupted by a system call, try again
if (ret == -1 && errno == EINTR)
{
- log_msg(_("The connect() socket for fd %d was interupted by a
system call"),
+ log_debug(_("The connect() socket for fd %d was interupted by
a system call"),
_sockfd);
continue;
}
if (ret == -1)
{
- log_msg(_("The connect() socket for fd %d never was available
for writing"),
+ log_debug(_("The connect() socket for fd %d never was
available for writing"),
_sockfd);
#ifdef HAVE_WINSOCK_H
::shutdown(_sockfd, 0); // FIXME: was SHUT_BOTH
@@ -520,7 +520,7 @@
char *ascip = ::inet_ntoa(sock_in.sin_addr);
// char ascip[INET_ADDRSTRLEN];
// inet_ntop(sock_in.sin_family, &sock_in.sin_addr.s_addr, ascip,
INET_ADDRSTRLEN);
- log_msg(_("\tport %d at IP %s for fd %d"), port,
+ log_debug(_("\tport %d at IP %s for fd %d"), port,
ascip, _sockfd);
_connected = true;
assert(_sockfd > 0);
@@ -603,7 +603,7 @@
#endif
retries++;
} else {
- log_msg(_("Closed the socket on fd %d"), sockfd);
+ log_debug(_("Closed the socket on fd %d"), sockfd);
return true;
}
}
@@ -631,7 +631,7 @@
if (fd > 0) {
::close(fd);
- log_msg("%s: Closed fd %d", __FUNCTION__, fd);
+ log_debug("%s: Closed fd %d", __FUNCTION__, fd);
// closeNet(fd);
}
@@ -701,7 +701,7 @@
ret = read(fd, buffer, nbytes);
if (_debug) {
- log_msg (_("read %d bytes from fd %d"), ret, fd);
+ log_debug (_("read %d bytes from fd %d"), ret, fd);
}
}
@@ -710,10 +710,10 @@
hexint = new unsigned char[(nbytes + 3) *3];
hexify(hexint, (unsigned char *)buffer, ret, true);
- log_msg (_("%s: Read packet data from fd %d: \n%s"),
+ log_debug (_("%s: Read packet data from fd %d: \n%s"),
__FUNCTION__, fd, (char *)hexint);
// hexify(hexint, (unsigned char *)buffer, ret, false);
-// log_msg (_("%s: The packet data is: 0x%s"), __FUNCTION__, (char
*)hexint);
+// log_debug (_("%s: The packet data is: 0x%s"), __FUNCTION__, (char
*)hexint);
delete hexint;
#endif
return ret;
@@ -814,12 +814,12 @@
bufptr += ret;
if (ret != nbytes) {
if (_debug) {
- log_msg (_("wrote %d bytes to fd %d, expected %d"),
+ log_debug (_("wrote %d bytes to fd %d, expected %d"),
ret, fd, nbytes);
}
} else {
if (_debug) {
- log_msg (_("wrote %d bytes to fd %d"),
+ log_debug (_("wrote %d bytes to fd %d"),
ret, fd);
}
// return ret;
@@ -835,7 +835,7 @@
if ((endtime.tv_sec - starttime.tv_sec) &&
endtime.tv_usec - starttime.tv_usec)
{
- log_msg (_("took %d usec to write (%d bytes)"),
+ log_debug (_("took %d usec to write (%d bytes)"),
endtime.tv_usec - starttime.tv_usec, bytes_written);
}
}
@@ -846,10 +846,10 @@
hexint = new unsigned char[(nbytes + 3) *3];
hexify(hexint, (unsigned char *)buffer, nbytes, true);
- log_msg (_("%s: Wrote packet data to fd %d: \n%s"),
+ log_debug (_("%s: Wrote packet data to fd %d: \n%s"),
__FUNCTION__, fd, (char *)hexint);
// hexify(hexint, (unsigned char *)buffer, ret, false);
-// log_msg (_("%s: Read packet data from fd %d: 0x%s"),
+// log_debug (_("%s: Read packet data from fd %d: 0x%s"),
// __FUNCTION__, fd, (char *)hexint);
delete hexint;
#endif
Index: libbase/sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/sharedlib.cpp 21 Jan 2008 20:55:45 -0000 1.19
+++ libbase/sharedlib.cpp 19 Feb 2008 19:20:50 -0000 1.20
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: sharedlib.cpp,v 1.19 2008/01/21 20:55:45 rsavoye Exp $ */
+/* $Id: sharedlib.cpp,v 1.20 2008/02/19 19:20:50 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -106,7 +106,7 @@
if (errors) {
log_error (_("Couldn't initialize ltdl: %s"), lt_dlerror());
// } else {
-// log_msg ("Initialized ltdl");
+// log_debug ("Initialized ltdl");
}
char *pluginsdir;
char *env = getenv ("GNASH_PLUGINS");
@@ -166,7 +166,7 @@
// cerr << "Searching in " << lt_dlgetsearchpath()
// << "for database drivers" << endl;
-// log_msg ("Trying to open shared library \"%s\"", filespec);
+// log_debug ("Trying to open shared library \"%s\"", filespec);
_dlhandle = lt_dlopenext (filespec);
if (_dlhandle == NULL) {
@@ -177,7 +177,7 @@
// Make this module unloadable
lt_dlmakeresident(_dlhandle);
- log_msg (_("Opened dynamic library \"%s\""), filespec);
+ log_debug (_("Opened dynamic library \"%s\""), filespec);
_filespec = filespec;
@@ -215,7 +215,7 @@
log_error (_("Couldn't find symbol: %s"), symbol);
return NULL;
} else {
- log_msg (_("Found symbol %s @ %p"), symbol, (void *)run);
+ log_debug (_("Found symbol %s @ %p"), symbol, (void *)run);
}
return (initentry *)run;
@@ -240,7 +240,7 @@
log_error (_("Couldn't find symbol: %s"), symbol);
return NULL;
} else {
- log_msg (_("Found symbol %s @ %p"), symbol, (void *)run);
+ log_debug (_("Found symbol %s @ %p"), symbol, (void *)run);
}
return (entrypoint *)run;
Index: libbase/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/shm.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/shm.cpp 18 Feb 2008 19:06:57 -0000 1.5
+++ libbase/shm.cpp 19 Feb 2008 19:20:50 -0000 1.6
@@ -112,7 +112,7 @@
}
_addr = (char *)shmat(_shmfd, 0, 0);
if (_addr <= 0) {
- log_msg("WARNING: shmat() failed: %s\n", strerror(errno));
+ log_debug("WARNING: shmat() failed: %s\n", strerror(errno));
return false;
}
@@ -154,7 +154,7 @@
absfilespec.size() - MAX_SHM_NAME_SIZE);
}
- // log_msg("%s: Initializing %d bytes of memory for \"%s\"\n",
+ // log_debug("%s: Initializing %d bytes of memory for \"%s\"\n",
// __PRETTY_FUNCTION__, DEFAULT_SHM_SIZE, absfilespec.c_str());
// Adjust the allocated amount of memory to be on a page boundary.
@@ -164,7 +164,7 @@
long pageSize = sysconf(_SC_PAGESIZE);
if (_size % pageSize) {
_size += pageSize - _size % pageSize;
-// log_msg("Adjusting segment size to %d to be page aligned.\n", _size);
+// log_debug("Adjusting segment size to %d to be page aligned.\n", _size);
}
#endif
@@ -213,7 +213,7 @@
{
// If it already exists, then just attach to it.
exists = true;
- log_msg("Shared Memory segment \"%s\" already exists\n",
+ log_debug("Shared Memory segment \"%s\" already exists\n",
filespec);
#ifdef USE_POSIX_SHM
// shm_unlink(filespec);
@@ -247,14 +247,14 @@
#endif
{
exists = true;
- log_msg(
+ log_error(
#ifdef USE_POSIX_SHM
- "WARNING: shm_open() failed, retrying: %s\n",
+ "shm_open() failed, retrying: %s\n",
#else
# ifdef USE_SYSV_SHM
- "WARNING: shmget() failed, retrying: %s\n",
+ "shmget() failed, retrying: %s\n",
# else
- "WARNING: CreateFileMapping() failed, retrying: %s\n",
+ "CreateFileMapping() failed, retrying: %s\n",
# endif
#endif
strerror(errno));
@@ -283,21 +283,21 @@
MAP_SHARED|MAP_INHERIT|MAP_HASSEMAPHORE,
_shmfd, 0));
if (_addr == MAP_FAILED) {
- log_msg("WARNING: mmap() failed: %s\n", strerror(errno));
+ log_error("mmap() failed: %s\n", strerror(errno));
return false;
}
#else // else of HAVE_SHM_OPEN
# ifdef HAVE_SHMAT
_addr = (char *)shmat(_shmfd, 0, 0);
if (_addr <= 0) {
- log_msg("WARNING: shmat() failed: %s\n", strerror(errno));
+ log_error("shmat() failed: %s\n", strerror(errno));
return false;
}
# else
# ifdef __riscos__
_addr = (char *)malloc(_size);
if (_addr == 0) {
- log_msg("WARNING: malloc() failed\n");
+ log_error("malloc() failed\n");
return false;
}
# else
@@ -306,7 +306,7 @@
# endif
#endif
#endif
-// log_msg("The address to the shared memory segment is: %p", _addr);
+// log_debug("The address to the shared memory segment is: %p", _addr);
if (exists && !nuke) {
// If there is an existing memory segment that we don't
// want to trash, we just want to attach to it. We know
@@ -322,14 +322,14 @@
// allocator for STL containers will work.
addr = *(reinterpret_cast<long *>(_addr));
if (addr == 0) {
- log_msg("WARNING: No address found in memory segment!\n");
+ log_error("No address found in memory segment!\n");
nuke = true;
} else {
#ifdef FLAT_ADDR_SPACE
- log_msg("Adjusting address to 0x%lx\n", addr);
+ log_debug("Adjusting address to 0x%lx\n", addr);
#ifdef USE_POSIX_SHM
munmap(_addr, _size);
- log_msg("Unmapped address %p\n", _addr);
+ log_debug("Unmapped address %p\n", _addr);
#ifdef darwin
_addr = static_cast<char *>(mmap(reinterpret_cast<char *>(addr),
_size, PROT_READ,
@@ -342,7 +342,7 @@
MAP_FIXED|MAP_SHARED, _shmfd, 0));
#endif
if (_addr == MAP_FAILED) {
- log_msg("WARNING: MMAP failed: %s\n", strerror(errno));
+ log_error("MMAP failed: %s\n", strerror(errno));
return static_cast<Shm *>(0);
}
}
@@ -364,13 +364,13 @@
#else // else of FLAT_ADDR_SPACE
#endif // end of FLAT_ADDR_SPACE
- log_msg("Opened Shared Memory segment \"%s\": " SIZET_FMT " bytes at
%p.\n",
+ log_debug("Opened Shared Memory segment \"%s\": " SIZET_FMT " bytes at
%p.\n",
filespec, _size, _addr);
}
#ifdef USE_POSIX_SHM
if (nuke) {
- log_msg("Zeroing %d bytes at %p.\n", _size, _addr);
+ log_debug("Zeroing %d bytes at %p.\n", _size, _addr);
// Nuke all the segment, so we don't have any problems
// with leftover data.
memset(_addr, 0, _size);
@@ -382,7 +382,7 @@
sc = reinterpret_cast<Shm *>(_addr);
#endif
} else {
- log_msg("ERROR: Couldn't open the Shared Memory segment \"%s\"! %s\n",
+ log_error("Couldn't open the Shared Memory segment \"%s\"! %s\n",
filespec, strerror(errno));
return false;
}
@@ -405,7 +405,7 @@
// GNASH_REPORT_FUNCTION;
if (_addr > 0) {
-// log_msg("Cloning ShmControl, %d bytes to %p\n",
+// log_debug("Cloning ShmControl, %d bytes to %p\n",
// sizeof(Shm), _addr);
// set the allocated bytes before we copy so the value is
// correct in both instantiations of this object.
@@ -414,7 +414,7 @@
return reinterpret_cast<Shm *>(_addr);
}
- log_msg("WARNING: Can't clone Self, address 0x0\n");
+ log_error("Can't clone Self, address 0x0\n");
return static_cast<Shm *>(0);
}
@@ -465,7 +465,7 @@
void *addr = (static_cast<char *>(_addr)) + _alloced;
- log_msg("%s: Allocating %d bytes at %p\n",
+ log_debug("%s: Allocating %d bytes at %p\n",
__PRETTY_FUNCTION__, bytes, addr);
// Zero out the block before returning it
memset(addr, 0, bytes);
@@ -480,7 +480,7 @@
void *addr = (static_cast<char *>(_addr)) + _alloced;
- log_msg("%s: Allocating %d bytes at %p\n",
+ log_debug("%s: Allocating %d bytes at %p\n",
__PRETTY_FUNCTION__, bytes, addr);
// Zero out the block before returning it
Index: libmedia/gst/VideoDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/VideoDecoderGst.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libmedia/gst/VideoDecoderGst.cpp 18 Feb 2008 19:36:00 -0000 1.14
+++ libmedia/gst/VideoDecoderGst.cpp 19 Feb 2008 19:20:51 -0000 1.15
@@ -16,7 +16,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: VideoDecoderGst.cpp,v 1.14 2008/02/18 19:36:00 nelsonrn Exp $
+// $Id: VideoDecoderGst.cpp,v 1.15 2008/02/19 19:20:51 bwy Exp $
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -234,7 +234,7 @@
break;
}
case GST_MESSAGE_EOS:
- log_msg(_("NetStream has reached the end of the stream."));
+ log_debug(_("NetStream has reached the end of the stream."));
break;
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- plugin/plugin.cpp 30 Jan 2008 23:32:58 -0000 1.96
+++ plugin/plugin.cpp 19 Feb 2008 19:20:51 -0000 1.97
@@ -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: plugin.cpp,v 1.96 2008/01/30 23:32:58 strk Exp $ */
+/* $Id: plugin.cpp,v 1.97 2008/02/19 19:20:51 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -302,7 +302,7 @@
{
val = data->argv[i];
}
- //log_msg("PARAM: %s = %s", name.c_str(), val.c_str());
+ //log_debug("PARAM: %s = %s", name.c_str(), val.c_str());
_params[name] = val;
}
}
@@ -403,7 +403,7 @@
}
else
{
- log_msg("%s: X origin = %d, Y Origin = %d, Width = %d,"
+ log_debug("%s: X origin = %d, Y Origin = %d, Width = %d,"
" Height = %d, WindowID = %p, this = %p",
__FUNCTION__,
aWindow->x, aWindow->y, aWindow->width, aWindow->height,
@@ -492,7 +492,7 @@
#if 0
nsPluginInstance *arg = (nsPluginInstance *)this;
- log_msg("%s: this = %p, URL is %s", __PRETTY_FUNCTION__,
+ log_debug("%s: this = %p, URL is %s", __PRETTY_FUNCTION__,
(void *)arg, stream->url);
#endif
@@ -545,7 +545,7 @@
{
#if 0
- log_msg("Reading Stream %s, offset is %d, length = %d",
+ log_debug("Reading Stream %s, offset is %d, length = %d",
stream->url, offset, len);
#endif
Index: plugin/win32/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/win32/plugin.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- plugin/win32/plugin.cpp 21 Jan 2008 23:28:04 -0000 1.11
+++ plugin/win32/plugin.cpp 19 Feb 2008 19:20:51 -0000 1.12
@@ -259,7 +259,7 @@
log_error (_("can't get info about %s"), getFilename());
return;
}
- log_msg(_("Movie %s: width is %d, height is %d, version is %d\n"),
getFilename(),
+ log_debug(_("Movie %s: width is %d, height is %d, version is %d\n"),
getFilename(),
movie_width, movie_height, movie_version);
// new thread must have own movie instance
@@ -344,7 +344,7 @@
// nsPluginInstance::shut() has been called for this instance.
if (getShutdown())
{
- log_msg (_("player: Shutting down as requested..."));
+ log_debug (_("player: Shutting down as requested..."));
break;
}
Index: server/BitmapMovieInstance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapMovieInstance.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/BitmapMovieInstance.cpp 21 Jan 2008 20:55:46 -0000 1.13
+++ server/BitmapMovieInstance.cpp 19 Feb 2008 19:20:51 -0000 1.14
@@ -42,7 +42,7 @@
character_def* chdef = def->get_character_def(1);
assert(chdef);
boost::intrusive_ptr<character> ch =
chdef->create_character_instance(this, 1);
- //log_msg("Created char in BitmapMovieInstance is a %s",
typeid(*ch).name());
+ //log_debug("Created char in BitmapMovieInstance is a %s",
typeid(*ch).name());
int depth = 1+character::staticDepthOffset;
int clip_depth = character::noClipDepthValue;
place_character(ch.get(), depth, cxform(), mat, 1, clip_depth);
Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/FreetypeGlyphsProvider.cpp 21 Jan 2008 20:55:47 -0000 1.19
+++ server/FreetypeGlyphsProvider.cpp 19 Feb 2008 19:20:51 -0000 1.20
@@ -433,7 +433,7 @@
//FT_BBox glyphBox;
//FT_Outline_Get_BBox(outline, &glyphBox);
//rect r(glyphBox.xMin, glyphBox.yMin, glyphBox.xMax, glyphBox.yMax);
- //log_msg("Glyph for character '%c' has computed bounds %s", code,
r.toString().c_str());
+ //log_debug("Glyph for character '%c' has computed bounds %s", code,
r.toString().c_str());
sh = new DynamicShape();
sh->beginFill(rgba(255, 255, 255, 255));
@@ -455,7 +455,7 @@
FT_Outline_Decompose(outline, &walk, &walker);
#ifdef DEBUG_OUTLINE_DECOMPOSITION
rect bound; sh->compute_bound(&bound);
- log_msg("Decomposed glyph for character '%c' has bounds %s", code,
bound.toString().c_str());
+ log_debug("Decomposed glyph for character '%c' has bounds %s", code,
bound.toString().c_str());
#endif
return sh.get();
Index: server/LoadVariablesThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/LoadVariablesThread.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/LoadVariablesThread.cpp 21 Jan 2008 20:55:47 -0000 1.8
+++ server/LoadVariablesThread.cpp 19 Feb 2008 19:20:51 -0000 1.9
@@ -32,7 +32,7 @@
void
LoadVariablesThread::completeLoad()
{
- //log_msg("completeLoad called");
+ //log_debug("completeLoad called");
using std::string;
@@ -50,23 +50,23 @@
unsigned int parsedLines = 0;
while ( size_t read = _stream->read_bytes(buf, CHUNK_SIZE) )
{
- //log_msg("Read %u bytes", read);
+ //log_debug("Read %u bytes", read);
// TODO: use read_string ?
string chunk(buf, read);
toparse += chunk;
- //log_msg("toparse: %s", toparse.c_str());
+ //log_debug("toparse: %s", toparse.c_str());
// parse remainder
size_t lastamp = toparse.rfind('&');
if ( lastamp != string::npos )
{
string parseable = toparse.substr(0, lastamp);
- //log_msg("parseable: %s", parseable.c_str());
+ //log_debug("parseable: %s", parseable.c_str());
parse(parseable);
toparse = toparse.substr(lastamp+1);
- //log_msg("toparse nextline: %s", toparse.c_str());
+ //log_debug("toparse nextline: %s", toparse.c_str());
++parsedLines;
}
Index: server/LoadVariablesThread.h
===================================================================
RCS file: /sources/gnash/gnash/server/LoadVariablesThread.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/LoadVariablesThread.h 21 Jan 2008 20:55:47 -0000 1.5
+++ server/LoadVariablesThread.h 19 Feb 2008 19:20:52 -0000 1.6
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: LoadVariablesThread.h,v 1.5 2008/01/21 20:55:47 rsavoye Exp $ */
+/* $Id: LoadVariablesThread.h,v 1.6 2008/02/19 19:20:52 bwy Exp $ */
#ifndef GNASH_LOADVARIABLESTHREAD_H
#define GNASH_LOADVARIABLESTHREAD_H
@@ -152,9 +152,9 @@
/// likely my own knowledge of it)
static void execLoadingThread(LoadVariablesThread* ptr)
{
- //log_msg("LoadVars loading thread started");
+ //log_debug("LoadVars loading thread started");
ptr->completeLoad();
- //log_msg("LoadVars loading thread completed");
+ //log_debug("LoadVars loading thread completed");
}
@@ -163,7 +163,7 @@
{
boost::mutex::scoped_lock lock(_mutex);
_completed = true;
- //log_msg("Completed");
+ //log_debug("Completed");
}
Index: server/PropertyList.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/PropertyList.cpp 21 Jan 2008 20:55:47 -0000 1.28
+++ server/PropertyList.cpp 19 Feb 2008 19:20:52 -0000 1.29
@@ -307,7 +307,7 @@
string_table& st = VM::get().getStringTable();
for (container::const_iterator it=_props.begin(), itEnd=_props.end();
it != itEnd; ++it )
{
- log_msg(" %s: %s", st.value(it->mName).c_str(),
+ log_debug(" %s: %s", st.value(it->mName).c_str(),
it->getValue(this_ptr).to_string().c_str());
}
}
Index: server/PropertyList.h
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/PropertyList.h 21 Jan 2008 20:55:47 -0000 1.22
+++ server/PropertyList.h 19 Feb 2008 19:20:52 -0000 1.23
@@ -406,7 +406,7 @@
return _props.size();
}
- /// Dump all members (using log_msg)
+ /// Dump all members (using log_debug)
//
/// @param this_ptr
/// The as_object used to set the 'this' pointer
Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/URLAccessManager.cpp 21 Jan 2008 20:55:48 -0000 1.24
+++ server/URLAccessManager.cpp 19 Feb 2008 19:20:52 -0000 1.25
@@ -102,7 +102,7 @@
AccessPolicyCache::iterator it = policyCache.find(url);
if ( it != policyCache.end() )
{
- log_msg("%s access to %s (cached).\n",
+ log_security("%s access to %s (cached).\n",
accessPolicyString(it->second),
url.c_str());
@@ -111,7 +111,7 @@
if ( ! isatty(fileno(stdin)) )
{
- log_msg("%s access to %s (input is not a terminal).\n",
+ log_security("%s access to %s (input is not a terminal).\n",
accessPolicyString(defaultAccessPolicy),
url.c_str());
@@ -139,7 +139,7 @@
// cache for next time
policyCache[url] = userChoice;
- log_msg("%s access to %s (user choice).\n",
+ log_security("%s access to %s (user choice).\n",
accessPolicyString(userChoice),
url.c_str());
@@ -269,7 +269,7 @@
{
// GNASH_REPORT_FUNCTION;
- //log_msg("Checking security of host: %s", host.c_str());
+ //log_security("Checking security of host: %s", host.c_str());
assert( ! host.empty() );
Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/array.cpp 21 Jan 2008 20:55:48 -0000 1.92
+++ server/array.cpp 19 Feb 2008 19:20:52 -0000 1.93
@@ -733,7 +733,7 @@
std::auto_ptr<as_array_object> newarray(new as_array_object);
#ifdef GNASH_DEBUG
- log_msg(_("Array.slice(%u, %u) called"), start, one_past_end);
+ log_debug(_("Array.slice(%u, %u) called"), start, one_past_end);
#endif
size_t newsize = one_past_end - start;
@@ -762,8 +762,8 @@
std::ostream_iterator<as_value> ostrIter(ss, "," ) ;
std::copy(replace.begin(), replace.end(), ostrIter);
ss << ") called";
- log_msg("%s", ss.str().c_str());
- log_msg(_("Current array is %s"), toString().c_str());
+ log_debug("%s", ss.str().c_str());
+ log_debug(_("Current array is %s"), toString().c_str());
#endif
container::iterator itStart = elements.begin()+start;
@@ -887,7 +887,7 @@
#ifdef GNASH_DEBUG
std::stringstream ss;
fn.dump_args(ss);
- log_msg(_("Array(%s).splice(%s) called"), array->toString().c_str(),
ss.str().c_str());
+ log_debug(_("Array(%s).splice(%s) called"), array->toString().c_str(),
ss.str().c_str());
#endif
if (fn.nargs < 1)
@@ -909,7 +909,7 @@
startoffset = iclamp(start, 0, origlen);
#ifdef GNASH_DEBUG
if ( startoffset != start )
- log_msg(_("Array.splice: start:%d became %u"), start,
startoffset);
+ log_debug(_("Array.splice: start:%d became %u"), start,
startoffset);
#endif
//----------------
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/as_environment.cpp 24 Jan 2008 13:30:56 -0000 1.124
+++ server/as_environment.cpp 19 Feb 2008 19:20:52 -0000 1.125
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: as_environment.cpp,v 1.124 2008/01/24 13:30:56 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.125 2008/02/19 19:20:52 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -295,10 +295,10 @@
as_object* target = m_target;
std::string path;
std::string var;
- //log_msg(_("set_variable(%s, %s)"), varname.c_str(),
val.to_debug_string().c_str());
+ //log_debug(_("set_variable(%s, %s)"), varname.c_str(),
val.to_debug_string().c_str());
if ( parse_path(varname, path, var) )
{
- //log_msg(_("Variable '%s' parsed into path='%s', var='%s'"),
varname.c_str(), path.c_str(), var.c_str());
+ //log_debug(_("Variable '%s' parsed into path='%s', var='%s'"),
varname.c_str(), path.c_str(), var.c_str());
//target = find_target(path);
target = find_object(path, &scopeStack);
if (target)
@@ -534,13 +534,13 @@
as_environment::find_object(const std::string& path_in, const ScopeStack*
scopeStack) const
{
#ifdef DEBUG_TARGET_FINDING
- log_msg(_("find_object(%s) called"), path_in.c_str());
+ log_debug(_("find_object(%s) called"), path_in.c_str());
#endif
if (path_in.empty())
{
#ifdef DEBUG_TARGET_FINDING
- log_msg(_("Returning m_target (empty path)"));
+ log_debug(_("Returning m_target (empty path)"));
#endif
return m_target; // or should we return the *original* path ?
}
@@ -564,7 +564,7 @@
if ( ! *(++p) )
{
#ifdef DEBUG_TARGET_FINDING
- log_msg(_("Path is '/', return the root (%p)"), (void*)root);
+ log_debug(_("Path is '/', return the root (%p)"), (void*)root);
#endif
return root; // that's all folks..
}
@@ -574,14 +574,14 @@
dot_allowed = false;
#ifdef DEBUG_TARGET_FINDING
- log_msg(_("Absolute path, start at the root (%p)"), (void*)env);
+ log_debug(_("Absolute path, start at the root (%p)"), (void*)env);
#endif
}
#ifdef DEBUG_TARGET_FINDING
else
{
- log_msg(_("Relative path, start at (%s)"),
m_target->getTarget().c_str());
+ log_debug(_("Relative path, start at (%s)"),
m_target->getTarget().c_str());
}
#endif
@@ -596,7 +596,7 @@
if ( ! *p )
{
#ifdef DEBUG_TARGET_FINDING
- log_msg(_("Path is %s, returning the root"), path.c_str());
+ log_debug(_("Path is %s, returning the root"), path.c_str());
#endif
return env;
}
@@ -638,7 +638,7 @@
if ( subpart.empty() )
{
#ifdef DEBUG_TARGET_FINDING
- log_msg(_("No more subparts, env is %p"), (void*)env);
+ log_debug(_("No more subparts, env is %p"), (void*)env);
#endif
break;
}
@@ -698,14 +698,14 @@
{
#ifdef DEBUG_TARGET_FINDING
- log_msg(_("Invoking get_path_element(%s) on object %p (%s)"),
subpart.c_str(), (void *)env, env->get_text_value().c_str());
+ log_debug(_("Invoking get_path_element(%s) on object %p (%s)"),
subpart.c_str(), (void *)env, env->get_text_value().c_str());
#endif
as_object* element = env->get_path_element(subpartKey);
if ( ! element )
{
#ifdef DEBUG_TARGET_FINDING
- log_msg(_("Path element %s not found in object %p"),
subpart.c_str(), (void *)env);
+ log_debug(_("Path element %s not found in object %p"),
subpart.c_str(), (void *)env);
#endif
return NULL;
}
@@ -760,7 +760,7 @@
PropMap props;
const_cast<as_object*>(locals.get())->dump_members(props);
- //log_msg("FIXME: implement dumper for local variables now that they
are simple objects");
+ //log_debug("FIXME: implement dumper for local variables now that they
are simple objects");
int count = 0;
for (PropMap::iterator i=props.begin(), e=props.end(); i!=e; ++i)
{
Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/as_function.cpp 21 Jan 2008 20:55:48 -0000 1.48
+++ server/as_function.cpp 19 Feb 2008 19:20:52 -0000 1.49
@@ -92,7 +92,7 @@
function_ctor(const fn_call& /* fn */)
{
boost::intrusive_ptr<as_object> func = new
as_object(getFunctionPrototype());
- //log_msg(_("User tried to invoke new Function()"));
+ //log_debug(_("User tried to invoke new Function()"));
return as_value(func.get());
}
@@ -302,7 +302,7 @@
if ( ! fn.nargs )
{
- log_msg (_("Function.call() with no args"));
+ log_debug (_("Function.call() with no args"));
new_fn_call.nargs=0;
}
else
@@ -338,9 +338,9 @@
// Call the function
return (*function_obj)(new_fn_call);
- //log_msg(_("at function_call exit, stack: \n")); fn.env->dump_stack();
+ //log_debug(_("at function_call exit, stack: \n"));
fn.env->dump_stack();
- //log_msg(_("%s: tocheck \n"), __FUNCTION__);
+ //log_debug(_("%s: tocheck \n"), __FUNCTION__);
}
boost::intrusive_ptr<as_object>
Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/as_object.cpp 15 Feb 2008 10:12:54 -0000 1.98
+++ server/as_object.cpp 19 Feb 2008 19:20:52 -0000 1.99
@@ -69,7 +69,7 @@
void operator() (string_table::key name, const as_value& val)
{
if (name == NSV::PROP_uuPROTOuu) return;
- //log_msg(_("Setting member '%s' to value '%s'"), name.c_str(),
val.to_debug_string().c_str());
+ //log_debug(_("Setting member '%s' to value '%s'"),
name.c_str(), val.to_debug_string().c_str());
_tgt.set_member(name, val);
}
};
@@ -340,7 +340,7 @@
as_object::set_member_default(string_table::key key, const as_value& val,
string_table::key nsname)
{
- //log_msg(_("set_member_default(%s)"), key.c_str());
+ //log_debug(_("set_member_default(%s)"), key.c_str());
Property* prop = findUpdatableProperty(key, nsname);
if (prop)
{
@@ -360,7 +360,7 @@
}
catch (ActionException& exc)
{
- log_msg(_("%s: Exception %s. Will create a new member"),
+ log_aserror(_("%s: Exception %s. Will create a new
member"),
_vm.getStringTable().value(key).c_str(),
exc.what());
}
@@ -385,7 +385,7 @@
{
std::pair<bool,bool> ret; // first is found, second is updated
- //log_msg(_("set_member_default(%s)"), key.c_str());
+ //log_debug(_("set_member_default(%s)"), key.c_str());
Property* prop = findUpdatableProperty(key, nsname);
if (prop)
{
@@ -404,7 +404,7 @@
}
catch (ActionException& exc)
{
- log_msg(_("%s: Exception %s. Will create a new member"),
+ log_debug(_("%s: Exception %s. Will create a new
member"),
_vm.getStringTable().value(key).c_str(),
exc.what());
}
@@ -468,7 +468,7 @@
// We shouldn't attempt to initialize a property twice, should we ?
assert(success);
- //log_msg(_("Initialized property '%s'"), name.c_str());
+ //log_debug(_("Initialized property '%s'"), name.c_str());
// TODO: optimize this, don't scan again !
_members.setFlags(key, flags, nsname);
@@ -569,7 +569,7 @@
void
as_object::dump_members()
{
- log_msg(_(SIZET_FMT " members of object %p follow"),
+ log_debug(_(SIZET_FMT " members of object %p follow"),
_members.size(), (const void*)this);
_members.dump(*this);
}
Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/as_object.h 15 Feb 2008 10:12:55 -0000 1.92
+++ server/as_object.h 19 Feb 2008 19:20:52 -0000 1.93
@@ -125,7 +125,7 @@
}
- /// Dump all properties using log_msg
+ /// Dump all properties using log_debug
//
/// Note that this method is non-const
/// as some properties might be getter/setter
Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/character.cpp 11 Feb 2008 10:24:57 -0000 1.78
+++ server/character.cpp 19 Feb 2008 19:20:53 -0000 1.79
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: character.cpp,v 1.78 2008/02/11 10:24:57 udog Exp $ */
+/* $Id: character.cpp,v 1.79 2008/02/19 19:20:53 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -594,7 +594,7 @@
{
_event_handlers[id].push_back(&code);
- //log_msg(_("Setting handler for event %s"),
id.get_function_name().c_str());
+ //log_debug(_("Setting handler for event %s"),
id.get_function_name().c_str());
// Set the character as a listener iff the
// kind of event is a KEY or MOUSE one
@@ -608,7 +608,7 @@
case event_id::MOUSE_UP:
case event_id::MOUSE_DOWN:
case event_id::MOUSE_MOVE:
- //log_msg(_("Registering character as having mouse
events"));
+ //log_debug(_("Registering character as having mouse
events"));
has_mouse_event();
break;
default:
Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/debugger.cpp 24 Jan 2008 12:05:04 -0000 1.24
+++ server/debugger.cpp 19 Feb 2008 19:20:53 -0000 1.25
@@ -139,7 +139,7 @@
Debugger::watch_state_e wstate;
bool keep_going = true;
- log_msg (_("Debugger enabled >> "));
+ log_debug (_("Debugger enabled >> "));
while (keep_going) {
cerr << "gnashdbg> ";
cin >> action;
@@ -452,11 +452,11 @@
std::map<std::string, bool>::const_iterator it;
it =_breakpoints.find(func);
if (it == _breakpoints.end()) {
-// log_msg ("No Match for variable \"%s\"", var);
+// log_debug ("No Match for variable \"%s\"", var);
return false;
} else {
if (state == _breakpoints[func]) {
-// log_msg ("Matched for Function \"%s\"", func);
+// log_debug ("Matched for Function \"%s\"", func);
this->console();
return true;
}
@@ -469,7 +469,7 @@
{
// GNASH_REPORT_FUNCTION;
_watchpoints[var] = state;
- log_msg (_("Setting watchpoint for variable: \"%s\""), var.c_str());
+ log_debug (_("Setting watchpoint for variable: \"%s\""), var.c_str());
}
void
@@ -512,11 +512,11 @@
std::map<std::string, watch_state_e>::const_iterator it;
it =_watchpoints.find(var);
if (it == _watchpoints.end()) {
-// log_msg ("No Match for variable \"%s\"", var);
+// log_debug ("No Match for variable \"%s\"", var);
return false;
} else {
if (state == _watchpoints[var]) {
- log_msg (_("Matched for variable \"%s\": \"%s\""), var.c_str(),
+ log_debug (_("Matched for variable \"%s\": \"%s\""), var.c_str(),
state_strs[state]);
this->console();
return true;
@@ -567,7 +567,7 @@
return;
}
if (env.stack_size()) {
- log_msg (_("Stack Dump of: %p"), (void *)&env);
+ log_debug (_("Stack Dump of: %p"), (void *)&env);
for (unsigned int i=0, n=env.stack_size(); i<n; i++) {
// FIXME, shouldn't these go to the log as well as to cerr?
cerr << "\t" << i << ": ";
@@ -595,7 +595,7 @@
}
}
else {
- log_msg (_("Stack Dump of 0x%p: empty"), (void *)&env);
+ log_debug (_("Stack Dump of 0x%p: empty"), (void *)&env);
}
}
@@ -630,7 +630,7 @@
}
std::string registers;
stringstream ss;
- log_msg (_("Global Registers Dump:"));
+ log_debug (_("Global Registers Dump:"));
for (unsigned int i=0; i<4; ++i) {
ss << "\treg #" << i << ": \"";
ss << env.global_register(i).to_debug_string() << "\"" << endl;
@@ -707,7 +707,7 @@
std::map<void *, std::string>::const_iterator it;
for (it=_symbols.begin(); it != _symbols.end(); it++) {
if (it->second == namei) {
-// log_msg ("Found symbol %s at address %p", namei.c_str(),
+// log_debug ("Found symbol %s at address %p", namei.c_str(),
// it->first);
return it->first;
}
@@ -724,7 +724,7 @@
std::string namei = PROPNAME(name);
if (namei.size() > 1)
{
-// log_msg ("Adding symbol %s at address: %p", namei, ptr);
+// log_debug ("Adding symbol %s at address: %p", namei, ptr);
_symbols[ptr] = namei;
}
@@ -742,10 +742,10 @@
it = _symbols.find(ptr);
// dbglogfile.setStamp(false);
if (it != _symbols.end()) {
-// log_msg ("Found symbol %s at address: %p", it->second.c_str(), ptr);
+// log_debug ("Found symbol %s at address: %p", it->second.c_str(),
ptr);
str = it->second;
// } else {
-// log_msg ("No symbol found for address %p", ptr);
+// log_debug ("No symbol found for address %p", ptr);
}
}
// dbglogfile.setStamp(false);
Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- server/dlist.cpp 11 Feb 2008 12:55:22 -0000 1.113
+++ server/dlist.cpp 19 Feb 2008 19:20:53 -0000 1.114
@@ -183,9 +183,9 @@
int clip_depth)
{
// GNASH_REPORT_FUNCTION;
- //log_msg(_("dl::add(%d, '%s')"), depth, ch->get_name());
+ //log_debug(_("dl::add(%d, '%s')"), depth, ch->get_name());
- //log_msg(_("Before adding, list is:"));
+ //log_debug(_("Before adding, list is:"));
//dump();
assert(!ch->isUnloaded());
@@ -202,14 +202,14 @@
if ( it == _charsByDepth.end() || (*it)->get_depth() != depth )
{
- //log_msg(_("place_character: new character at depth %d"), depth);
+ //log_debug(_("place_character: new character at depth %d"), depth);
// add the new char
_charsByDepth.insert(it, DisplayItem(ch));
}
else
{
- //log_msg(_("place_character: replacing existing character at depth %d"),
depth);
+ //log_debug(_("place_character: replacing existing character at depth
%d"), depth);
// remember bounds of old char
InvalidatedRanges old_ranges;
@@ -316,7 +316,7 @@
// Error, no existing object found at depth.
// IF_VERBOSE_DEBUG(
-// log_msg(_("dl::replace_display_object()"
+// log_debug(_("dl::replace_display_object()"
// " no obj at depth %d"), depth)
// );
@@ -391,7 +391,7 @@
testInvariant();
//GNASH_REPORT_FUNCTION;
- //IF_VERBOSE_DEBUG(log_msg(_("dl::move(%d)"), depth));
+ //IF_VERBOSE_DEBUG(log_debug(_("dl::move(%d)"), depth));
character* ch = get_character_at_depth(depth);
if ( ! ch )
@@ -444,7 +444,7 @@
testInvariant();
- //log_msg(_("Before removing, list is:"));
+ //log_debug(_("Before removing, list is:"));
//dump();
#ifndef NDEBUG
@@ -486,7 +486,7 @@
testInvariant();
- //log_msg(_("Done removing, list is:"));
+ //log_debug(_("Done removing, list is:"));
//dump();
}
@@ -743,7 +743,7 @@
it != endIt; ++it)
{
const DisplayItem& dobj = *it;
- log_msg(_("Item %d at depth %d (char id %d, name %s, type %s)"),
+ log_debug(_("Item %d at depth %d (char id %d, name %s, type %s)"),
num, dobj->get_depth(), dobj->get_id(),
dobj->get_name().c_str(), typeName(*dobj).c_str());
num++;
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- server/edit_text_character.cpp 12 Feb 2008 08:46:07 -0000 1.156
+++ server/edit_text_character.cpp 19 Feb 2008 19:20:53 -0000 1.157
@@ -683,7 +683,7 @@
character*
edit_text_character::get_topmost_mouse_entity(float x, float y)
{
- //log_msg("get_topmost_mouse_entity called on edit_text_character %p,
labeled '%s'", (void*)this, get_text_value().c_str());
+ //log_debug("get_topmost_mouse_entity called on edit_text_character %p,
labeled '%s'", (void*)this, get_text_value().c_str());
if (get_visible() == false)
{
@@ -741,7 +741,7 @@
format_text();
- //log_msg(_("Text set to %s"), new_text.c_str());
+ //log_debug(_("Text set to %s"), new_text.c_str());
}
@@ -790,7 +790,7 @@
edit_text_character::set_member(string_table::key name,
const as_value& val, string_table::key nsname)
{
- //log_msg("edit_text_character.set_member(%s, %s)", name.c_str(),
val.to_string());
+ //log_debug("edit_text_character.set_member(%s, %s)", name.c_str(),
val.to_string());
// FIXME: Turn all standard members into getter/setter properties
// of the TextField class. See attachTextFieldInterface()
@@ -980,7 +980,7 @@
edit_text_character::get_member(string_table::key name, as_value* val,
string_table::key nsname)
{
- //log_msg("edit_text_character.get_member(%s)", name.c_str());
+ //log_debug("edit_text_character.get_member(%s)", name.c_str());
// FIXME: Turn all standard members into getter/setter properties
// of the TextField class. See attachTextFieldInterface()
@@ -1532,7 +1532,7 @@
const char* varname = var_str.c_str();
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_msg(_("VariableName: %s"), var_str.c_str());
+ log_debug(_("VariableName: %s"), var_str.c_str());
#endif
/// Why isn't get_environment const again ?
@@ -1548,7 +1548,7 @@
if ( as_environment::parse_path(varname, path, var) )
{
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_msg(_("Variable text Path: %s, Var: %s"), path.c_str(),
var.c_str());
+ log_debug(_("Variable text Path: %s, Var: %s"), path.c_str(),
var.c_str());
#endif
// find target for the path component
// we use our parent's environment for this
@@ -1584,7 +1584,7 @@
if ( _text_variable_registered )
{
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_msg(_("registerTextVariable() no-op call (already
registered)"));
+ log_debug(_("registerTextVariable() no-op call (already
registered)"));
#endif
return;
}
@@ -1592,7 +1592,7 @@
if ( _variable_name.empty() )
{
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_msg(_("string is empty, consider as registered"));
+ log_debug(_("string is empty, consider as registered"));
#endif
_text_variable_registered=true;
return;
@@ -1619,7 +1619,7 @@
if (target->get_member(key, &val) )
{
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_msg(_("target sprite (%p) does have a member named %s"),
(void*)sprite, _vm.getStringTable().value(key).c_str());
+ log_debug(_("target sprite (%p) does have a member named %s"),
(void*)sprite, _vm.getStringTable().value(key).c_str());
#endif
// TODO: pass environment to to_string ?
// as_environment& env = get_environment();
@@ -1628,7 +1628,7 @@
else
{
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_msg(_("target sprite (%p) does NOT have a member named %s
(no problem, we'll add it)"), (void*)sprite,
_vm.getStringTable().value(key).c_str());
+ log_debug(_("target sprite (%p) does NOT have a member named %s
(no problem, we'll add it)"), (void*)sprite,
_vm.getStringTable().value(key).c_str());
#endif
target->set_member(key,
as_value(utf8::encodeCanonicalString(_text, version)));
}
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/font.cpp 31 Jan 2008 14:26:19 -0000 1.57
+++ server/font.cpp 19 Feb 2008 19:20:53 -0000 1.58
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: font.cpp,v 1.57 2008/01/31 14:26:19 strk Exp $ */
+/* $Id: font.cpp,v 1.58 2008/02/19 19:20:53 bwy Exp $ */
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
@@ -478,7 +478,7 @@
{
glyph_index = it->second;
#if 0
- log_msg(_("get_glyph_index(%u) returning %d"),
+ log_debug(_("get_glyph_index(%u) returning %d"),
code, glyph_index);
#endif
return glyph_index;
@@ -490,7 +490,7 @@
glyph_index =
const_cast<font*>(this)->add_os_glyph(code);
}
#if 0
- log_msg(_("get_glyph_index(%u) returning -1"), code);
+ log_debug(_("get_glyph_index(%u) returning -1"), code);
#endif
return glyph_index;
}
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- server/impl.cpp 22 Jan 2008 21:04:54 -0000 1.139
+++ server/impl.cpp 19 Feb 2008 19:20:53 -0000 1.140
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: impl.cpp,v 1.139 2008/01/22 21:04:54 strk Exp $ */
+/* $Id: impl.cpp,v 1.140 2008/02/19 19:20:53 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -289,7 +289,7 @@
// Put extracted info in the given vars.
// Sets *version to 0 if info can't be extracted.
{
- //log_msg(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str().c_str());
+ //log_debug(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str().c_str());
tu_file* in = globals::streamProvider.getStream(url);
if (in == NULL || in->get_error() != TU_FILE_NO_ERROR) {
@@ -384,7 +384,7 @@
}
BitmapMovieDefinition* mdef = new BitmapMovieDefinition(im, url);
- //log_msg(_("BitmapMovieDefinition %p created"), mdef);
+ //log_debug(_("BitmapMovieDefinition %p created"), mdef);
return mdef;
}
@@ -407,7 +407,7 @@
}
BitmapMovieDefinition* mdef = new BitmapMovieDefinition(im, url);
- //log_msg(_("BitmapMovieDefinition %p created"), mdef);
+ //log_debug(_("BitmapMovieDefinition %p created"), mdef);
return mdef;
#endif
@@ -545,7 +545,7 @@
std::string url_str = url.str();
const char* c_url = url_str.c_str();
-// log_msg(_("%s: url is %s"), __PRETTY_FUNCTION__, c_url);
+// log_debug(_("%s: url is %s"), __PRETTY_FUNCTION__, c_url);
std::auto_ptr<tu_file> in ( globals::streamProvider.getStream(url) );
if ( ! in.get() )
@@ -787,7 +787,7 @@
//
movie_definition* create_library_movie(const URL& url, const char* real_url,
bool startLoaderThread)
{
-// log_msg(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str().c_str());
+// log_debug(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str().c_str());
// Use real_url as label for cache if available
std::string cache_label = real_url ? URL(real_url).str() : url.str();
@@ -797,7 +797,7 @@
boost::intrusive_ptr<movie_definition> m;
if ( s_movie_library.get(cache_label, &m) )
{
- log_msg(_("Movie %s already in library"), cache_label.c_str());
+ log_debug(_("Movie %s already in library"), cache_label.c_str());
return m.get();
}
}
@@ -807,7 +807,7 @@
// calling create_library_movie() again and NOT finding
// the just-created movie.
movie_definition* mov = create_movie(url, real_url, false);
- //log_msg(_("create_movie(%s, %s, false) returned %p"), url.str().c_str(),
real_url, mov);
+ //log_debug(_("create_movie(%s, %s, false) returned %p"), url.str().c_str(),
real_url, mov);
if (mov == NULL)
{
@@ -818,7 +818,7 @@
// Movie is good, add to the library
s_movie_library.add(cache_label, mov);
- log_msg(_("Movie %s (SWF%d) added to library"), cache_label.c_str(),
mov->get_version());
+ log_debug(_("Movie %s (SWF%d) added to library"), cache_label.c_str(),
mov->get_version());
// Now complete the load if the movie is an SWF movie
//
@@ -834,7 +834,7 @@
}
}
- //log_msg(_("create_library_movie(%s, %s, startLoaderThread=%d) about to
return %p"), url.str().c_str(), real_url, startLoaderThread, mov);
+ //log_debug(_("create_library_movie(%s, %s, startLoaderThread=%d) about to
return %p"), url.str().c_str(), real_url, startLoaderThread, mov);
return mov;
}
Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/matrix.cpp 28 Jan 2008 15:16:51 -0000 1.24
+++ server/matrix.cpp 19 Feb 2008 19:20:53 -0000 1.25
@@ -19,7 +19,7 @@
//
// Original author: Thatcher Ulrich <address@hidden> 2003
//
-// $Id: matrix.cpp,v 1.24 2008/01/28 15:16:51 strk Exp $
+// $Id: matrix.cpp,v 1.25 2008/02/19 19:20:53 bwy Exp $
//
#ifdef HAVE_CONFIG_H
@@ -244,7 +244,7 @@
m_[1][2] = (float) in.read_sint(translate_nbits);
}
- //IF_VERBOSE_PARSE(log_msg(" mat: has_scale = %d, has_rotate = %d\n",
has_scale, has_rotate));
+ //IF_VERBOSE_PARSE(log_parse(" mat: has_scale = %d, has_rotate =
%d\n", has_scale, has_rotate));
}
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- server/movie_root.cpp 10 Feb 2008 09:36:38 -0000 1.160
+++ server/movie_root.cpp 19 Feb 2008 19:20:53 -0000 1.161
@@ -445,7 +445,7 @@
if ( _allowRescale ) // Recompute pixel scale.
{
- //log_msg("Rescaling allowed");
+ //log_debug("Rescaling allowed");
// should we cache this ? it's immutable after all !
// WARNING: don't allow swapping depth of the root movie !!
@@ -458,7 +458,7 @@
}
else // rescale not allowed, notify Stage (if any)
{
- //log_msg("Rescaling disabled");
+ //log_debug("Rescaling disabled");
boost::intrusive_ptr<Stage> stage = getStageObject();
if ( stage ) stage->onResize();
}
@@ -499,9 +499,9 @@
std::string objName = PROPNAME("Key");
if (global->get_member(vm.getStringTable().find(objName),
&kval) )
{
- //log_msg("Found member 'Key' in _global: %s",
kval.to_string());
+ //log_debug("Found member 'Key' in _global: %s",
kval.to_string());
boost::intrusive_ptr<as_object> obj = kval.to_object();
- //log_msg("_global.Key to_object() : %s @ %p",
typeid(*obj).name(), obj);
+ //log_debug("_global.Key to_object() : %s @ %p",
typeid(*obj).name(), obj);
_keyobject =
boost::dynamic_pointer_cast<key_as_object>( obj );
}
}
@@ -592,7 +592,7 @@
{
assert(testInvariant());
- //log_msg("Mouse click notification");
+ //log_debug("Mouse click notification");
if (mouse_pressed)
{
m_mouse_buttons |= button_mask;
@@ -794,7 +794,7 @@
ms->m_active_entity = active_entity;
ms->m_topmost_entity = topmost_entity;
- //if ( ! need_redisplay ) log_msg("Hurray, an event didnt' trigger
redisplay!");
+ //if ( ! need_redisplay ) log_debug("Hurray, an event didn't trigger
redisplay!");
return need_redisplay;
}
@@ -847,7 +847,7 @@
{
// GNASH_REPORT_FUNCTION;
-// log_msg ("X is %d, Y is %d, Button is %d", m_mouse_x,
+// log_debug ("X is %d, Y is %d, Button is %d", m_mouse_x,
// m_mouse_y, m_mouse_buttons);
assert(testInvariant());
@@ -1127,7 +1127,7 @@
void movie_root::notify_key_listeners(key::code k, bool down)
{
- // log_msg("Notifying " SIZET_FMT " character Key listeners",
+ // log_debug("Notifying " SIZET_FMT " character Key listeners",
// m_key_listeners.size());
KeyListeners copy = m_key_listeners;
@@ -1189,7 +1189,7 @@
void
movie_root::notify_mouse_listeners(const event_id& event)
{
- //log_msg("Notifying " SIZET_FMT " listeners about %s",
+ //log_debug("Notifying " SIZET_FMT " listeners about %s",
// m_mouse_listeners.size(),
event.get_function_name().c_str());
CharacterList copy = m_mouse_listeners;
@@ -1264,7 +1264,7 @@
if ( ! entity.get() ) return false;
#if 0 // debugging...
- log_msg("The active entity under the pointer is a %s",
+ log_debug("The active entity under the pointer is a %s",
typeid(*entity).name());
#endif
@@ -1415,7 +1415,7 @@
{
assert(lvl >= 0 && lvl < apSIZE);
#ifdef GNASH_DEBUG
- log_msg("Pushed action buffer for target %s",
target->getTargetPath().c_str());
+ log_debug("Pushed action buffer for target %s",
target->getTargetPath().c_str());
#endif
std::auto_ptr<ExecutableCode> code ( new GlobalCode(buf, target) );
@@ -1439,7 +1439,7 @@
{
assert(lvl >= 0 && lvl < apSIZE);
#ifdef GNASH_DEBUG
- log_msg("Pushed function (event hanlder?) with target %s",
target->getTargetPath().c_str());
+ log_debug("Pushed function (event hanlder?) with target %s",
target->getTargetPath().c_str());
#endif
std::auto_ptr<ExecutableCode> code ( new FunctionCode(func, target) );
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -b -r1.478 -r1.479
--- server/sprite_instance.cpp 18 Feb 2008 11:29:07 -0000 1.478
+++ server/sprite_instance.cpp 19 Feb 2008 19:20:53 -0000 1.479
@@ -271,7 +271,7 @@
if (fn.nargs > 3 ) {
boost::intrusive_ptr<as_object> initObject = fn.arg(3).to_object();
if ( initObject ) {
- //log_msg(_("Initializing properties from object"));
+ //log_debug(_("Initializing properties from object"));
newch->copyProperties(*initObject);
} else {
// This is actually a valid thing to do,
@@ -659,7 +659,7 @@
mr.loadMovie(url, target); // ADD GET/SET !!
//sprite->loadMovie(url);
- //log_msg("MovieClip.loadMovie(%s) - TESTING ", url.str().c_str());
+ //log_debug("MovieClip.loadMovie(%s) - TESTING ", url.str().c_str());
//log_unimp("%s", __PRETTY_FUNCTION__);
@@ -1279,7 +1279,7 @@
rgba color(r, g, b, a);
- //log_msg("Color: %s", color.toString().c_str());
+ //log_debug("Color: %s", color.toString().c_str());
#ifdef DEBUG_DRAWING_API
log_debug("%s.lineStyle(%d,%d,%d,%d);", sprite->getTarget().c_str(),
thickness, r, g, b);
@@ -4166,7 +4166,7 @@
log_error(_("Could not load variables from %s"), url.str().c_str());
}
- //log_msg(_(SIZET_FMT " loadVariables requests pending"),
_loadVariableRequests.size());
+ //log_debug(_(SIZET_FMT " loadVariables requests pending"),
_loadVariableRequests.size());
}
@@ -4187,7 +4187,7 @@
{
const string name = PROPNAME(it->first);
const string& val = it->second;
- //log_msg(_("Setting variable '%s' to value '%s'"), name.c_str(),
val.c_str());
+ //log_debug(_("Setting variable '%s' to value '%s'"), name.c_str(),
val.c_str());
set_member(st.find(name), val.c_str());
}
Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- server/sprite_instance.h 13 Feb 2008 18:44:08 -0000 1.169
+++ server/sprite_instance.h 19 Feb 2008 19:20:53 -0000 1.170
@@ -666,7 +666,7 @@
/// FIXME: unimplemented
virtual void on_event_xmlsocket_onxml()
{
- log_msg("FIXME: %s: unimplemented\n", __FUNCTION__);
+ log_debug("FIXME: %s: unimplemented\n", __FUNCTION__);
on_event(event_id::SOCK_XML);
}
@@ -674,14 +674,14 @@
/// specified interval.
virtual void on_event_interval_timer()
{
- log_msg("FIXME: %s: unimplemented\n", __FUNCTION__);
+ log_debug("FIXME: %s: unimplemented\n", __FUNCTION__);
on_event(event_id::TIMER);
}
/// Do the events that happen as a MovieClip (swf 7 only) loads.
virtual void on_event_load_progress()
{
- log_msg("FIXME: %s: unimplemented\n", __FUNCTION__);
+ log_debug("FIXME: %s: unimplemented\n", __FUNCTION__);
on_event(event_id::LOAD_PROGRESS);
}
Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/stream.cpp 17 Feb 2008 08:27:20 -0000 1.47
+++ server/stream.cpp 19 Feb 2008 19:20:54 -0000 1.48
@@ -178,7 +178,7 @@
value |= -1 << bitcount;
}
-// IF_DEBUG(log_msg("stream::read_sint(%d) == %d\n", bitcount,
value));
+// IF_DEBUG(log_debug("stream::read_sint(%d) == %d\n", bitcount,
value));
return value;
}
Index: server/swf_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/swf_function.cpp 1 Feb 2008 16:28:37 -0000 1.47
+++ server/swf_function.cpp 19 Feb 2008 19:20:54 -0000 1.48
@@ -109,8 +109,8 @@
assert(our_env);
#if 0
- log_msg("swf_function() stack:\n"); fn.env().dump_stack();
- log_msg(" first_arg_bottom_index: %d\n", fn.first_arg_bottom_index);
+ log_debug("swf_function() stack:\n"); fn.env().dump_stack();
+ log_debug(" first_arg_bottom_index: %d\n", fn.first_arg_bottom_index);
#endif
// Some features are version-dependant.
unsigned swfversion = VM::get().getSWFVersion();
Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/text.cpp 28 Jan 2008 18:44:38 -0000 1.43
+++ server/text.cpp 19 Feb 2008 19:20:54 -0000 1.44
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: text.cpp,v 1.43 2008/01/28 18:44:38 strk Exp $ */
+/* $Id: text.cpp,v 1.44 2008/02/19 19:20:54 bwy Exp $ */
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
@@ -185,7 +185,7 @@
if (glyph)
{
#ifdef GNASH_DEBUG_TEXT_RENDERING
-log_msg(_("render shape glyph using filled outline (render::draw_glyph)"));
+log_debug(_("render shape glyph using filled outline (render::draw_glyph)"));
#endif
gnash::render::draw_glyph(glyph, mat, transformed_color, pixel_scale);
Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/textformat.cpp 6 Feb 2008 10:18:31 -0000 1.33
+++ server/textformat.cpp 19 Feb 2008 19:20:54 -0000 1.34
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: textformat.cpp,v 1.33 2008/02/06 10:18:31 strk Exp $
+// $Id: textformat.cpp,v 1.34 2008/02/19 19:20:54 bwy Exp $
#include "log.h"
#include "textformat.h"
@@ -43,7 +43,7 @@
_tab_stops(-1),
_target(-1)
{
- //log_msg("%s:", __FUNCTION__);
+ //log_debug("%s:", __FUNCTION__);
}
text_format::~text_format()
@@ -120,7 +120,7 @@
as_value textformat_new(const fn_call& /* fn */)
{
//GNASH_REPORT_FUNCTION;
- //log_msg(_("%s: args=%d"), __FUNCTION__, nargs);
+ //log_debug(_("%s: args=%d"), __FUNCTION__, nargs);
boost::intrusive_ptr<textformat_as_object> text_obj = new
textformat_as_object;
log_unimpl(_("Created New TextFormat object at %p. Not fully implemented
yet"), (void*)text_obj.get());
@@ -140,7 +140,7 @@
as_value textformat_setformat(const fn_call& fn)
{
as_value method;
- //log_msg(_("%s: args=%d at %p"), __FUNCTION__, nargs, this_ptr);
+ //log_debug(_("%s: args=%d at %p"), __FUNCTION__, nargs, this_ptr);
boost::intrusive_ptr<textformat_as_object> ptr =
ensureType<textformat_as_object>(fn.this_ptr);
//double start = fn.arg(0).to_number();
@@ -166,26 +166,26 @@
}
assert(obj);
- //log_msg(_("Change from %f for %f characters for object at %p"), start,
end, obj);
+ //log_debug(_("Change from %f for %f characters for object at %p"), start,
end, obj);
// Check for the flags that could be set
if (obj->get_member(NSV::PROP_UNDERLINE, &method)) {
- //log_msg(_("Underline exists and is set to %d"), method.to_bool());
+ //log_debug(_("Underline exists and is set to %d"), method.to_bool());
obj->obj.underlinedSet(method.to_bool());
}
if (obj->get_member(NSV::PROP_ITALIC, &method)) {
- //log_msg(_("Italic exists and is set to %d"), method.to_bool());
+ //log_debug(_("Italic exists and is set to %d"), method.to_bool());
obj->obj.italicedSet(method.to_bool());
}
if (obj->get_member(NSV::PROP_BOLD, &method)) {
- //log_msg(_("Bold exists and is set to %d"), method.to_bool());
+ //log_debug(_("Bold exists and is set to %d"), method.to_bool());
obj->obj.boldSet(method.to_bool());
}
if (obj->get_member(NSV::PROP_BULLET, &method)) {
- //log_msg(_("Bullet exists and is set to %d"), method.to_bool());
+ //log_debug(_("Bullet exists and is set to %d"), method.to_bool());
obj->obj.bulletSet(method.to_bool());
}
@@ -193,43 +193,43 @@
// named string would clash with the "Color" class in SWF6 and below
// (but not in SWF7 and above)
if (obj->get_member(st.find("color"), &method)) {
- //log_msg(_("Color exists and is set to %f", method.to_number());
+ //log_debug(_("Color exists and is set to %f", method.to_number());
obj->obj.colorSet((boost::uint32_t)method.to_number());
}
if (obj->get_member(NSV::PROP_INDENT, &method)) {
- //log_msg(_("Indent exists and is set to %f"), method.to_number());
+ //log_debug(_("Indent exists and is set to %f"), method.to_number());
obj->obj.indentSet(float(method.to_number()));
}
if (obj->get_member(NSV::PROP_ALIGN, &method)) {
- //log_msg(_("Align exists and is set to %s"), method.to_string());
+ //log_debug(_("Align exists and is set to %s"), method.to_string());
const char* align = method.to_string().c_str();
if ( align ) obj->obj.alignSet(align);
}
if (obj->get_member(NSV::PROP_BLOCK_INDENT, &method)) {
- //log_msg(_("BlockIndent exists and is set to %f"), method.to_number());
+ //log_debug(_("BlockIndent exists and is set to %f"), method.to_number());
obj->obj.blockIndentSet(float(method.to_number()));
}
if (obj->get_member(NSV::PROP_LEADING, &method)) {
- //log_msg(_("Leading exists and is set to %f"), method.to_number());
+ //log_debug(_("Leading exists and is set to %f"), method.to_number());
obj->obj.leadingSet(float(method.to_number()));
}
if (obj->get_member(NSV::PROP_LEFT_MARGIN, &method)) {
- //log_msg(_("LeftMargin exists and is set to %f"), method.to_number());
+ //log_debug(_("LeftMargin exists and is set to %f"), method.to_number());
obj->obj.leftMarginSet(float(method.to_number()));
}
if (obj->get_member(NSV::PROP_RIGHT_MARGIN, &method)) {
- //log_msg(_("RightMargin exists and is set to %f"), method.to_number());
+ //log_debug(_("RightMargin exists and is set to %f"), method.to_number());
obj->obj.rightMarginSet(float(method.to_number()));
}
if (obj->get_member(NSV::PROP_SIZE, &method)) {
- //log_msg(_("Size exists and is set to %f"), method.to_number());
+ //log_debug(_("Size exists and is set to %f"), method.to_number());
obj->obj.sizeSet(float(method.to_number()));
}
Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/timers.cpp 21 Jan 2008 20:55:53 -0000 1.46
+++ server/timers.cpp 19 Feb 2008 19:20:54 -0000 1.47
@@ -19,7 +19,7 @@
//
//
-/* $Id: timers.cpp,v 1.46 2008/01/21 20:55:53 rsavoye Exp $ */
+/* $Id: timers.cpp,v 1.47 2008/02/19 19:20:54 bwy Exp $ */
#include "timers.h"
#include "as_function.h" // for class as_function
@@ -47,7 +47,7 @@
Timer::~Timer()
{
- //log_msg("%s: \n", __FUNCTION__);
+ //log_debug("%s: \n", __FUNCTION__);
}
void
@@ -56,7 +56,7 @@
{
_function = &method;
_interval = ms; // keep as milliseconds
- //log_msg("_interval milliseconds: %llu", _interval);
+ //log_debug("_interval milliseconds: %llu", _interval);
_object = this_ptr;
_args = args;
_runOnce = runOnce;
@@ -68,7 +68,7 @@
{
_function = &method;
_interval = ms; // keep as milliseconds
- //log_msg("_interval milliseconds: %llu", _interval);
+ //log_debug("_interval milliseconds: %llu", _interval);
_object = this_ptr;
_runOnce = runOnce;
start();
@@ -81,7 +81,7 @@
_object = this_ptr;
_methodName = methodName;
_interval = ms; // keep as milliseconds
- //log_msg("_interval milliseconds: %llu", _interval);
+ //log_debug("_interval milliseconds: %llu", _interval);
_args = args;
_runOnce = runOnce;
start();
@@ -98,7 +98,7 @@
Timer::start()
{
_start = VM::get().getTime();
- //log_msg("_start at seconds %lu", _start);
+ //log_debug("_start at seconds %lu", _start);
}
@@ -125,7 +125,7 @@
Timer::execute()
{
//printf("FIXME: %s:\n", __FUNCTION__);
- //log_msg("INTERVAL ID is %d\n", getIntervalID());
+ //log_debug("INTERVAL ID is %d\n", getIntervalID());
as_value timer_method;
@@ -157,7 +157,7 @@
for ( ArgsContainer::reverse_iterator it=_args.rbegin(),
itEnd=_args.rend();
it != itEnd; ++it )
{
- //log_msg("Env-pushing %s", it->to_debug_string().c_str());
+ //log_debug("Env-pushing %s", it->to_debug_string().c_str());
env.push(*it);
}
@@ -190,7 +190,7 @@
//std::stringstream ss; fn.dump_args(ss);
//log_debug("setInterval(%s)", ss.str().c_str());
- //log_msg("%s: args=%d", __FUNCTION__, fn.nargs);
+ //log_debug("%s: args=%d", __FUNCTION__, fn.nargs);
if ( fn.nargs < 2 )
{
@@ -274,7 +274,7 @@
//std::stringstream ss; fn.dump_args(ss);
//log_debug("setTimeout(%s)", ss.str().c_str());
- //log_msg("%s: args=%d", __FUNCTION__, fn.nargs);
+ //log_debug("%s: args=%d", __FUNCTION__, fn.nargs);
if ( fn.nargs < 2 )
{
@@ -356,7 +356,7 @@
as_value
timer_clearinterval(const fn_call& fn)
{
- //log_msg("%s: nargs = %d", __FUNCTION__, fn.nargs);
+ //log_debug("%s: nargs = %d", __FUNCTION__, fn.nargs);
int id = int(fn.arg(0).to_number());
Index: server/tools.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/tools.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/tools.cpp 4 Dec 2007 11:45:30 -0000 1.7
+++ server/tools.cpp 19 Feb 2008 19:20:54 -0000 1.8
@@ -148,7 +148,7 @@
}
bool compressed = (header & 255) == 'C';
- IF_VERBOSE_PARSE(log_msg("version = %d, file_length = %d\n", version,
file_length));
+ IF_VERBOSE_PARSE(log_parse("version = %d, file_length = %d\n", version,
file_length));
tu_file* original_in = NULL;
if (compressed)
@@ -157,7 +157,7 @@
log_error("gnash can't read zipped SWF data;
TU_CONFIG_LINK_TO_ZLIB is 0!\n");
return -1;
#else
- IF_VERBOSE_PARSE(log_msg("file is compressed."));
+ IF_VERBOSE_PARSE(log_parse("file is compressed."));
original_in = in;
// Uncompress the input as we read it.
@@ -213,7 +213,7 @@
// m_playlist.resize(m_frame_count);
// IF_VERBOSE_PARSE(m_frame_size.print());
- IF_VERBOSE_PARSE(log_msg("frame rate = %f, frames = %d\n", frame_rate,
frame_count));
+ IF_VERBOSE_PARSE(log_parse("frame rate = %f, frames = %d\n",
frame_rate, frame_count));
while ((boost::uint32_t) str.get_position() < file_end_pos)
{
@@ -262,7 +262,7 @@
{
// Safety break, so we don't read past the end
of the
// movie.
- log_msg("warning: process_swf() hit stream-end
tag, but not at the "
+ log_debug("warning: process_swf() hit
stream-end tag, but not at the "
"end of the file yet; stopping for
safety\n");
break;
}
Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/asobj/Global.cpp 31 Jan 2008 15:19:06 -0000 1.89
+++ server/asobj/Global.cpp 19 Feb 2008 19:20:54 -0000 1.90
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: Global.cpp,v 1.89 2008/01/31 15:19:06 bwy Exp $ */
+/* $Id: Global.cpp,v 1.90 2008/02/19 19:20:54 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -309,7 +309,7 @@
{
int version = VM::get().getSWFVersion();
- //log_msg(_("ASSetPropFlags called with %d args"), fn.nargs);
+ //log_debug(_("ASSetPropFlags called with %d args"), fn.nargs);
// Check the arguments
// assert(fn.nargs == 3 || fn.nargs == 4);
Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/asobj/LoadVars.cpp 10 Feb 2008 09:36:39 -0000 1.42
+++ server/asobj/LoadVars.cpp 19 Feb 2008 19:20:54 -0000 1.43
@@ -206,7 +206,7 @@
_loadThreads(),
_loadCheckerTimer(0)
{
- //log_msg("LoadVars %p created", this);
+ //log_debug("LoadVars %p created", this);
}
LoadVars::~LoadVars()
@@ -582,7 +582,7 @@
bool post = true;
if ( fn.nargs > 2 && fn.arg(2).to_string() == "GET" ) post = false;
- //log_msg("LoadVars.sendAndLoad(%s, %p) called, and returning TRUE",
urlstr.c_str(), target.get());
+ //log_debug("LoadVars.sendAndLoad(%s, %p) called, and returning TRUE",
urlstr.c_str(), target.get());
ptr->sendAndLoad(urlstr, *target, post);
return as_value(true);
Index: server/asobj/LocalConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LocalConnection.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/LocalConnection.cpp 1 Feb 2008 01:30:29 -0000 1.22
+++ server/asobj/LocalConnection.cpp 19 Feb 2008 19:20:54 -0000 1.23
@@ -187,7 +187,7 @@
_name = "localhost";
}
- log_msg("The domain for this host is: %s", _name.c_str());
+ log_debug("The domain for this host is: %s", _name.c_str());
return _name;
}
@@ -224,7 +224,7 @@
localconnection_connect(const fn_call& fn)
{
GNASH_REPORT_FUNCTION;
-// log_msg("%s: %d args\n", __PRETTY_FUNCTION__, fn.nargs);
+// log_debug("%s: %d args\n", __PRETTY_FUNCTION__, fn.nargs);
bool ret;
boost::intrusive_ptr<LocalConnection> ptr =
ensureType<LocalConnection>(fn.this_ptr);
string name = fn.arg(0).to_string().c_str();
Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/asobj/MovieClipLoader.cpp 14 Feb 2008 21:55:25 -0000 1.48
+++ server/asobj/MovieClipLoader.cpp 19 Feb 2008 19:20:54 -0000 1.49
@@ -146,7 +146,7 @@
if ( o == NULL )
{
o = new as_object(getObjectInterface());
- //log_msg(_("MovieClipLoader interface @ %p"), o.get());
+ //log_debug(_("MovieClipLoader interface @ %p"), o.get());
attachMovieClipLoaderInterface(*o);
}
return o.get();
@@ -196,7 +196,7 @@
URL url(url_str.c_str(), get_base_url());
#if GNASH_DEBUG
- log_msg(_(" resolved url: %s"), url.str().c_str());
+ log_debug(_(" resolved url: %s"), url.str().c_str());
#endif
as_value targetVal(&target);
@@ -260,7 +260,7 @@
{
as_value val, method;
- //log_msg(_("%s: nargs = %d"), __FUNCTION__, fn.nargs);
+ //log_debug(_("%s: nargs = %d"), __FUNCTION__, fn.nargs);
boost::intrusive_ptr<MovieClipLoader> ptr =
ensureType<MovieClipLoader>(fn.this_ptr);
@@ -299,7 +299,7 @@
}
#if GNASH_DEBUG
- log_msg(_("load clip: %s, target is: %p\n"),
+ log_debug(_("load clip: %s, target is: %p\n"),
str_url.c_str(), (void*)sprite);
#endif
@@ -323,7 +323,7 @@
{
as_object* mov_obj = new MovieClipLoader;
- //log_msg(_("MovieClipLoader instance @ %p"), mov_obj);
+ //log_debug(_("MovieClipLoader instance @ %p"), mov_obj);
return as_value(mov_obj); // will store in a boost::intrusive_ptr
}
@@ -393,7 +393,7 @@
cl=new builtin_function(&moviecliploader_new,
getMovieClipLoaderInterface());
}
global.init_member("MovieClipLoader", cl.get());
//as_value(moviecliploader_new));
- //log_msg(_("MovieClipLoader class @ %p"), cl.get());
+ //log_debug(_("MovieClipLoader class @ %p"), cl.get());
}
} // end of gnash namespace
Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/asobj/NetConnection.cpp 30 Jan 2008 10:09:35 -0000 1.56
+++ server/asobj/NetConnection.cpp 19 Feb 2008 19:20:54 -0000 1.57
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetConnection.cpp,v 1.56 2008/01/30 10:09:35 bwy Exp $ */
+/* $Id: NetConnection.cpp,v 1.57 2008/02/19 19:20:54 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -80,7 +80,7 @@
return "";
}
- log_msg(_("Connection to movie: %s"), uriStr.c_str());
+ log_debug(_("Connection to movie: %s"), uriStr.c_str());
return uriStr;
}
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- server/asobj/NetStreamFfmpeg.cpp 21 Jan 2008 20:55:57 -0000 1.104
+++ server/asobj/NetStreamFfmpeg.cpp 19 Feb 2008 19:20:55 -0000 1.105
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.104 2008/01/21 20:55:57 rsavoye Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.105 2008/02/19 19:20:55 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -450,13 +450,13 @@
m_VCodecCtx = initFlvVideo(m_parser.get());
if (!m_VCodecCtx)
{
- log_msg(_("Failed to initialize FLV video codec"));
+ log_error(_("Failed to initialize FLV video codec"));
}
m_ACodecCtx = initFlvAudio(m_parser.get());
if (!m_ACodecCtx)
{
- log_msg(_("Failed to initialize FLV audio codec"));
+ log_error(_("Failed to initialize FLV audio codec"));
}
if (!m_ACodecCtx && !m_VCodecCtx)
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/asobj/NetStreamGst.cpp 8 Feb 2008 15:27:32 -0000 1.78
+++ server/asobj/NetStreamGst.cpp 19 Feb 2008 19:20:55 -0000 1.79
@@ -231,7 +231,7 @@
{
std::string valid_url = _netCon->validateURL(url);
#if 0
- log_msg("%s: connecting to %s\n", __FUNCTION__, valid_url);
+ log_debug("%s: connecting to %s\n", __FUNCTION__, valid_url);
#endif
if (valid_url.empty()) {
log_error(_("%s: The provided URL could not be resolved (url: %s)"),
@@ -306,7 +306,7 @@
if (success) {
setStatus(seekNotify);
} else {
- log_msg(_("Seek failed. This is expected, but we tried it anyway."));
+ log_debug(_("Seek failed. This is expected, but we tried it anyway."));
setStatus(invalidTime);
}
}
@@ -532,7 +532,7 @@
break;
}
case GST_MESSAGE_EOS:
- log_msg(_("NetStream has reached the end of the stream."));
+ log_debug(_("NetStream has reached the end of the stream."));
setStatus(playStop);
break;
case GST_MESSAGE_TAG:
@@ -655,7 +655,7 @@
return;
}
- log_msg("%s: linking %s stream.", __FUNCTION__, structure_name);
+ log_debug("%s: linking %s stream.", __FUNCTION__, structure_name);
gst_caps_unref (caps);
Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/asobj/Object.cpp 21 Jan 2008 20:55:57 -0000 1.40
+++ server/asobj/Object.cpp 19 Feb 2008 19:20:55 -0000 1.41
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: Object.cpp,v 1.40 2008/01/21 20:55:57 rsavoye Exp $ */
+/* $Id: Object.cpp,v 1.41 2008/02/19 19:20:55 bwy Exp $ */
#include "tu_config.h"
#include "Object.h"
@@ -240,7 +240,7 @@
bool result = obj->add_property(propname, *getter, *setter);
- //log_msg("Object.addProperty(): testing");
+ //log_debug("Object.addProperty(): testing");
return as_value(result);
}
Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/SharedObject.cpp 13 Feb 2008 14:02:47 -0000 1.35
+++ server/asobj/SharedObject.cpp 19 Feb 2008 19:20:55 -0000 1.36
@@ -199,7 +199,7 @@
boost::intrusive_ptr<SharedObject> obj =
ensureType<SharedObject>(fn.this_ptr);
-// log_msg("Flushing to file %s", obj->getFilespec().c_str());
+// log_debug("Flushing to file %s", obj->getFilespec().c_str());
VM& vm = obj->getVM();
#ifndef USE_SOL_READONLY
@@ -395,7 +395,7 @@
vector<Element *>::iterator it;
vector<Element *> els = sol.getElements();
- log_msg("Read "SIZET_FMT" AMF objects from %s", els.size(),
newspec.c_str());
+ log_debug("Read "SIZET_FMT" AMF objects from %s", els.size(),
newspec.c_str());
string_table& st = obj->getVM().getStringTable();
string_table::key dataKey = obj->getVM().getStringTable().find("data");
Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/Sound.cpp 21 Jan 2008 20:55:57 -0000 1.27
+++ server/asobj/Sound.cpp 19 Feb 2008 19:20:55 -0000 1.28
@@ -140,7 +140,7 @@
void
Sound::loadSound(const std::string& file, bool /*streaming*/)
{
- log_msg(_("%s is still testing!"), __FUNCTION__);
+ log_debug(_("%s is still testing!"), __FUNCTION__);
if (connection) {
log_error(_("%s: This sound already has a connection? (We try
to handle this by overriding the old one...)"), __FUNCTION__);
Index: server/asobj/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/SoundGst.cpp 23 Jan 2008 18:13:14 -0000 1.19
+++ server/asobj/SoundGst.cpp 19 Feb 2008 19:20:55 -0000 1.20
@@ -44,7 +44,7 @@
SoundGst::callback_newpad (GstElement* /*decodebin*/, GstPad *pad, gboolean
/*last*/, gpointer data)
{
#if 0
- log_msg(_("%s: new pad found"), __FUNCTION__);
+ log_debug(_("%s: new pad found"), __FUNCTION__);
#endif
SoundGst* so = static_cast<SoundGst*>(data);
GstCaps *caps;
@@ -59,10 +59,10 @@
if (g_strrstr (gst_structure_get_name (str), "audio")) {
// link'n'play
gst_pad_link (pad, audiopad);
- log_msg(_("%s: new pad connected"), __FUNCTION__);
+ log_debug(_("%s: new pad connected"), __FUNCTION__);
} else {
gst_object_unref (audiopad);
- log_msg(_("%s: Non-audio data found in Sound url"), __FUNCTION__);
+ log_debug(_("%s: Non-audio data found in Sound url"), __FUNCTION__);
}
gst_caps_unref (caps);
gst_object_unref(GST_OBJECT(audiopad));
@@ -146,13 +146,13 @@
std::string valid_url = connection->validateURL(url);
- log_msg("%s: loading URL %s from %s", __FUNCTION__, valid_url.c_str(),
+ log_debug("%s: loading URL %s from %s", __FUNCTION__, valid_url.c_str(),
url.c_str());
_remainingLoops = 0;
if (_pipeline) {
- log_msg(_("%s: This sound already has a pipeline. Resetting for new URL
connection. (%s)"), __FUNCTION__, valid_url.c_str());
+ log_debug(_("%s: This sound already has a pipeline. Resetting for new URL
connection. (%s)"), __FUNCTION__, valid_url.c_str());
gst_element_set_state (_pipeline, GST_STATE_NULL); // FIXME: wait
for state?
GstElement* downloader = gst_bin_get_by_name(GST_BIN(_pipeline),
"gnash_audiodownloader");
Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/asobj/Stage.cpp 11 Feb 2008 12:11:15 -0000 1.29
+++ server/asobj/Stage.cpp 19 Feb 2008 19:20:55 -0000 1.30
@@ -147,16 +147,16 @@
if ( _scaleMode == mode ) return; // nothing to do
_scaleMode = mode;
- //log_msg("Scale mode set to %s", getScaleModeString());
+ //log_debug("Scale mode set to %s", getScaleModeString());
if ( _scaleMode == noScale )
{
- //log_msg("Setting rescaling allowance to false");
+ //log_debug("Setting rescaling allowance to false");
VM::get().getRoot().allowRescaling(false);
}
else
{
- //log_msg("Setting rescaling allowance to true");
+ //log_debug("Setting rescaling allowance to true");
VM::get().getRoot().allowRescaling(true);
}
}
Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/asobj/string.cpp 6 Feb 2008 15:20:58 -0000 1.53
+++ server/asobj/string.cpp 19 Feb 2008 19:20:55 -0000 1.54
@@ -16,7 +16,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: string.cpp,v 1.53 2008/02/06 15:20:58 bwy Exp $ */
+/* $Id: string.cpp,v 1.54 2008/02/19 19:20:55 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -263,7 +263,7 @@
size_t retlen = end-start;
- log_msg("start: "SIZET_FMT", end: "SIZET_FMT", retlen: "SIZET_FMT, start,
end, retlen);
+ log_debug("start: "SIZET_FMT", end: "SIZET_FMT", retlen: "SIZET_FMT,
start, end, retlen);
return as_value(utf8::encodeCanonicalString(wstr.substr(start, retlen),
version));
}
Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- server/asobj/xml.cpp 19 Feb 2008 08:51:02 -0000 1.74
+++ server/asobj/xml.cpp 19 Feb 2008 19:20:55 -0000 1.75
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: xml.cpp,v 1.74 2008/02/19 08:51:02 strk Exp $ */
+/* $Id: xml.cpp,v 1.75 2008/02/19 19:20:55 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -96,9 +96,9 @@
{
//GNASH_REPORT_FUNCTION;
#ifdef DEBUG_MEMORY_ALLOCATION
- log_msg(_("Creating XML data at %p"), this);
+ log_debug(_("Creating XML data at %p"), this);
#endif
- //log_msg("%s: %p", __FUNCTION__, this);
+ //log_debug("%s: %p", __FUNCTION__, this);
attachXMLProperties(*this);
}
@@ -118,7 +118,7 @@
{
//GNASH_REPORT_FUNCTION;
#ifdef DEBUG_MEMORY_ALLOCATION
- log_msg(_("Creating XML data at %p"), this);
+ log_debug(_("Creating XML data at %p"), this);
#endif
parseXML(xml_in);
}
@@ -186,7 +186,7 @@
}
#ifdef DEBUG_MEMORY_ALLOCATION
- log_msg(_("\tDeleting XML top level node at %p"), this);
+ log_debug(_("\tDeleting XML top level node at %p"), this);
#endif
}
@@ -238,15 +238,15 @@
xmlChar *ptr = NULL;
boost::intrusive_ptr<XMLNode> child;
-// log_msg(_("Created new element for %s at %p"), node->name, element);
+// log_debug(_("Created new element for %s at %p"), node->name, element);
-// log_msg(_("%s: extracting node %s"), __FUNCTION__, node->name);
+// log_debug(_("%s: extracting node %s"), __FUNCTION__, node->name);
// See if we have any Attributes (properties)
attr = node->properties;
while (attr != NULL)
{
- //log_msg(_("extractNode %s has property %s, value is %s"),
+ //log_debug(_("extractNode %s has property %s, value is %s"),
// node->name, attr->name, attr->children->content);
std::ostringstream name, content;
@@ -256,7 +256,7 @@
XMLAttr attrib(name.str(), content.str());
- //log_msg(_("\tPushing attribute %s for element %s has value %s"),
+ //log_debug(_("\tPushing attribute %s for element %s has value %s"),
// attr->name, node->name, attr->children->content);
element._attributes.push_back(attrib);
attr = attr->next;
@@ -292,7 +292,7 @@
{
if ( in.str().find_first_not_of(" \n\t\r") ==
std::string::npos )
{
- log_msg("Text node value consists in blanks
only, discarding");
+ log_debug("Text node value consists in blanks
only, discarding");
xmlFree(ptr);
return false;
}
@@ -351,7 +351,7 @@
{
//GNASH_REPORT_FUNCTION;
- //log_msg(_("Parse XML from memory: %s"), xml_in.c_str());
+ //log_debug(_("Parse XML from memory: %s"), xml_in.c_str());
if (xml_in.empty()) {
log_error(_("XML data is empty"));
@@ -537,7 +537,7 @@
{
GNASH_REPORT_FUNCTION;
- //log_msg(_("%s: mem is %d"), __FUNCTION__, mem);
+ //log_debug(_("%s: mem is %d"), __FUNCTION__, mem);
std::auto_ptr<tu_file> str (
StreamProvider::getDefaultInstance().getStream(url) );
if ( ! str.get() )
@@ -559,7 +559,7 @@
bool
XML::onLoad()
{
- log_msg(_("%s: FIXME: onLoad Default event handler"), __FUNCTION__);
+ log_debug(_("%s: FIXME: onLoad Default event handler"), __FUNCTION__);
return(_loaded);
}
@@ -611,7 +611,7 @@
log_unimpl ("Custom ContentType (%s) in XML.sendAndLoad",
ctypeVal.to_debug_string().c_str());
}
- //log_msg(_("%s: mem is %d"), __FUNCTION__, mem);
+ //log_debug(_("%s: mem is %d"), __FUNCTION__, mem);
std::auto_ptr<tu_file> str (
StreamProvider::getDefaultInstance().getStream(url, data) );
if ( ! str.get() )
@@ -714,7 +714,7 @@
boost::intrusive_ptr<XML> xml_obj;
//const char *data;
- // log_msg(_("%s: nargs=%d"), __FUNCTION__, fn.nargs);
+ // log_debug(_("%s: nargs=%d"), __FUNCTION__, fn.nargs);
if ( fn.nargs > 0 )
{
@@ -724,7 +724,7 @@
xml_obj = boost::dynamic_pointer_cast<XML>(obj);
if ( xml_obj )
{
- log_msg(_("\tCloned the XML object at %p"), (void
*)xml_obj.get());
+ log_debug(_("\tCloned the XML object at %p"), (void
*)xml_obj.get());
return as_value(xml_obj->cloneNode(true).get());
}
}
@@ -745,7 +745,7 @@
}
xml_obj = new XML;
- //log_msg(_("\tCreated New XML object at %p"), xml_obj);
+ //log_debug(_("\tCreated New XML object at %p"), xml_obj);
return as_value(xml_obj.get());
}
@@ -758,7 +758,7 @@
as_value xml_addrequestheader(const fn_call& fn)
{
GNASH_REPORT_FUNCTION;
- log_msg(_("%s: %d args"), __PRETTY_FUNCTION__, fn.nargs);
+ log_debug(_("%s: %d args"), __PRETTY_FUNCTION__, fn.nargs);
// return as_value(ptr->getAllocated());
// ptr->addRequestHeader();
@@ -816,7 +816,7 @@
xml_obj->nodeValueSet(text);
xml_obj->nodeTypeSet(XMLNode::tText);
return as_value(xml_obj);
-// log_msg(_("%s: xml obj is %p"), __PRETTY_FUNCTION__, xml_obj);
+// log_debug(_("%s: xml obj is %p"), __PRETTY_FUNCTION__, xml_obj);
} else {
log_error(_("no text for text node creation"));
}
@@ -1048,7 +1048,7 @@
{
// This doesn't seem to work, so the blanks skipping
// is actually implemented in XML::extractNode instead.
- //log_msg("Adding XML_PARSE_NOBLANKS to options");
+ //log_debug("Adding XML_PARSE_NOBLANKS to options");
options |= XML_PARSE_NOBLANKS;
}
Index: server/asobj/xmlattrs.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlattrs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/xmlattrs.h 21 Jan 2008 20:55:59 -0000 1.7
+++ server/asobj/xmlattrs.h 19 Feb 2008 19:20:55 -0000 1.8
@@ -87,10 +87,10 @@
int padding;
#ifdef DEBUG_MEMORY_ALLOCATION
xmlattr_as_object() {
- log_msg("\t\tCreating xmlattr_as_object at %p\n", this);
+ log_debug("\t\tCreating xmlattr_as_object at %p\n", this);
};
~xmlattr_as_object() {
- log_msg("\tDeleting xmlattr_as_object at %p \n", this);
+ log_debug("\tDeleting xmlattr_as_object at %p \n", this);
};
#endif
};
Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/asobj/xmlnode.cpp 30 Jan 2008 10:09:36 -0000 1.45
+++ server/asobj/xmlnode.cpp 19 Feb 2008 19:20:55 -0000 1.46
@@ -16,7 +16,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: xmlnode.cpp,v 1.45 2008/01/30 10:09:36 bwy Exp $ */
+/* $Id: xmlnode.cpp,v 1.46 2008/02/19 19:20:55 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -81,9 +81,9 @@
_parent(0),
_type(tElement)
{
- //log_msg("%s: %p", __PRETTY_FUNCTION__, this);
+ //log_debug("%s: %p", __PRETTY_FUNCTION__, this);
#ifdef DEBUG_MEMORY_ALLOCATION
- log_msg(_("\tCreating XMLNode data at %p"), this);
+ log_debug(_("\tCreating XMLNode data at %p"), this);
#endif
}
@@ -93,9 +93,9 @@
_parent(0),
_type(tElement)
{
- //log_msg("%s: %p", __PRETTY_FUNCTION__, this);
+ //log_debug("%s: %p", __PRETTY_FUNCTION__, this);
#ifdef DEBUG_MEMORY_ALLOCATION
- log_msg(_("\tCreating XMLNode data at %p"), this);
+ log_debug(_("\tCreating XMLNode data at %p"), this);
#endif
}
@@ -121,9 +121,9 @@
XMLNode::~XMLNode()
{
- //log_msg("%s: %p", __PRETTY_FUNCTION__, this);
+ //log_debug("%s: %p", __PRETTY_FUNCTION__, this);
#ifdef DEBUG_MEMORY_ALLOCATION
- log_msg(_("\tDeleting XMLNode data %s with value %s at %p"),
this->_name.c_str(), this->_value.c_str(), this);
+ log_debug(_("\tDeleting XMLNode data %s with value %s at %p"),
this->_name.c_str(), this->_value.c_str(), this);
#endif
}
@@ -151,7 +151,7 @@
//GNASH_REPORT_FUNCTION;
if ( _children.empty() )
{
- log_msg(_("XMLNode %p has no children"), (void*)this);
+ log_debug(_("XMLNode %p has no children"), (void*)this);
return NULL;
}
return _children.back();
@@ -177,7 +177,7 @@
XMLNode::cloneNode(bool deep)
{
//GNASH_REPORT_FUNCTION;
- //log_msg(_("%s: deep is %d"), __PRETTY_FUNCTION__, deep);
+ //log_debug(_("%s: deep is %d"), __PRETTY_FUNCTION__, deep);
boost::intrusive_ptr<XMLNode> newnode = new XMLNode(*this, deep);
@@ -239,7 +239,7 @@
{
if (itx->get() == this)
{
- // log_msg("Found the previous XMLNode child !!!! %s <%p>",
(*itx)->nodeName(), (void*)*itx);
+ // log_debug("Found the previous XMLNode child !!!! %s <%p>",
(*itx)->nodeName(), (void*)*itx);
return previous_node;
}
previous_node = itx->get();
@@ -255,12 +255,12 @@
if ( ! _parent)
{
- //log_msg("Node %p has no parent, returning NULL", this);
+ //log_debug("Node %p has no parent, returning NULL", this);
return NULL;
}
if (_parent->_children.size() <= 1)
{
- //log_msg("Node %p parent has only this node, returning NULL",
this);
+ //log_debug("Node %p parent has only this node, returning NULL",
this);
return NULL;
}
@@ -270,7 +270,7 @@
{
if (itx->get() == this)
{
- //log_msg("Found the next XMLNode child !!!! %s <%p>",
(*itx)->nodeName().c_str(), (void*)itx->get());
+ //log_debug("Found the next XMLNode child !!!! %s <%p>",
(*itx)->nodeName().c_str(), (void*)itx->get());
return previous_node;
}
previous_node = itx->get();
@@ -296,10 +296,10 @@
NodeType type = xml.nodeType();
-// log_msg("%s: processing for object %s <%p>", __PRETTY_FUNCTION__,
nodename, xml);
+// log_debug("%s: processing for object %s <%p>", __PRETTY_FUNCTION__,
nodename, xml);
#ifdef GNASH_DEBUG
- log_msg(_("Stringifying node %p with name %s, value %s, %u attributes and
%u children"),
+ log_debug(_("Stringifying node %p with name %s, value %s, %u attributes
and %u children"),
(void*)&xml, nodename, nodevalue, xml._attributes.size(),
xml._children.size());
#endif
@@ -341,7 +341,7 @@
ChildList::const_iterator itx;
for (itx = xml._children.begin(); itx != xml._children.end(); itx++)
{
-// log_msg(_("Found One XMLNode child. %s <%p>"),
(*itx)->nodeName().c_str(), (void*)*itx);
+// log_debug(_("Found One XMLNode child. %s <%p>"),
(*itx)->nodeName().c_str(), (void*)*itx);
// cerr << "<" << (*it)->nodeName() << ">" << endl;
(*itx)->toString(xmlout);
}
@@ -481,7 +481,7 @@
xmlnode_clonenode(const fn_call& fn)
{
//GNASH_REPORT_FUNCTION;
-// log_msg("%s: %d args", __PRETTY_FUNCTION__, fn.nargs);
+// log_debug("%s: %d args", __PRETTY_FUNCTION__, fn.nargs);
boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
bool deep = false;
@@ -557,7 +557,7 @@
std::stringstream ss;
ptr->toString(ss);
- //log_msg("Stringstream: %s", ss.str().c_str());
+ //log_debug("Stringstream: %s", ss.str().c_str());
return as_value(ss.str());
}
@@ -580,10 +580,10 @@
as_value rv;
rv.set_null();
- //log_msg("xmlnode_nodevalue called with %d args against 'this' = %p",
fn.nargs, ptr);
+ //log_debug("xmlnode_nodevalue called with %d args against 'this' = %p",
fn.nargs, ptr);
if ( fn.nargs == 0 )
{
- //log_msg(" nodeValue() returns '%s'", ptr->nodeValue().c_str());
+ //log_debug(" nodeValue() returns '%s'", ptr->nodeValue().c_str());
const std::string& val = ptr->nodeValue();
if ( ! val.empty() ) rv = val;
}
Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/asobj/xmlnode.h 21 Jan 2008 20:55:59 -0000 1.18
+++ server/asobj/xmlnode.h 19 Feb 2008 19:20:55 -0000 1.19
@@ -144,7 +144,7 @@
AttribList& attributes() { return _attributes; }
XMLNode& operator = (XMLNode &node) {
- gnash::log_msg("%s: \n", __PRETTY_FUNCTION__);
+ gnash::log_debug("%s: \n", __PRETTY_FUNCTION__);
if (this == &node) return *this;
_name = node._name;
_value = node._value;
Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/asobj/xmlsocket.cpp 1 Feb 2008 11:52:44 -0000 1.42
+++ server/asobj/xmlsocket.cpp 19 Feb 2008 19:20:56 -0000 1.43
@@ -178,14 +178,14 @@
bool XMLSocket::processingData()
{
//GNASH_REPORT_FUNCTION;
- //log_msg(_("%s: processing flag is %d"), __FUNCTION__, _processing);
+ //log_debug(_("%s: processing flag is %d"), __FUNCTION__, _processing);
return _processing;
}
void XMLSocket::processing(bool x)
{
GNASH_REPORT_FUNCTION;
- //log_msg(_("%s: set processing flag to %d"), __FUNCTION__, x);
+ //log_debug(_("%s: set processing flag to %d"), __FUNCTION__, x);
_processing = x;
}
@@ -222,7 +222,7 @@
// If interupted by a system call, try again
if (ret == -1 && errno == EINTR) {
- log_msg(_("The socket for fd #%d was interupted by a system call"),
+ log_debug(_("The socket for fd #%d was interupted by a system
call"),
fd);
continue;
}
@@ -232,26 +232,26 @@
return false;
}
if (ret == 0) {
- //log_msg(_("%s: There is no data in the socket for fd #%d"),
+ //log_debug(_("%s: There is no data in the socket for fd #%d"),
// __FUNCTION__, fd);
return false;
}
if (ret > 0) {
- //log_msg(_("%s: There is data in the socket for fd #%d"),
+ //log_debug(_("%s: There is data in the socket for fd #%d"),
// __FUNCTION__, fd);
}
memset(buf, 0, INBUF);
ret = ::read(_sockfd, buf, INBUF-2);
cr = strlen(buf);
- log_msg(_("%s: read %d bytes, first msg terminates at %d"),
__FUNCTION__, ret, cr);
- //log_msg(_("%s: read (%d,%d) %s"), __FUNCTION__, buf[0], buf[1], buf);
+ log_debug(_("%s: read %d bytes, first msg terminates at %d"),
__FUNCTION__, ret, cr);
+ //log_debug(_("%s: read (%d,%d) %s"), __FUNCTION__, buf[0], buf[1],
buf);
ptr = buf;
// If we get a single XML message, do less work
if (ret == cr + 1)
{
adjusted_size = memadjust(ret + 1);
packet = new char[adjusted_size];
- log_msg(_("Packet size is %d at %p"), ret + 1, packet);
+ log_debug(_("Packet size is %d at %p"), ret + 1, packet);
memset(packet, 0, adjusted_size);
strcpy(packet, ptr);
eom = strrchr(packet, '\n'); // drop the CR off the end if there
is one
@@ -259,7 +259,7 @@
*eom = 0;
}
msgs.push_back( packet );
- log_msg(_("%d: Pushing Packet of size " SIZET_FMT " at %p"),
__LINE__, strlen(packet), packet);
+ log_debug(_("%d: Pushing Packet of size " SIZET_FMT " at %p"),
__LINE__, strlen(packet), packet);
processing(false);
return true;
}
@@ -269,8 +269,8 @@
while (strchr(ptr, '\n') > 0) {
if (leftover) {
processing(false);
- //log_msg(_("%s: The remainder is: \"%s\""), __FUNCTION__,
leftover.get());
- //log_msg(_("%s: The rest of the message is: \"%s\""),
__FUNCTION__, ptr);
+ //log_debug(_("%s: The remainder is: \"%s\""), __FUNCTION__,
leftover.get());
+ //log_debug(_("%s: The rest of the message is: \"%s\""),
__FUNCTION__, ptr);
adjusted_size = memadjust(cr + strlen(leftover.get()) + 1);
packet = new char[adjusted_size];
memset(packet, 0, adjusted_size);
@@ -280,7 +280,7 @@
if (eom) {
*eom = 0;
}
- //log_msg(_("%s: The whole message is: \"%s\""), __FUNCTION__,
packet);
+ //log_debug(_("%s: The whole message is: \"%s\""),
__FUNCTION__, packet);
ptr = strchr(ptr, '\n') + 2; // messages are delimited by a
"\n\0"
leftover.reset();
} else {
@@ -291,20 +291,20 @@
ptr += cr + 1;
} // end of if remainder
if (*packet == '<') {
- //log_msg(_("%d: Pushing Packet #%d of size %d at %p: %s"),
__LINE__,
+ //log_debug(_("%d: Pushing Packet #%d of size %d at %p: %s"),
__LINE__,
// data.size(), strlen(packet), packet, packet);
eom = strrchr(packet, '\n'); // drop the CR off the end there
is one
if (eom) {
*eom = 0;
}
- //log_msg(_("Allocating new packet at %p"), packet);
+ //log_debug(_("Allocating new packet at %p"), packet);
//data.push_back(packet);
msgs.push_back( std::string(packet) );
} else {
log_error(_("Throwing out partial packet %s"), packet);
}
- //log_msg(_("%d messages in array now"), data.size());
+ //log_debug(_("%d messages in array now"), data.size());
cr = strlen(ptr);
} // end of while (cr)
@@ -312,11 +312,11 @@
leftover.reset( new char[strlen(ptr) + 1] );
strcpy(leftover.get(), ptr);
processing(true);
- //log_msg(_("%s: Adding remainder: \"%s\""), __FUNCTION__,
leftover.get());
+ //log_debug(_("%s: Adding remainder: \"%s\""), __FUNCTION__,
leftover.get());
}
processing(false);
- log_msg(_("%s: Returning %d messages"), __FUNCTION__, index);
+ log_debug(_("%s: Returning %d messages"), __FUNCTION__, index);
return true;
} // end of while (retires)
@@ -338,7 +338,7 @@
int ret = write(_sockfd, str.c_str(), str.size());
- log_msg(_("%s: sent %d bytes, data was %s"), __FUNCTION__, ret,
str.c_str());
+ log_debug(_("%s: sent %d bytes, data was %s"), __FUNCTION__, ret,
str.c_str());
if (ret == static_cast<signed int>(str.size())) {
return true;
} else {
@@ -398,7 +398,7 @@
// If interupted by a system call, try again
if (ret == -1 && errno == EINTR) {
- log_msg(_("%s: The socket for fd #%d was interupted by a system call
in this thread"),
+ log_debug(_("%s: The socket for fd #%d was interupted by a system call
in this thread"),
__FUNCTION__, fd);
}
if (ret == -1) {
@@ -406,11 +406,11 @@
__FUNCTION__, fd);
}
if (ret == 0) {
- log_msg(_("%s: There is no data in the socket for fd #%d"),
+ log_debug(_("%s: There is no data in the socket for fd #%d"),
__FUNCTION__, fd);
}
if (ret > 0) {
- log_msg(_("%s: There is data in the socket for fd #%d"),
+ log_debug(_("%s: There is data in the socket for fd #%d"),
__FUNCTION__, fd);
}
@@ -428,7 +428,7 @@
#ifdef GNASH_XMLSOCKET_DEBUG
std::stringstream ss;
fn.dump_args(ss);
- log_msg(_("XMLSocket.connect(%s) called"), ss.str().c_str());
+ log_debug(_("XMLSocket.connect(%s) called"), ss.str().c_str());
#endif
boost::intrusive_ptr<xmlsocket_as_object> ptr =
ensureType<xmlsocket_as_object>(fn.this_ptr);
@@ -459,7 +459,7 @@
if ( success )
{
- log_msg(_("Setting up timer for calling XMLSocket.onData()"));
+ log_debug(_("Setting up timer for calling XMLSocket.onData()"));
std::auto_ptr<Timer> timer(new Timer);
boost::intrusive_ptr<builtin_function> ondata_handler = new
builtin_function(&xmlsocket_inputChecker, NULL);
@@ -467,7 +467,7 @@
timer->setInterval(*ondata_handler, interval,
boost::dynamic_pointer_cast<as_object>(ptr));
vm.getRoot().add_interval_timer(timer, true);
- log_msg(_("Timer set"));
+ log_debug(_("Timer set"));
}
return as_value(success);
@@ -481,7 +481,7 @@
boost::intrusive_ptr<xmlsocket_as_object> ptr =
ensureType<xmlsocket_as_object>(fn.this_ptr);
const std::string& object = fn.arg(0).to_string();
- // log_msg(_("%s: host=%s, port=%g"), __FUNCTION__, host, port);
+ // log_debug(_("%s: host=%s, port=%g"), __FUNCTION__, host, port);
return as_value(ptr->obj.send(object));
}
@@ -501,14 +501,14 @@
xmlsocket_new(const fn_call& fn)
{
//GNASH_REPORT_FUNCTION;
- //log_msg(_("%s: nargs=%d"), __FUNCTION__, nargs);
+ //log_debug(_("%s: nargs=%d"), __FUNCTION__, nargs);
boost::intrusive_ptr<as_object> xmlsock_obj = new xmlsocket_as_object;
#ifdef GNASH_XMLSOCKET_DEBUG
std::stringstream ss;
fn.dump_args(ss);
- log_msg(_("new XMLSocket(%s) called - created object at %p"),
ss.str().c_str(), (void*)xmlsock_obj.get());
+ log_debug(_("new XMLSocket(%s) called - created object at %p"),
ss.str().c_str(), (void*)xmlsock_obj.get());
#else
UNUSED(fn);
#endif
@@ -641,7 +641,7 @@
assert(obj.connected());
if (obj.processingData()) {
- log_msg(_("Still processing data"));
+ log_debug(_("Still processing data"));
}
#ifndef USE_DMALLOC
@@ -651,16 +651,16 @@
std::vector<std::string > msgs;
if (obj.anydata(msgs))
{
- log_msg(_("Got " SIZET_FMT " messages: "), msgs.size());
+ log_debug(_("Got " SIZET_FMT " messages: "), msgs.size());
for (size_t i=0; i<msgs.size(); ++i)
{
- log_msg(_(" Message " SIZET_FMT " : %s "), i, msgs[i].c_str());
+ log_debug(_(" Message " SIZET_FMT " : %s "), i, msgs[i].c_str());
}
boost::intrusive_ptr<as_function> onDataHandler =
getEventHandler("onData");
if ( onDataHandler )
{
- //log_msg(_("Got %d messages from XMLsocket"), msgs.size());
+ //log_debug(_("Got %d messages from XMLsocket"), msgs.size());
for (XMLSocket::MessageList::iterator it=msgs.begin(),
itEnd=msgs.end();
it != itEnd; ++it)
Index: server/parser/BitmapMovieDefinition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/parser/BitmapMovieDefinition.cpp 14 Feb 2008 16:38:13 -0000
1.16
+++ server/parser/BitmapMovieDefinition.cpp 19 Feb 2008 19:20:56 -0000
1.17
@@ -64,7 +64,7 @@
float w = _framesize.width(); // /20;
float h = _framesize.height(); // /20;
- log_msg(_("Creating a shape_definition wrapping a %g x %g bitmap"), w,
h);
+ log_parse(_("Creating a shape_definition wrapping a %g x %g bitmap"),
w, h);
path bmPath(w, h, fillLeft, 0, 0);
bmPath.drawLineTo(w, 0);
Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/parser/action_buffer.cpp 28 Jan 2008 19:42:22 -0000 1.34
+++ server/parser/action_buffer.cpp 19 Feb 2008 19:20:56 -0000 1.35
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: action_buffer.cpp,v 1.34 2008/01/28 19:42:22 strk Exp $ */
+/* $Id: action_buffer.cpp,v 1.35 2008/02/19 19:20:56 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -138,7 +138,7 @@
boost::uint16_t count = boost::uint16_t(read_int16(i+3));
i += 2;
-//log_msg(_("Start at %d, stop at %d, length read was %d, count read was %d"),
start_pc, stop_pc, length, count);
+//log_debug(_("Start at %d, stop at %d, length read was %d, count read was
%d"), start_pc, stop_pc, length, count);
assert(start_pc + 3 + length == stop_pc);
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/parser/movie_def_impl.cpp 21 Jan 2008 20:56:01 -0000 1.100
+++ server/parser/movie_def_impl.cpp 19 Feb 2008 19:20:56 -0000 1.101
@@ -372,7 +372,7 @@
bitmap_character_def* ch)
{
assert(ch);
- //log_msg(_("Add bitmap character %d"), character_id);
+ //log_debug(_("Add bitmap character %d"), character_id);
//m_bitmap_characters.add(character_id, ch);
m_bitmap_characters.insert(std::make_pair(character_id,
boost::intrusive_ptr<bitmap_character_def>(ch)));
@@ -559,12 +559,12 @@
if ( framenum <= _frames_loaded ) return true;
_waiting_for_frame = framenum;
- //log_msg(_("Waiting for frame %u to be loaded"), framenum);
+ //log_debug(_("Waiting for frame %u to be loaded"), framenum);
// TODO: return false on timeout
_frame_reached_condition.wait(lock);
- //log_msg(_("Condition reached (_frames_loaded=%u)"), _frames_loaded);
+ //log_debug(_("Condition reached (_frames_loaded=%u)"),
_frames_loaded);
return ( framenum <= _frames_loaded );
}
@@ -623,7 +623,7 @@
for ( const_iterator it=begin(), endIt=end();
it != endIt; ++it )
{
- log_msg(_("Character %d @ %p"), it->first,
static_cast<void*>(it->second.get()));
+ log_debug(_("Character %d @ %p"), it->first,
static_cast<void*>(it->second.get()));
//character_def* cdef = it->second;
}
}
@@ -646,7 +646,7 @@
void
CharacterDictionary::add_character(int id, boost::intrusive_ptr<character_def>
c)
{
- //log_msg(_("CharacterDictionary: add char %d"), id);
+ //log_debug(_("CharacterDictionary: add char %d"), id);
_map[id] = c;
//dump_chars();
}
@@ -669,11 +669,11 @@
nextframe += FRAMELOAD_CHUNK; // load in chunks of 10 frames
if ( nextframe > framecount ) nextframe = framecount;
#endif
- //log_msg(_("Framecount: %u, Lastloaded: %u"), framecount, lastloaded);
+ //log_debug(_("Framecount: %u, Lastloaded: %u"), framecount,
lastloaded);
if ( nextframe <= framecount )
{
#ifdef DEBUG_FRAMES_LOAD // debugging
- log_msg(_("Ensure load of frame %u/%u (last loaded is: %u)"),
+ log_debug(_("Ensure load of frame %u/%u (last loaded is: %u)"),
nextframe, framecount, lastloaded);
#endif
if ( ! ensure_frame_loaded(nextframe) )
@@ -687,7 +687,7 @@
#ifdef DEBUG_FRAMES_LOAD
else
{
- log_msg(_("No more frames to load. Framecount: %u, Lastloaded:
%u, next to load: %u"), framecount, lastloaded, nextframe);
+ log_debug(_("No more frames to load. Framecount: %u,
Lastloaded: %u, next to load: %u"), framecount, lastloaded, nextframe);
}
#endif
}
@@ -718,7 +718,7 @@
return;
}
- //log_msg(_("Loading thread iteration %u"), it++);
+ //log_debug(_("Loading thread iteration %u"), it++);
SWF::tag_type tag_type = str.open_tag();
@@ -860,7 +860,7 @@
}
#ifdef DEBUG_FRAMES_LOAD
- log_msg(_("Loaded frame %u/%u"),
+ log_debug(_("Loaded frame %u/%u"),
_frames_loaded, m_frame_count);
#endif
Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/parser/shape_character_def.cpp 12 Feb 2008 16:48:38 -0000
1.66
+++ server/parser/shape_character_def.cpp 19 Feb 2008 19:20:56 -0000
1.67
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: shape_character_def.cpp,v 1.66 2008/02/12 16:48:38 bwy Exp $ */
+/* $Id: shape_character_def.cpp,v 1.67 2008/02/19 19:20:56 bwy Exp $ */
// Based on the public domain shape.cpp of Thatcher Ulrich <address@hidden>
2003
@@ -215,7 +215,7 @@
//m_fill_styles.push_back(fill_style());
}
- //log_msg("Read %u fill styles, %u line styles", m_fill_styles.size(),
m_line_styles.size());
+ //log_debug("Read %u fill styles, %u line styles",
m_fill_styles.size(), m_line_styles.size());
// Use read_u8 to force alignment.
in->ensureBytes(1);
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/sprite_definition.cpp 15 Feb 2008 08:59:56 -0000 1.26
+++ server/parser/sprite_definition.cpp 19 Feb 2008 19:20:56 -0000 1.27
@@ -42,7 +42,7 @@
int id)
{
#ifdef DEBUG_REGISTER_CLASS
- log_msg(_("Instantiating sprite_def %p"), (void*)this);
+ log_debug(_("Instantiating sprite_def %p"), (void*)this);
#endif
sprite_instance* si = new sprite_instance(this,
parent->get_root(), parent, id);
@@ -168,7 +168,7 @@
void
sprite_definition::add_frame_name(const std::string& name)
{
- //log_msg(_("labelframe: frame %d, name %s"), m_loading_frame, name);
+ //log_debug(_("labelframe: frame %d, name %s"), m_loading_frame, name);
assert(m_loading_frame < m_frame_count);
m_named_frames[name] = m_loading_frame;
}
@@ -215,9 +215,9 @@
{
registeredClass = the_class;
#ifdef DEBUG_REGISTER_CLASS
- log_msg(_("Registered class %p for sprite_def %p"),
(void*)registeredClass.get(), (void*)this);
+ log_debug(_("Registered class %p for sprite_def %p"),
(void*)registeredClass.get(), (void*)this);
as_object* proto = registeredClass->getPrototype().get();
- log_msg(_(" Exported interface: "));
+ log_debug(_(" Exported interface: "));
proto->dump_members();
#endif
}
Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/parser/sprite_definition.h 21 Jan 2008 20:56:01 -0000 1.37
+++ server/parser/sprite_definition.h 19 Feb 2008 19:20:56 -0000 1.38
@@ -326,7 +326,7 @@
// TODO: return false on timeout
while ( m_loading_frame < framenum )
{
- log_msg(_("sprite_definition: "
+ log_debug(_("sprite_definition: "
"loading of frame " SIZET_FMT " requested "
"(we are at " SIZET_FMT "/" SIZET_FMT ")"),
framenum, m_loading_frame, m_frame_count);
Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/swf/PlaceObject2Tag.cpp 15 Feb 2008 10:05:26 -0000 1.34
+++ server/swf/PlaceObject2Tag.cpp 19 Feb 2008 19:20:56 -0000 1.35
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: PlaceObject2Tag.cpp,v 1.34 2008/02/15 10:05:26 bwy Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.35 2008/02/19 19:20:56 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -289,7 +289,7 @@
log_parse(_(" m_place_type: %d"), m_place_type);
);
- //log_msg("place object at depth %i", m_depth);
+ //log_debug("place object at depth %i", m_depth);
}
// read SWF::PLACEOBJECT3
@@ -438,7 +438,7 @@
log_parse(_(" m_place_type: %d"), m_place_type);
);
- //log_msg("place object at depth %i", m_depth);
+ //log_debug("place object at depth %i", m_depth);
}
void
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -b -r1.185 -r1.186
--- server/swf/tag_loaders.cpp 15 Feb 2008 09:17:34 -0000 1.185
+++ server/swf/tag_loaders.cpp 19 Feb 2008 19:20:56 -0000 1.186
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.185 2008/02/15 09:17:34 bwy Exp $ */
+/* $Id: tag_loaders.cpp,v 1.186 2008/02/19 19:20:56 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -1619,7 +1619,7 @@
ss << " - Build " << build;
ss << " - Timestamp " << timestamp;
- log_msg("%s", ss.str().c_str());
+ log_debug("%s", ss.str().c_str());
// attach to movie_definition ?
}
Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -b -r1.195 -r1.196
--- server/vm/ASHandlers.cpp 16 Feb 2008 09:20:22 -0000 1.195
+++ server/vm/ASHandlers.cpp 19 Feb 2008 19:20:57 -0000 1.196
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ASHandlers.cpp,v 1.195 2008/02/16 09:20:22 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.196 2008/02/19 19:20:57 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -675,12 +675,12 @@
size_t lastloaded = target_sprite->get_loaded_frames();
if ( lastloaded < framenum )
{
- //log_msg(_("%s: frame %u not reached yet (loaded %u), skipping
next %u actions"), __FUNCTION__, framenum, lastloaded, skip);
+ //log_debug(_("%s: frame %u not reached yet (loaded %u),
skipping next %u actions"), __FUNCTION__, framenum, lastloaded, skip);
// better delegate this to ActionExec
thread.skip_actions(skip);
}
- //log_msg(_("%s: testing"), __PRETTY_FUNCTION__);
+ //log_debug(_("%s: testing"), __PRETTY_FUNCTION__);
}
void
@@ -952,7 +952,7 @@
assert(unsigned(base) < str.length() );
assert(size >= 0);
- //log_msg(_("string: %s, size: %d, base: %d"), str.c_str(), size, base);
+ //log_debug(_("string: %s, size: %d, base: %d"), str.c_str(), size, base);
// Keep base within range.
//base = iclamp(base, 0, str.length());
@@ -1090,7 +1090,7 @@
{
as_object* obj = thread.getTarget();
- //log_msg(_("ActionGetProperty(<empty>) called, target is %p"),
(void*)obj);
+ //log_debug(_("ActionGetProperty(<empty>) called, target is
%p"), (void*)obj);
target = dynamic_cast<character*>(obj);
if ( ! target )
@@ -1426,13 +1426,13 @@
if (!obj)
{
- log_msg(_("In ImplementsOp, not an object.\n"));
+ log_debug(_("In ImplementsOp, not an object.\n"));
return;
}
obj = obj->get_prototype().get();
if (!obj)
{
- log_msg(_("In ImplementsOp, object had no prototype.\n"));
+ log_debug(_("In ImplementsOp, object had no prototype.\n"));
return;
}
@@ -1853,12 +1853,12 @@
size_t lastloaded = target_sprite->get_loaded_frames();
if ( lastloaded < framenum )
{
- //log_msg(_("ActionWaitForFrameExpression: frame %u not reached
yet (loaded %u), skipping next %u actions"), framenum, lastloaded, skip);
+ //log_debug(_("ActionWaitForFrameExpression: frame %u not
reached yet (loaded %u), skipping next %u actions"), framenum, lastloaded,
skip);
// better delegate this to ActionExec
thread.skip_actions(skip);
}
- //log_msg(_("%s: testing"), __PRETTY_FUNCTION__);
+ //log_debug(_("%s: testing"), __PRETTY_FUNCTION__);
}
void
@@ -2188,7 +2188,7 @@
const URL& baseurl = get_base_url();
URL url(url_s, baseurl);
- log_msg(_("get url: target=%s, url=%s (%s), method=%x (sendVars:%X,
loadTarget:%d, loadVariable:%d)"), target_string.c_str(),
+ log_debug(_("get url: target=%s, url=%s (%s), method=%x (sendVars:%X,
loadTarget:%d, loadVariable:%d)"), target_string.c_str(),
url.str().c_str(), url_c, method, sendVarsMethod,
loadTargetFlag, loadVariableFlag);
if ( ! URLAccessManager::allow(url) )
@@ -2201,7 +2201,7 @@
if ( loadVariableFlag )
{
- log_msg(_("getURL2 loadVariable"));
+ log_debug(_("getURL2 loadVariable"));
if ( ! target_ch )
{
@@ -2228,7 +2228,7 @@
{
// TODO: always pass directly to movie_root::loadMovie ?
- log_msg(_("getURL2 target load"));
+ log_debug(_("getURL2 target load"));
if ( sendVarsMethod )
{
@@ -2340,7 +2340,7 @@
boost::replace_all(command, "%u", safeurl);
- log_msg (_("Launching URL... %s"), command.c_str());
+ log_debug (_("Launching URL... %s"), command.c_str());
system(command.c_str());
}
else
@@ -2699,7 +2699,7 @@
nargs = available_args;
}
- //log_msg(_("Function's nargs: %d"), nargs);
+ //log_debug(_("Function's nargs: %d"), nargs);
#ifdef USE_DEBUGGER
// cerr << "entering function: " << function_name << endl;
@@ -2709,7 +2709,7 @@
as_value result = call_method(function, &env, this_ptr,
nargs, env.get_top_index() - 2);
- //log_msg(_("Function's result: %s"), result.to_string();
+ //log_debug(_("Function's result: %s"), result.to_string();
env.drop(nargs + 1);
env.top(0) = result;
@@ -2730,7 +2730,7 @@
// GNASH_REPORT_FUNCTION;
as_environment& env = thread.env;
- //log_msg(_("Before top/drop (retval=%p)"), (void*)retval);
+ //log_debug(_("Before top/drop (retval=%p)"), (void*)retval);
//env.dump_stack();
thread.ensureStack(1); // ret value
@@ -2745,7 +2745,7 @@
debugger.callStackPop();
#endif
- //log_msg(_("After top/drop"));
+ //log_debug(_("After top/drop"));
//env.dump_stack();
// Skip the rest of this buffer (return from this action_buffer).
@@ -2859,7 +2859,7 @@
thread.ensureStack((unsigned int)array_size); // array elements
- //log_msg(_("xxx init array: size = %d, top of stack = %d"), array_size,
env.get_top_index());//xxxxx
+ //log_debug(_("xxx init array: size = %d, top of stack = %d"), array_size,
env.get_top_index());//xxxxx
// Call the array constructor, to create an empty array.
as_value result;
@@ -2880,7 +2880,7 @@
env.push(result);
- //log_msg(_("xxx init array end: top of stack = %d, trace(top(0)) ="),
env.get_top_index());//xxxxxxx
+ //log_debug(_("xxx init array end: top of stack = %d, trace(top(0)) ="),
env.get_top_index());//xxxxxxx
//as_global_trace(fn_call(NULL, NULL, env, 1, env.get_top_index()));
//xxxx
@@ -3054,9 +3054,9 @@
{
// use numeric semantic
double v2num = v2.to_number();
- //log_msg(_("v2 num = %g"), v2num);
+ //log_debug(_("v2 num = %g"), v2num);
double v1num = v1.to_number();
- //log_msg(_("v1 num = %g"), v1num);
+ //log_debug(_("v1 num = %g"), v1num);
v2.set_double(v2num + v1num);
@@ -3425,7 +3425,7 @@
}
#ifdef USE_DEBUGGER
-// log_msg (_("FIXME: method name is: %s"), method_namexxx);
+// log_debug (_("FIXME: method name is: %s"), method_namexxx);
// // IT IS NOT GUARANTEE WE DO HAVE A METHOD NAME HERE !
if ( ! method_name.is_undefined() )
{
@@ -3454,7 +3454,7 @@
thread.next_pc = thread.stop_pc;
}
// This is to check stack status after call method
- //log_msg(_("at doActionCallMethod() end, stack: ")); env.dump_stack();
+ //log_debug(_("at doActionCallMethod() end, stack: "));
env.dump_stack();
}
@@ -3535,7 +3535,7 @@
boost::intrusive_ptr<as_object> new_obj = construct_object(method.get(),
env, nargs, env.get_top_index());
- //log_msg(_("%s( [%d args] ) returned %s"), method_val.to_string(),
+ //log_debug(_("%s( [%d args] ) returned %s"), method_val.to_string(),
// nargs, new_obj.to_string();
@@ -3789,7 +3789,7 @@
sub->extends(*super);
- //log_msg(_("%s: testing"), __PRETTY_FUNCTION__);
+ //log_debug(_("%s: testing"), __PRETTY_FUNCTION__);
}
void
@@ -3853,7 +3853,7 @@
// @@ security: watch out for possible missing terminator here!
const char* arg = code.read_string(i);
- //log_msg(_("Setting register %d/%d to %s"), arg_register,
nargs, arg);
+ //log_debug(_("Setting register %d/%d to %s"), arg_register,
nargs, arg);
func->add_arg(arg_register, arg);
i += strlen(arg)+1;
Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/vm/ActionExec.cpp 29 Jan 2008 22:14:12 -0000 1.66
+++ server/vm/ActionExec.cpp 19 Feb 2008 19:20:57 -0000 1.67
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ActionExec.cpp,v 1.66 2008/01/29 22:14:12 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.67 2008/02/19 19:20:57 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -339,7 +339,7 @@
// Do we still need this ?
if ( action_id == SWF::ACTION_END ) {
// this would turn into an assertion (next_pc==stop_pc)
- // log_msg(_("At ACTION_END next_pc=" SIZET_FMT
+ // log_debug(_("At ACTION_END next_pc=" SIZET_FMT
// ", stop_pc=" SIZET_FMT), next_pc, stop_pc);
break;
}
Index: server/vm/ExecutableCode.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ExecutableCode.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/vm/ExecutableCode.h 21 Jan 2008 20:56:04 -0000 1.13
+++ server/vm/ExecutableCode.h 19 Feb 2008 19:20:57 -0000 1.14
@@ -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: ExecutableCode.h,v 1.13 2008/01/21 20:56:04 rsavoye Exp $ */
+/* $Id: ExecutableCode.h,v 1.14 2008/02/19 19:20:57 bwy Exp $ */
#ifndef GNASH_EXECUTABLECODE_H
#define GNASH_EXECUTABLECODE_H
@@ -78,7 +78,7 @@
}
else
{
- //log_msg("Sprite %s unloaded, won't execute global code in it",
target->getTargetPath().c_str());
+ //log_debug("Sprite %s unloaded, won't execute global code in it",
target->getTargetPath().c_str());
}
}
Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/vm/action.cpp 21 Jan 2008 20:56:04 -0000 1.32
+++ server/vm/action.cpp 19 Feb 2008 19:20:57 -0000 1.33
@@ -194,7 +194,7 @@
const char* method_arg_fmt,
va_list args)
{
- log_msg(_("FIXME(%d): %s"), __LINE__, __FUNCTION__);
+ log_debug(_("FIXME(%d): %s"), __LINE__, __FUNCTION__);
// Parse va_list args
int starting_index = env->get_top_index();
@@ -310,7 +310,7 @@
as_value
event_test(const fn_call& /*fn*/)
{
- log_msg(_("FIXME: %s"), __FUNCTION__);
+ log_debug(_("FIXME: %s"), __FUNCTION__);
return as_value();
}
Index: testsuite/libamf.all/test_lc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_lc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/libamf.all/test_lc.cpp 25 Jan 2008 19:10:16 -0000 1.5
+++ testsuite/libamf.all/test_lc.cpp 19 Feb 2008 19:20:57 -0000 1.6
@@ -401,9 +401,9 @@
vector<string>::const_iterator it;
auto_ptr< vector<string> > listeners ( listListeners() );
if (listeners->empty()) {
- log_msg("Nobody is listening");
+ log_debug("Nobody is listening");
} else {
- log_msg("There are %d", listeners->size());
+ log_debug("There are %d", listeners->size());
for (it=listeners->begin(); it!=listeners->end(); it++) {
string str = *it;
log_debug("Listeners: %s", str.c_str());
@@ -413,7 +413,7 @@
str1 = "HelloWorld";
removeListener(str1);
listeners.reset( listListeners() );
- log_msg("There are %d", listeners->size());
+ log_debug("There are %d", listeners->size());
for (it=listeners->begin(); it != listeners->end(); it++) {
string str = *it;
log_debug("Listeners: %s", str.c_str());
Index: testsuite/misc-ming.all/loadMovieTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/misc-ming.all/loadMovieTestRunner.cpp 14 Feb 2008 18:42:51
-0000 1.17
+++ testsuite/misc-ming.all/loadMovieTestRunner.cpp 19 Feb 2008 19:20:57
-0000 1.18
@@ -46,7 +46,7 @@
character* coverartch =
const_cast<character*>(tester->findDisplayItemByName(*root, "coverart"));
sprite_instance* coverart = coverartch->to_movie();
- //log_msg("Coverart is %p, displaylist is:", coverart);
+ //log_debug("Coverart is %p, displaylist is:", coverart);
//coverart->getDisplayList().dump();
return coverart;
Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- utilities/dumpshm.cpp 14 Feb 2008 15:09:52 -0000 1.25
+++ utilities/dumpshm.cpp 19 Feb 2008 19:20:57 -0000 1.26
@@ -253,7 +253,7 @@
boost::uint8_t *hexint;
hexint = new boost::uint8_t[(size + 3) *3];
hexify((boost::uint8_t *)hexint, (uint8_t *)shmaddr, size, false);
- log_msg(_("The data is: 0x%s"), hexint);
+ log_debug(_("The data is: 0x%s"), hexint);
#endif
}
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- utilities/processor.cpp 15 Feb 2008 08:31:04 -0000 1.83
+++ utilities/processor.cpp 19 Feb 2008 19:20:58 -0000 1.84
@@ -16,7 +16,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: processor.cpp,v 1.83 2008/02/15 08:31:04 strk Exp $ */
+/* $Id: processor.cpp,v 1.84 2008/02/19 19:20:58 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -130,7 +130,7 @@
void execFsCommand(sprite_instance* movie, const char* command, const char*
args)
{
- log_msg(_("fs_callback(%p): %s %s"), (void*)movie, command, args);
+ log_debug(_("fs_callback(%p): %s %s"), (void*)movie, command, args);
if ( ! strcasecmp(command, "quit") ) quitrequested=true;
}
@@ -192,13 +192,13 @@
break;
case 'v':
dbglogfile.setVerbosity();
- log_msg (_("Verbose output turned on"));
+ log_debug (_("Verbose output turned on"));
break;
case 'g':
#ifdef USE_DEBUGGER
debugger.enabled(true);
debugger.console();
- log_msg (_("Setting debugger ON"));
+ log_debug (_("Setting debugger ON"));
#else
log_error (_("The debugger has been disabled at configuration
time"));
#endif
- [Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp backe...,
Benjamin Wolsey <=