[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/parser/button_character_...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/parser/button_character_... |
Date: |
Tue, 12 Feb 2008 12:03:11 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/02/12 12:03:11
Modified files:
. : ChangeLog
server/parser : button_character_def.cpp
Log message:
print state info for button records (debuggin).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5620&r2=1.5621
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.27&r2=1.28
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5620
retrieving revision 1.5621
diff -u -b -r1.5620 -r1.5621
--- ChangeLog 12 Feb 2008 11:54:41 -0000 1.5620
+++ ChangeLog 12 Feb 2008 12:03:10 -0000 1.5621
@@ -1,3 +1,8 @@
+2008-02-12 Sandro Santilli <address@hidden>
+
+ * server/parser/button_character_def.cpp: print state info for
+ button records (debuggin).
+
2008-02-12 Bastiaan Jacques <address@hidden>
* libmedia/gst/SoundGst.cpp: Use the right scale for volume (0-1, not
Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/button_character_def.cpp 1 Feb 2008 13:09:38 -0000
1.27
+++ server/parser/button_character_def.cpp 12 Feb 2008 12:03:10 -0000
1.28
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: button_character_def.cpp,v 1.27 2008/02/01 13:09:38 strk Exp $ */
+/* $Id: button_character_def.cpp,v 1.28 2008/02/12 12:03:10 strk Exp $ */
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
@@ -77,6 +77,17 @@
return (m_character_def != NULL);
}
+static std::string
+computeButtonStatesString(int flags)
+{
+ std::string ret;
+ if ( flags & (1<<3) ) ret += "hit";
+ if ( flags & (1<<2) ) { if ( ! ret.empty() ) ret += ","; ret += "down";
}
+ if ( flags & (1<<1) ) { if ( ! ret.empty() ) ret += ","; ret += "over";
}
+ if ( flags & (1<<0) ) { if ( ! ret.empty() ) ret += ","; ret += "up"; }
+ return ret;
+}
+
bool
button_record::read(stream* in, int tag_type,
movie_definition* m, unsigned long endPos)
@@ -124,16 +135,16 @@
if ( ! m_character_def )
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_(" button record refer to "
+ log_swferror(_(" button record for states [%s] refer to "
"character with id %d, which is not found "
- "in the chars dictionary"), m_character_id);
+ "in the chars dictionary"),
computeButtonStatesString(flags).c_str(), m_character_id);
);
}
else
{
IF_VERBOSE_PARSE(
- log_parse(_(" button record for states %x contain "
- "character %d (%s)"),
(m_hit_test<<4)+(m_down<<2)+(m_over<<1)+(m_up), m_character_id,
+ log_parse(_(" button record for states [%s] contain "
+ "character %d (%s)"),
computeButtonStatesString(flags).c_str(), m_character_id,
typeName(*m_character_def).c_str());
);
}