[prev in list] [next in list] [prev in thread] [next in thread]
List: gnash-commit
Subject: [Gnash-commit] gnash server/Color.cpp server/action.cpp server...
From: Rob Savoye <rob () welcomehome ! org>
Date: 2006-03-12 0:35:16
Message-ID: E1FIEYG-0002ZU-3y () savannah ! gnu ! org
[Download RAW message or body]
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <rsavoye@savannah.gnu.org> 06/03/12 00:35:15
Modified files:
server : Color.cpp action.cpp action.h impl.cpp impl.h
text.cpp
utilities : processor.cpp
libbase : log.h tu_file.cpp
backend : gnash.cpp
doc/C : Makefile.am logging.xml
Log message:
* doc/C/Makefile.am: Add logging.xml.
* libbase/log.h: Only print TRACE messages at verbose level 2. Add
getVerbosity() accessor.
* server/impl.cpp: Add fixme_loader(), and set the unimplemented
tags to that so we know when we hit one.
* server/impl.h: Add prototype for fixme_loader().
* server/text.cpp: Clean up warning message.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Color.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.h.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.h.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/text.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/utilities/processor.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/log.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/tu_file.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/logging.xml.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.16 gnash/backend/gnash.cpp:1.17
--- gnash/backend/gnash.cpp:1.16 Sat Mar 11 20:47:24 2006
+++ gnash/backend/gnash.cpp Sun Mar 12 00:35:15 2006
@@ -96,7 +96,7 @@
file_opener(const char* url)
// Callback function. This opens files for the library.
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
if (strcmp(url, "-") == 0) {
FILE *newin = fdopen(dup(0),"rb");
@@ -162,7 +162,6 @@
main(int argc, char *argv[])
{
int c;
- int verbosity = 0;
int render_arg;
std::vector<const char*> infiles;
@@ -180,7 +179,7 @@
// -1.0 tends to look good.
tex_lod_bias = -1.2f;
- // scan for the two main standard GNU options
+ // scan for the two main long GNU options
for (c=0; c<argc; c++) {
if (strcmp("--help", argv[c]) == 0) {
usage(argv[0]);
@@ -198,8 +197,7 @@
usage (argv[0]);
break;
case 'v':
- verbosity++;
- dbglogfile.setVerbosity(verbosity);
+ dbglogfile.setVerbosity();
dbglogfile << "Verbose output turned on" << endl;
break;
case 'a':
@@ -218,7 +216,7 @@
sdl_abort = false;
break;
case 'd':
- delay = atoi(optarg);
+ delay = strtol(optarg, NULL, 0);
break;
case 'e':
s_event_thread = true;
@@ -282,10 +280,6 @@
gnash::register_file_opener_callback(file_opener);
gnash::register_fscommand_callback(fs_callback);
-// if (s_verbose == true) {
-// gnash::register_log_callback(log_callback);
-// }
- //gnash::set_antialiased(s_antialiased);
gnash::sound_handler *sound = NULL;
gnash::render_handler *render = NULL;
@@ -305,7 +299,8 @@
int movie_width = 0;
int movie_height = 0;
float movie_fps = 30.0f;
- gnash::get_movie_info(infiles[0], &movie_version, &movie_width, &movie_height, \
&movie_fps, NULL, NULL); + gnash::get_movie_info(infiles[0], &movie_version, \
&movie_width, + &movie_height, &movie_fps, NULL, NULL);
if (movie_version == 0) {
fprintf(stderr, "error: can't get info about %s\n", infiles[0]);
exit(1);
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.12 gnash/doc/C/Makefile.am:1.13
--- gnash/doc/C/Makefile.am:1.12 Wed Mar 8 02:48:55 2006
+++ gnash/doc/C/Makefile.am Sun Mar 12 00:35:15 2006
@@ -49,6 +49,7 @@
legal.xml \
loadvars.xml \
localconnection.xml \
+ logging.xml \
math.xml \
microphone.xml \
mouse.xml \
Index: gnash/doc/C/logging.xml
diff -u gnash/doc/C/logging.xml:1.1 gnash/doc/C/logging.xml:1.2
--- gnash/doc/C/logging.xml:1.1 Sat Mar 11 20:46:23 2006
+++ gnash/doc/C/logging.xml Sun Mar 12 00:35:15 2006
@@ -28,7 +28,7 @@
started from the command line, the debug log will be created in
the current directory. When executing Gnash from a launcher under
<code>GNOME</code> or <code>KDE</code> the debug file goes in your
- home directory.
+ home directory, since that's considered the current directory.
</para>
<para>
Index: gnash/libbase/log.h
diff -u gnash/libbase/log.h:1.1 gnash/libbase/log.h:1.2
--- gnash/libbase/log.h:1.1 Sat Mar 11 19:24:27 2006
+++ gnash/libbase/log.h Sun Mar 12 00:35:15 2006
@@ -120,6 +120,9 @@
void setVerbosity (int x) {
_verbose = x;
}
+ int getVerbosity (void) {
+ return _verbose;
+ }
void setStamp (bool b) {
_stamp = b;
@@ -155,22 +158,31 @@
struct __Host_Function_Report__ {
const char *func;
+ // Only print function tracing messages when two -v options have been supplied.
__Host_Function_Report__(void) {
- dbglogfile << "TRACE: enter" << std::endl;
+ if (dbglogfile.getVerbosity() > 1) {
+ dbglogfile << "TRACE: enter" << std::endl;
+ }
}
__Host_Function_Report__(char *_func) {
- func = _func;
- dbglogfile << func << " enter" << std::endl;
+ if (dbglogfile.getVerbosity() > 1) {
+ func = _func;
+ dbglogfile << "TRACE: " << func << " enter" << std::endl;
+ }
}
__Host_Function_Report__(const char *_func) {
- func = _func;
- dbglogfile << "TRACE: " << func << " enter" << std::endl;
+ if (dbglogfile.getVerbosity() > 1) {
+ func = _func;
+ dbglogfile << "TRACE: " << func << " enter" << std::endl;
+ }
}
~__Host_Function_Report__(void) {
- dbglogfile << "TRACE: " << func << " return" << std::endl;
+ if (dbglogfile.getVerbosity() > 1) {
+ dbglogfile << "TRACE: " << func << " return" << std::endl;
+ }
}
};
Index: gnash/libbase/tu_file.cpp
diff -u gnash/libbase/tu_file.cpp:1.3 gnash/libbase/tu_file.cpp:1.4
--- gnash/libbase/tu_file.cpp:1.3 Sat Mar 11 19:24:27 2006
+++ gnash/libbase/tu_file.cpp Sun Mar 12 00:35:15 2006
@@ -23,7 +23,7 @@
// Return the number of bytes actually read. EOF or an error would
// cause that to not be equal to "bytes".
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
assert(appdata);
assert(dst);
Index: gnash/server/Color.cpp
diff -u gnash/server/Color.cpp:1.3 gnash/server/Color.cpp:1.4
--- gnash/server/Color.cpp:1.3 Thu Mar 9 19:29:06 2006
+++ gnash/server/Color.cpp Sun Mar 12 00:35:15 2006
@@ -56,25 +56,25 @@
void
Color::getRGB()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_warning("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
Color::getTransform()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_warning("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
Color::setRGB()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_warning("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
Color::setTransform()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_warning("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
color_new(const fn_call& fn)
@@ -89,16 +89,16 @@
fn.result->set_as_object(color_obj);
}
void color_getrgb(const fn_call& fn) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_warning("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void color_gettransform(const fn_call& fn) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_warning("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void color_setrgb(const fn_call& fn) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_warning("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void color_settransform(const fn_call& fn) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_warning("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
} // end of gnaash namespace
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.55 gnash/server/action.cpp:1.56
--- gnash/server/action.cpp:1.55 Mon Mar 6 01:43:25 2006
+++ gnash/server/action.cpp Sun Mar 12 00:35:15 2006
@@ -4475,105 +4475,105 @@
};
static inst_info s_instruction_table[] = {
- { SWF::ACTION_NEXTFRAME, "next_frame", ARG_NONE },
- { SWF::ACTION_PREVFRAME, "prev_frame", ARG_NONE },
- { SWF::ACTION_PLAY, "play", ARG_NONE },
- { SWF::ACTION_STOP, "stop", ARG_NONE },
- { SWF::ACTION_TOGGLEQUALITY, "toggle_qlty", ARG_NONE },
- { SWF::ACTION_STOPSOUNDS, "stop_sounds", ARG_NONE },
- { SWF::ACTION_ADD, "add", ARG_NONE },
- { SWF::ACTION_SUBTRACT, "sub", ARG_NONE },
- { SWF::ACTION_MULTIPLY, "mul", ARG_NONE },
- { SWF::ACTION_DIVIDE, "div", ARG_NONE },
- { SWF::ACTION_EQUAL, "equ", ARG_NONE },
- { SWF::ACTION_LESSTHAN, "lt", ARG_NONE },
- { SWF::ACTION_LOGICALAND, "and", ARG_NONE },
- { SWF::ACTION_LOGICALOR, "or", ARG_NONE },
- { SWF::ACTION_LOGICALNOT, "not", ARG_NONE },
- { SWF::ACTION_STRINGEQ, "str_eq", ARG_NONE },
- { SWF::ACTION_STRINGLENGTH, "str_len", ARG_NONE },
- { SWF::ACTION_SUBSTRING, "substr", ARG_NONE },
- { SWF::ACTION_POP, "pop", ARG_NONE },
- { SWF::ACTION_INT, "floor", ARG_NONE },
- { SWF::ACTION_GETVARIABLE, "get_var", ARG_NONE },
- { SWF::ACTION_SETVARIABLE, "set_var", ARG_NONE },
+ { SWF::ACTION_NEXTFRAME, "next_frame", ARG_NONE },
+ { SWF::ACTION_PREVFRAME, "prev_frame", ARG_NONE },
+ { SWF::ACTION_PLAY, "play", ARG_NONE },
+ { SWF::ACTION_STOP, "stop", ARG_NONE },
+ { SWF::ACTION_TOGGLEQUALITY, "toggle_qlty", ARG_NONE },
+ { SWF::ACTION_STOPSOUNDS, "stop_sounds", ARG_NONE },
+ { SWF::ACTION_ADD, "add", ARG_NONE },
+ { SWF::ACTION_SUBTRACT, "sub", ARG_NONE },
+ { SWF::ACTION_MULTIPLY, "mul", ARG_NONE },
+ { SWF::ACTION_DIVIDE, "div", ARG_NONE },
+ { SWF::ACTION_EQUAL, "equ", ARG_NONE },
+ { SWF::ACTION_LESSTHAN, "lt", ARG_NONE },
+ { SWF::ACTION_LOGICALAND, "and", ARG_NONE },
+ { SWF::ACTION_LOGICALOR, "or", ARG_NONE },
+ { SWF::ACTION_LOGICALNOT, "not", ARG_NONE },
+ { SWF::ACTION_STRINGEQ, "str_eq", ARG_NONE },
+ { SWF::ACTION_STRINGLENGTH, "str_len", ARG_NONE },
+ { SWF::ACTION_SUBSTRING, "substr", ARG_NONE },
+ { SWF::ACTION_POP, "pop", ARG_NONE },
+ { SWF::ACTION_INT, "floor", ARG_NONE },
+ { SWF::ACTION_GETVARIABLE, "get_var", ARG_NONE },
+ { SWF::ACTION_SETVARIABLE, "set_var", ARG_NONE },
{ SWF::ACTION_SETTARGETEXPRESSION, "set_target_exp", ARG_NONE },
- { SWF::ACTION_STRINGCONCAT, "str_cat", ARG_NONE },
- { SWF::ACTION_GETPROPERTY, "get_prop", ARG_NONE },
- { SWF::ACTION_SETPROPERTY, "set_prop", ARG_NONE },
- { SWF::ACTION_DUPLICATECLIP, "dup_sprite", ARG_NONE },
- { SWF::ACTION_REMOVECLIP, "rem_sprite", ARG_NONE },
- { SWF::ACTION_TRACE, "trace", ARG_NONE },
- { SWF::ACTION_STARTDRAGMOVIE, "start_drag", ARG_NONE },
- { SWF::ACTION_STOPDRAGMOVIE, "stop_drag", ARG_NONE },
- { SWF::ACTION_STRINGCOMPARE, "str_lt", ARG_NONE },
- { SWF::ACTION_THROW, "throw_fixme", ARG_NONE },
- { SWF::ACTION_CASTOP, "cast_fixme", ARG_NONE },
- { SWF::ACTION_IMPLEMENTSOP, "implements_fixme", ARG_NONE },
- { SWF::ACTION_RANDOM, "random", ARG_NONE },
- { SWF::ACTION_MBLENGTH, "mb_length_fixme", ARG_NONE },
- { SWF::ACTION_ORD, "ord", ARG_NONE },
- { SWF::ACTION_CHR, "chr", ARG_NONE },
- { SWF::ACTION_GETTIMER, "get_timer", ARG_NONE },
- { SWF::ACTION_MBSUBSTRING, "substr_mb_fixme", ARG_NONE },
- { SWF::ACTION_MBORD, "ord_mb", ARG_NONE },
- { SWF::ACTION_MBCHR, "chr_mb_fixme", ARG_NONE },
- { SWF::ACTION_DELETEVAR, "delete_fixme", ARG_NONE },
- { SWF::ACTION_DELETE, "delete_all_fixme", ARG_NONE },
- { SWF::ACTION_VAREQUALS, "set_local", ARG_NONE },
- { SWF::ACTION_CALLFUNCTION, "call_func", ARG_NONE },
- { SWF::ACTION_RETURN, "return", ARG_NONE },
- { SWF::ACTION_MODULO, "mod", ARG_NONE },
- { SWF::ACTION_NEW, "new", ARG_NONE },
- { SWF::ACTION_VAR, "decl_local", ARG_NONE },
- { SWF::ACTION_INITARRAY, "decl_array", ARG_NONE },
- { SWF::ACTION_INITOBJECT, "decl_obj_fixme", ARG_NONE },
- { SWF::ACTION_TYPEOF, "type_of", ARG_NONE },
- { SWF::ACTION_TARGETPATH, "get_target_fixme", ARG_NONE },
- { SWF::ACTION_ENUMERATE, "enumerate", ARG_NONE },
- { SWF::ACTION_NEWADD, "add_t", ARG_NONE },
- { SWF::ACTION_NEWLESSTHAN, "lt_t", ARG_NONE },
- { SWF::ACTION_NEWEQUALS, "eq_t", ARG_NONE },
- { SWF::ACTION_TONUMBER, "number", ARG_NONE },
- { SWF::ACTION_TOSTRING, "string", ARG_NONE },
- { SWF::ACTION_DUP, "dup", ARG_NONE },
- { SWF::ACTION_SWAP, "swap", ARG_NONE },
- { SWF::ACTION_GETMEMBER, "get_member", ARG_NONE },
- { SWF::ACTION_SETMEMBER, "set_member", ARG_NONE },
- { SWF::ACTION_INCREMENT, "inc", ARG_NONE },
- { SWF::ACTION_DECREMENT, "dec", ARG_NONE },
- { SWF::ACTION_CALLMETHOD, "call_method", ARG_NONE },
- { SWF::ACTION_NEWMETHOD, "new_method_fixme", ARG_NONE },
- { SWF::ACTION_INSTANCEOF, "is_inst_of_fixme", ARG_NONE },
- { SWF::ACTION_ENUM2, "enum_object_fixme", ARG_NONE },
- { SWF::ACTION_BITWISEAND, "bit_and", ARG_NONE },
- { SWF::ACTION_BITWISEOR, "bit_or", ARG_NONE },
- { SWF::ACTION_BITWISEXOR, "bit_xor", ARG_NONE },
- { SWF::ACTION_SHIFTLEFT, "shl", ARG_NONE },
- { SWF::ACTION_SHIFTRIGHT, "asr", ARG_NONE },
- { SWF::ACTION_SHIFTRIGHT2, "lsr", ARG_NONE },
- { SWF::ACTION_STRICTEQ, "eq_strict", ARG_NONE },
- { SWF::ACTION_GREATER, "gt_t", ARG_NONE },
- { SWF::ACTION_EXTENDS, "extends_fixme", ARG_NONE },
- { SWF::ACTION_GOTOFRAME, "goto_frame", ARG_U16 },
- { SWF::ACTION_GETURL, "get_url", ARG_STR },
- { SWF::ACTION_SETREGISTER, "store_register", ARG_U8 },
- { SWF::ACTION_CONSTANTPOOL, "decl_dict", ARG_DECL_DICT },
- { SWF::ACTION_WAITFORFRAME, "wait_for_frame", ARG_HEX },
- { SWF::ACTION_SETTARGET, "set_target", ARG_STR },
- { SWF::ACTION_GOTOLABEL, "goto_frame_lbl", ARG_STR },
+ { SWF::ACTION_STRINGCONCAT, "str_cat", ARG_NONE },
+ { SWF::ACTION_GETPROPERTY, "get_prop", ARG_NONE },
+ { SWF::ACTION_SETPROPERTY, "set_prop", ARG_NONE },
+ { SWF::ACTION_DUPLICATECLIP, "dup_sprite", ARG_NONE },
+ { SWF::ACTION_REMOVECLIP, "rem_sprite", ARG_NONE },
+ { SWF::ACTION_TRACE, "trace", ARG_NONE },
+ { SWF::ACTION_STARTDRAGMOVIE, "start_drag", ARG_NONE },
+ { SWF::ACTION_STOPDRAGMOVIE, "stop_drag", ARG_NONE },
+ { SWF::ACTION_STRINGCOMPARE, "str_lt", ARG_NONE },
+ { SWF::ACTION_THROW, "throw_fixme", ARG_NONE },
+ { SWF::ACTION_CASTOP, "cast_fixme", ARG_NONE },
+ { SWF::ACTION_IMPLEMENTSOP, "implements_fixme", ARG_NONE },
+ { SWF::ACTION_RANDOM, "random", ARG_NONE },
+ { SWF::ACTION_MBLENGTH, "mb_length_fixme", ARG_NONE },
+ { SWF::ACTION_ORD, "ord", ARG_NONE },
+ { SWF::ACTION_CHR, "chr", ARG_NONE },
+ { SWF::ACTION_GETTIMER, "get_timer", ARG_NONE },
+ { SWF::ACTION_MBSUBSTRING, "substr_mb_fixme", ARG_NONE },
+ { SWF::ACTION_MBORD, "ord_mb", ARG_NONE },
+ { SWF::ACTION_MBCHR, "chr_mb_fixme", ARG_NONE },
+ { SWF::ACTION_DELETEVAR, "delete_fixme", ARG_NONE },
+ { SWF::ACTION_DELETE, "delete_all_fixme", ARG_NONE },
+ { SWF::ACTION_VAREQUALS, "set_local", ARG_NONE },
+ { SWF::ACTION_CALLFUNCTION, "call_func", ARG_NONE },
+ { SWF::ACTION_RETURN, "return", ARG_NONE },
+ { SWF::ACTION_MODULO, "mod", ARG_NONE },
+ { SWF::ACTION_NEW, "new", ARG_NONE },
+ { SWF::ACTION_VAR, "decl_local", ARG_NONE },
+ { SWF::ACTION_INITARRAY, "decl_array", ARG_NONE },
+ { SWF::ACTION_INITOBJECT, "decl_obj_fixme", ARG_NONE },
+ { SWF::ACTION_TYPEOF, "type_of", ARG_NONE },
+ { SWF::ACTION_TARGETPATH, "get_target_fixme", ARG_NONE },
+ { SWF::ACTION_ENUMERATE, "enumerate", ARG_NONE },
+ { SWF::ACTION_NEWADD, "add_t", ARG_NONE },
+ { SWF::ACTION_NEWLESSTHAN, "lt_t", ARG_NONE },
+ { SWF::ACTION_NEWEQUALS, "eq_t", ARG_NONE },
+ { SWF::ACTION_TONUMBER, "number", ARG_NONE },
+ { SWF::ACTION_TOSTRING, "string", ARG_NONE },
+ { SWF::ACTION_DUP, "dup", ARG_NONE },
+ { SWF::ACTION_SWAP, "swap", ARG_NONE },
+ { SWF::ACTION_GETMEMBER, "get_member", ARG_NONE },
+ { SWF::ACTION_SETMEMBER, "set_member", ARG_NONE },
+ { SWF::ACTION_INCREMENT, "inc", ARG_NONE },
+ { SWF::ACTION_DECREMENT, "dec", ARG_NONE },
+ { SWF::ACTION_CALLMETHOD, "call_method", ARG_NONE },
+ { SWF::ACTION_NEWMETHOD, "new_method_fixme", ARG_NONE },
+ { SWF::ACTION_INSTANCEOF, "is_inst_of_fixme", ARG_NONE },
+ { SWF::ACTION_ENUM2, "enum_object_fixme", ARG_NONE },
+ { SWF::ACTION_BITWISEAND, "bit_and", ARG_NONE },
+ { SWF::ACTION_BITWISEOR, "bit_or", ARG_NONE },
+ { SWF::ACTION_BITWISEXOR, "bit_xor", ARG_NONE },
+ { SWF::ACTION_SHIFTLEFT, "shl", ARG_NONE },
+ { SWF::ACTION_SHIFTRIGHT, "asr", ARG_NONE },
+ { SWF::ACTION_SHIFTRIGHT2, "lsr", ARG_NONE },
+ { SWF::ACTION_STRICTEQ, "eq_strict", ARG_NONE },
+ { SWF::ACTION_GREATER, "gt_t", ARG_NONE },
+ { SWF::ACTION_EXTENDS, "extends_fixme", ARG_NONE },
+ { SWF::ACTION_GOTOFRAME, "goto_frame", ARG_U16 },
+ { SWF::ACTION_GETURL, "get_url", ARG_STR },
+ { SWF::ACTION_SETREGISTER, "store_register", ARG_U8 },
+ { SWF::ACTION_CONSTANTPOOL, "decl_dict", ARG_DECL_DICT },
+ { SWF::ACTION_WAITFORFRAME, "wait_for_frame", ARG_HEX },
+ { SWF::ACTION_SETTARGET, "set_target", ARG_STR },
+ { SWF::ACTION_GOTOLABEL, "goto_frame_lbl", ARG_STR },
{ SWF::ACTION_WAITFORFRAMEEXPRESSION, "wait_for_fr_exp", ARG_HEX },
- { SWF::ACTION_DEFINEFUNCTION2, "function2", ARG_FUNCTION2 },
- { SWF::ACTION_TRY, "try_fixme", ARG_FUNCTION2 },
- { SWF::ACTION_WITH, "with", ARG_U16 },
- { SWF::ACTION_PUSHDATA, "push_data", ARG_PUSH_DATA },
- { SWF::ACTION_BRANCHALWAYS, "goto", ARG_S16 },
- { SWF::ACTION_GETURL2, "get_url2", ARG_HEX },
- { SWF::ACTION_DEFINEFUNCTION, "func", ARG_HEX },
- { SWF::ACTION_BRANCHIFTRUE, "branch_if_true", ARG_S16 },
- { SWF::ACTION_CALLFRAME, "call_frame", ARG_HEX },
- { SWF::ACTION_GOTOEXPRESSION, "goto_frame_exp", ARG_HEX },
- { SWF::ACTION_END, "<end>", ARG_NONE }
+ { SWF::ACTION_DEFINEFUNCTION2, "function2", ARG_FUNCTION2 },
+ { SWF::ACTION_TRY, "try_fixme", ARG_FUNCTION2 },
+ { SWF::ACTION_WITH, "with", ARG_U16 },
+ { SWF::ACTION_PUSHDATA, "push_data", ARG_PUSH_DATA },
+ { SWF::ACTION_BRANCHALWAYS, "goto", ARG_S16 },
+ { SWF::ACTION_GETURL2, "get_url2", ARG_HEX },
+ { SWF::ACTION_DEFINEFUNCTION, "func", ARG_HEX },
+ { SWF::ACTION_BRANCHIFTRUE, "branch_if_true", ARG_S16 },
+ { SWF::ACTION_CALLFRAME, "call_frame", ARG_HEX },
+ { SWF::ACTION_GOTOEXPRESSION, "goto_frame_exp", ARG_HEX },
+ { SWF::ACTION_END, "<end>", ARG_NONE }
};
int action_id = instruction_data[0];
@@ -4857,7 +4857,5 @@
// Local Variables:
// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
// indent-tabs-mode: t
// End:
Index: gnash/server/action.h
diff -u gnash/server/action.h:1.24 gnash/server/action.h:1.25
--- gnash/server/action.h:1.24 Thu Mar 9 19:29:06 2006
+++ gnash/server/action.h Sun Mar 12 00:35:15 2006
@@ -557,7 +557,5 @@
// Local Variables:
// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
// indent-tabs-mode: t
// End:
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.23 gnash/server/impl.cpp:1.24
--- gnash/server/impl.cpp:1.23 Sat Mar 11 19:24:27 2006
+++ gnash/server/impl.cpp Sun Mar 12 00:35:15 2006
@@ -265,68 +265,68 @@
// Register the standard loaders.
s_registered = true;
- register_tag_loader(SWF::END, end_loader);
- register_tag_loader(SWF::DEFINESHAPE, define_shape_loader);
- // 03 FREECHARACTER unimplemented
- register_tag_loader(SWF::PLACEOBJECT, place_object_2_loader);
- register_tag_loader(SWF::REMOVEOBJECT, remove_object_2_loader);
- register_tag_loader(SWF::DEFINEBITS, define_bits_jpeg_loader);
- register_tag_loader(SWF::DEFINEBUTTON, button_character_loader);
- register_tag_loader(SWF::JPEGTABLES, jpeg_tables_loader);
+ register_tag_loader(SWF::END, end_loader);
+ register_tag_loader(SWF::DEFINESHAPE, define_shape_loader);
+ register_tag_loader(SWF::FREECHARACTER, fixme_loader); // 03
+ register_tag_loader(SWF::PLACEOBJECT, place_object_2_loader);
+ register_tag_loader(SWF::REMOVEOBJECT, remove_object_2_loader);
+ register_tag_loader(SWF::DEFINEBITS, define_bits_jpeg_loader);
+ register_tag_loader(SWF::DEFINEBUTTON, button_character_loader);
+ register_tag_loader(SWF::JPEGTABLES, jpeg_tables_loader);
register_tag_loader(SWF::SETBACKGROUNDCOLOR, set_background_color_loader);
- register_tag_loader(SWF::DEFINEFONT, define_font_loader);
- register_tag_loader(SWF::DEFINETEXT, define_text_loader);
- register_tag_loader(SWF::DOACTION, do_action_loader);
+ register_tag_loader(SWF::DEFINEFONT, define_font_loader);
+ register_tag_loader(SWF::DEFINETEXT, define_text_loader);
+ register_tag_loader(SWF::DOACTION, do_action_loader);
register_tag_loader(SWF::DEFINEFONTINFO, define_font_info_loader);
- register_tag_loader(SWF::DEFINESOUND, define_sound_loader);
- register_tag_loader(SWF::STARTSOUND, start_sound_loader);
+ register_tag_loader(SWF::DEFINESOUND, define_sound_loader);
+ register_tag_loader(SWF::STARTSOUND, start_sound_loader);
// 16 _UNKNOWN_ unimplemented
register_tag_loader(SWF::DEFINEBUTTONSOUND, button_sound_loader);
- // 18 - SOUNDSTREAMHEAD unimplemented
- // 19 - SOUNDSTREAMBLOCK unimpliemented
+ register_tag_loader(SWF::SOUNDSTREAMHEAD, fixme_loader); // 18
+ register_tag_loader(SWF::SOUNDSTREAMBLOCK, fixme_loader); // 19
register_tag_loader(SWF::DEFINELOSSLESS, define_bits_lossless_2_loader);
register_tag_loader(SWF::DEFINEBITSJPEG2, define_bits_jpeg2_loader);
- register_tag_loader(SWF::DEFINESHAPE2, define_shape_loader);
- // 23 - DEFINEBUTTONCXFORM unimplemented
+ register_tag_loader(SWF::DEFINESHAPE2, define_shape_loader);
+ register_tag_loader(SWF::DEFINEBUTTONCXFORM, fixme_loader); // 23
// "protect" tag; we're not an authoring tool so we don't care.
- register_tag_loader(SWF::PROTECT, null_loader);
- // 25 - PATHSAREPOSTSCRIPT unimplemented
- register_tag_loader(SWF::PLACEOBJECT2, place_object_2_loader);
+ register_tag_loader(SWF::PROTECT, null_loader);
+ register_tag_loader(SWF::PATHSAREPOSTSCRIPT, fixme_loader); // 25
+ register_tag_loader(SWF::PLACEOBJECT2, place_object_2_loader);
// 27 - _UNKNOWN_ unimplemented
register_tag_loader(SWF::REMOVEOBJECT2, remove_object_2_loader);
- // 29 - SYNCFRAME unimplemented
+ register_tag_loader(SWF::SYNCFRAME, fixme_loader); // 29
// 30 - _UNKNOWN_ unimplemented
- // 31 - FREEALL unimplemented
- register_tag_loader(SWF::DEFINESHAPE3, define_shape_loader);
- register_tag_loader(SWF::DEFINETEXT2, define_text_loader);
+ register_tag_loader(SWF::FREEALL, fixme_loader); // 31
+ register_tag_loader(SWF::DEFINESHAPE3, define_shape_loader);
+ register_tag_loader(SWF::DEFINETEXT2, define_text_loader);
register_tag_loader(SWF::DEFINEBUTTON2, button_character_loader);
register_tag_loader(SWF::DEFINEBITSJPEG3, define_bits_jpeg3_loader);
register_tag_loader(SWF::DEFINELOSSLESS2, define_bits_lossless_2_loader);
register_tag_loader(SWF::DEFINEEDITTEXT, define_edit_text_loader);
- // 38 - DEFINEVIDEO unimplemented
- register_tag_loader(SWF::DEFINESPRITE, sprite_loader);
- // 40 - NAMECHARACTER unimplemented
- // 41 - SERIALNUMBER unimplemented
- // 42 - DEFINETEXTFORMAT unimplemented
- register_tag_loader(SWF::FRAMELABEL, frame_label_loader);
+ register_tag_loader(SWF::DEFINEVIDEO, fixme_loader); // 38
+ register_tag_loader(SWF::DEFINESPRITE, sprite_loader);
+ register_tag_loader(SWF::NAMECHARACTER, fixme_loader); // 40
+ register_tag_loader(SWF::SERIALNUMBER, fixme_loader); // 41
+ register_tag_loader(SWF::DEFINETEXTFORMAT, fixme_loader); // 42
+ register_tag_loader(SWF::FRAMELABEL, frame_label_loader);
// 44 - _UNKNOWN_ unimplemented
- // 45 - SOUNDSTREAMHEAD2 unimplemented
+ register_tag_loader(SWF::SOUNDSTREAMHEAD2, fixme_loader); // 45
register_tag_loader(SWF::DEFINEMORPHSHAPE, define_shape_morph_loader);
- // 47 - FRAMETAG unimplemented
- register_tag_loader(SWF::DEFINEFONT2, define_font_loader);
- // 49 - GENCOMMAND unimplemented
- // 50 - DEFINECOMMANDOBJ unimplemented
- // 51 - CHARACTERSET unimplemented
- // 52 - FONTREF unimplemented
+ register_tag_loader(SWF::FRAMETAG, fixme_loader); // 47
+ register_tag_loader(SWF::DEFINEFONT2, define_font_loader);
+ register_tag_loader(SWF::GENCOMMAND, fixme_loader); // 49
+ register_tag_loader(SWF::DEFINECOMMANDOBJ, fixme_loader); // 50
+ register_tag_loader(SWF::CHARACTERSET, fixme_loader); // 51
+ register_tag_loader(SWF::FONTREF, fixme_loader); // 52
// 53 - _UNKNOWN_ unimplemented
// 54 - _UNKNOWN_ unimplemented
// 55 - _UNKNOWN_ unimplemented
- register_tag_loader(SWF::EXPORTASSETS, export_loader);
- register_tag_loader(SWF::IMPORTASSETS, import_loader);
+ register_tag_loader(SWF::EXPORTASSETS, export_loader);
+ register_tag_loader(SWF::IMPORTASSETS, import_loader);
// 58 - _UNKNOWN_ unimplemented
- register_tag_loader(SWF::INITACTION, do_init_action_loader);
- // 60 - DEFINEVIDEOSTREAM unimplemented
- // 61 - VIDEOFRAME unimplemented
+ register_tag_loader(SWF::INITACTION, do_init_action_loader);
+ register_tag_loader(SWF::DEFINEVIDEOSTREAM, fixme_loader); // 60
+ register_tag_loader(SWF::VIDEOFRAME, fixme_loader); // 61
}
}
@@ -1311,6 +1311,12 @@
m->add_bitmap_character(character_id, ch);
}
+// This is like null_loader except it prints a message to nag us to fix it.
+void
+fixme_loader(stream* in, int tag_type, movie_definition* m)
+{
+ IF_VERBOSE_PARSE(log_msg(" FIXME: tagtype = %d\n", tag_type));
+}
void define_shape_loader(stream* in, int tag_type, movie_definition* m)
{
Index: gnash/server/impl.h
diff -u gnash/server/impl.h:1.15 gnash/server/impl.h:1.16
--- gnash/server/impl.h:1.15 Thu Mar 9 19:29:06 2006
+++ gnash/server/impl.h Sun Mar 12 00:35:15 2006
@@ -653,6 +653,7 @@
void define_bits_jpeg_loader(stream* in, int tag_type, movie_definition* m);
void define_bits_jpeg2_loader(stream* in, int tag_type, movie_definition* m);
void define_bits_jpeg3_loader(stream* in, int tag_type, movie_definition* m);
+ void fixme_loader(stream* in, int tag_type, movie_definition* m);
void define_shape_loader(stream* in, int tag_type, movie_definition* m);
void define_shape_morph_loader(stream* in, int tag_type, movie_definition* m);
void define_font_loader(stream* in, int tag_type, movie_definition* m);
Index: gnash/server/text.cpp
diff -u gnash/server/text.cpp:1.9 gnash/server/text.cpp:1.10
--- gnash/server/text.cpp:1.9 Wed Mar 1 00:54:43 2006
+++ gnash/server/text.cpp Sun Mar 12 00:35:15 2006
@@ -781,11 +781,12 @@
if (s_log_count < 10)
{
s_log_count++;
- log_error("edit_text_character::display() -- missing glyph for char %d "
- "-- make sure character shapes for font %s are being exported "
+ log_warning("%s\n\t -- missing glyph for char %d\n"
+ "-- make sure character shapes for font %s are being exported "
"into your SWF file!\n",
- code,
- m_def->m_font->get_name());
+ __PRETTY_FUNCTION__,
+ code,
+ m_def->m_font->get_name());
}
// Drop through and use index == -1; this will display
Index: gnash/utilities/processor.cpp
diff -u gnash/utilities/processor.cpp:1.6 gnash/utilities/processor.cpp:1.7
--- gnash/utilities/processor.cpp:1.6 Sat Mar 11 19:24:27 2006
+++ gnash/utilities/processor.cpp Sun Mar 12 00:35:15 2006
@@ -98,7 +98,6 @@
main(int argc, char *argv[])
{
int c;
- int verbosity = 0;
assert(tu_types_validate());
std::vector<const char*> infiles;
@@ -124,8 +123,7 @@
s_do_output = true;
break;
case 'v':
- verbosity++;
- dbglogfile.setVerbosity(verbosity);
+ dbglogfile.setVerbosity();
dbglogfile << "Verbose output turned on" << endl;
break;
case 'a':
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic