[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac backen...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac backen... |
|
Date: |
Sun, 17 Sep 2006 19:46:00 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/09/17 19:45:59
Modified files:
. : ChangeLog Makefile.am configure.ac
backend : Makefile.am
doc/C : appendix.xml fdl-appendix.xml gnash.xml
internals.xml localconnection.xml logging.xml
netconnection.xml opcodes.xml plugin.xml
rtmp.xml sources.xml
gui : Makefile.am
libamf : Makefile.am amf.cpp amf.h rtmp.cpp
libbase : Makefile.am container.cpp container.h log.cpp
network.cpp network.h
macros : opengl.m4
plugin : Makefile.am
server/asobj : NetConnection.h System.cpp Video.cpp
testsuite : Makefile.am
testsuite/actionscript.all: Makefile.am swf_exists.exp
testsuite/misc-ming.all: Makefile.am
Log message:
* testsuite/actionscript.all/Makefile.am: Add test driver name
to
the command line. Don't pass --srcdir, runtest doesn't need it
anymore, and it breaks the site.exp setting of the same value.
* testsuite/misc-ming.all/Makefile.am: Don't pass --srcdir,
runtest doesn't need it anymore, and it breaks the site.exp
setting of the same value.
* testsuite/actionscript.all/swf_exists.exp: Don't use the file
name, just let makeswf use the default output file, out.swf.
* Makefile.am: Don't have dejagnu as an option, just change to
the
testsuite directory and run make check.
* configure.ac: Remove unused configure options. Have dumpconfig
display if libCurl has RTMP support.
* backend/Makefile.am: Remove dejagnu from AUTOMAKE_OPTIONS.
* doc/C/appendix.xmlfdl-appendix.xml, gnash.xml,
internals.xml, localconnection.xml, logging.xml,
netconnection.xml, opcodes.xml, plugin.xml, rtmp.xml,
sources.xml,
: Change <code> to <emphasis>, as the xmlto tools on FC5 don't
grok <code> anymore.
* libamf/Makefile.am: Put amftest.cpp in EXTRA_PROGAMS.
* libamf/amf.cpp, amf.h: Use unsigned char instead of signed
char
when pointing to RTMP message data.
* libbase/container.cpp, container.h: Define STRCASECMP in the
source file, not the header.
* libbase/network.cpp: Fix the warning message about not binding
to a port. Don't include fn_call.h or xml.h.
* libbase/network.h: Don't include fn_call.h or xml.h.
* macros/opengl.m4: Look in X11R6 too.
* plugin/Makefile.am: Remove dejagnu from AUTOMAKE_OPTIONS.
* server/asobj/NetConnection.h: Add private variables for the
connect message to the server.
* server/asobj/System.cpp, Video.cpp: Tweak the unimplemented
messages.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.848&r2=1.849
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/appendix.xml?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/fdl-appendix.xml?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/gnash.xml?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/internals.xml?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/localconnection.xml?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/logging.xml?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/netconnection.xml?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/opcodes.xml?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/plugin.xml?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/rtmp.xml?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/sources.xml?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/rtmp.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/System.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Video.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/swf_exists.exp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.9&r2=1.10
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -b -r1.848 -r1.849
--- ChangeLog 17 Sep 2006 19:28:57 -0000 1.848
+++ ChangeLog 17 Sep 2006 19:45:58 -0000 1.849
@@ -1,3 +1,45 @@
+2006-09-17 Rob Savoye <address@hidden>
+
+ * testsuite/actionscript.all/Makefile.am: Add test driver name to
+ the command line. Don't pass --srcdir, runtest doesn't need it
+ anymore, and it breaks the site.exp setting of the same value.
+ * testsuite/misc-ming.all/Makefile.am: Don't pass --srcdir,
+ runtest doesn't need it anymore, and it breaks the site.exp
+ setting of the same value.
+ * testsuite/actionscript.all/swf_exists.exp: Don't use the file
+ name, just let makeswf use the default output file, out.swf.
+ * Makefile.am: Don't have dejagnu as an option, just change to the
+ testsuite directory and run make check.
+ * configure.ac: Remove unused configure options. Have dumpconfig
+ display if libCurl has RTMP support.
+ * backend/Makefile.am: Remove dejagnu from AUTOMAKE_OPTIONS.
+ * doc/C/appendix.xmlfdl-appendix.xml, gnash.xml,
+ internals.xml, localconnection.xml, logging.xml,
+ netconnection.xml, opcodes.xml, plugin.xml, rtmp.xml, sources.xml,
+ : Change <code> to <emphasis>, as the xmlto tools on FC5 don't
+ grok <code> anymore.
+ * libamf/Makefile.am: Put amftest.cpp in EXTRA_PROGAMS.
+ * libamf/amf.cpp, amf.h: Use unsigned char instead of signed char
+ when pointing to RTMP message data.
+ * libbase/container.cpp, container.h: Define STRCASECMP in the
+ source file, not the header.
+ * libbase/network.cpp: Fix the warning message about not binding
+ to a port. Don't include fn_call.h or xml.h.
+ * libbase/network.h: Don't include fn_call.h or xml.h.
+ * macros/opengl.m4: Look in X11R6 too.
+ * plugin/Makefile.am: Remove dejagnu from AUTOMAKE_OPTIONS.
+ * server/asobj/NetConnection.h: Add private variables for the
+ connect message to the server.
+ * server/asobj/System.cpp, Video.cpp: Tweak the unimplemented
+ messages.
+
+2006-09-11 Patrice Dumas <address@hidden>
+
+ * libbase/Makefile.am: Don't include anything from the server
+ directory.
+ * libbase/log.cpp: Don't include gnash.h.
+ * libbase/network.h, cpp: Don't include xml.h.
+
2006-09-17 Bastiaan Jacques <address@hidden>
* libbase/URL.cpp: Don't treat local filenames as query strings (bug
@@ -23,10 +65,10 @@
2006-09-15 Vitaly Alexeev <address@hidden>
- * libbase/tu_config.h: __declspec(dllimport) temporarily is commented
- because of VC++ compiler problems.
- * web/gnash/snapshots/gnash.zip: added Standalone executable files &
- dependences.
+ * libbase/tu_config.h: __declspec(dllimport) temporarily is
+ commented because of VC++ compiler problems.
+ * web/gnash/snapshots/gnash.zip: added Standalone executable files
+ & dependences.
* web/gnash/snapshots/gnash.exe, npgnash.dll: removed.
2006-09-15 Markus Gothe <address@hidden>
@@ -98,9 +140,10 @@
protocols it supports.
2006-09-02 Sandro Santilli <address@hidden>
-
- * gui/gnash.cpp, doc/C/gnash.xml: added -P switch to set contextual
- parameters (see http://www.permadi.com/tutorial/flashVars/index.html)
+STRCASECMP
+ * gui/gnash.cpp, doc/C/gnash.xml: added -P switch to set
+ contextual parameters (see
+ http://www.permadi.com/tutorial/flashVars/index.html)
* libbase/URL.{cpp,h}, testsuite/libbase/URLTest.cpp:
added support for query strings (+tests).
* server/swf/ASHandlers.cpp (ActionGetUrl2): log a warning
@@ -182,16 +225,19 @@
2006-08-30 Markus Gothe <address@hidden>
* libbase/tu_types.h: rededifine __FUCTION__
- * libbase/rc.cpp: include tu_types.h where __PRETTY_FUNCTION__ is decl.
+ * libbase/rc.cpp: include tu_types.h where __PRETTY_FUNCTION__ is
+ decl.
* configure.ac: Check if sqrt() needs -lm.
* libbase/tu_math.h: Fixed IRIX 6.5-compability.
* server/asobj/Math.cpp: Include "tu_math.h"
* server/asobj/Gmath.h: Deconfuse MIPSPRO/SGI/IRIX.
* libgeometry/axial_box.h: Fixed picky-compiler warnings.
- * libbase/network.cpp: renamed struct sockaddr fsin since not allowed.
+ * libbase/network.cpp: renamed struct sockaddr fsin since not
+ allowed.
* utilities/processor.cpp, utilities/parser.cpp: Compability fixes.
* plugin/Makefile.am: Fixed bug that made non-gnu make crash.
- * autogen.sh: Don't run automake with '--gnu'. It'll figure it out self.
+ * autogen.sh: Don't run automake with '--gnu'. It'll figure it out
+ self.
2006-08-29 Patrice Dumas <address@hidden>
@@ -208,7 +254,8 @@
added typecasting.
* libbase/container.h Fixed bugs for compilers missing ext/hashmap.
* libbase/log.h Fixed bugs for non-gcc-compilers.
- * libbase/tu_config.h: Added namespace to exit() since MIPSPro is picky.
+ * libbase/tu_config.h: Added namespace to exit() since MIPSPro is
+ picky.
2006-08-29 Sandro Santilli <address@hidden>
@@ -220,8 +267,8 @@
* Disabled building of static-libraries as default.
* libbase/tu_opengl_includes.h: Modern Non-SGI OGL-ABIs include
glext.h in gl.h.
- * Fixed isinf() and isnan() for platforms that doesn't include it in
- C++ (It however usually is in the later C99, esp. in IRIX).
+ * Fixed isinf() and isnan() for platforms that doesn't include it
+ in C++ (It however usually is in the later C99, esp. in IRIX).
2006-08-28 Sandro Santilli <address@hidden>
@@ -238,7 +285,7 @@
* Merged in klash-patch sent by Patrice Dumas <address@hidden>.
* Misc clean-ups in headers.
* server/parser/action_buffer.cpp, server/tesselate.cpp,
- server/ActionExec.cpp, libgeometry/bsp.cpp, libbase/image.cpp
+ serasobj/System.cppver/ActionExec.cpp, libgeometry/bsp.cpp,
libbase/image.cpp
libamf/amf.cpp:
Removed unused <cstdlib>.
@@ -247,8 +294,9 @@
* server/swf/tagloaders, server/ActionExec.cpp
server/swf/ASHandlers.cpp, libgeometry/kd_tree_dynamic.cpp
libamf/amf.cpp, libamf/amftest.cpp: Changed '+= 1' to '++'.
- * Removed headers from log.{cpp,h} since it speed up compilation time.
- Try avoiding unnecessary includes of <iostream> as much as possible.
+ * Removed headers from log.{cpp,h} since it speed up compilation
+ time. Try avoiding unnecessary includes of <iostream> as much as
+ possible.
* utilities/parser.cpp, utilities/processor.cpp: Fixed strange -h
output.
@@ -290,8 +338,8 @@
2006-08-26 Markus Gothe <address@hidden>
- * server/asobj/Global.cpp, libbase/image.cpp: Found and fixed memory
- leakage.
+ * server/asobj/Global.cpp, libbase/image.cpp: Found and fixed
+ memory leakage.
* Optimized the zlib code, which is a bottleneck according to my
profiling.
* Fixed macros/pthread.m4 for portability to other architectures.
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- Makefile.am 13 Aug 2006 15:54:16 -0000 1.33
+++ Makefile.am 17 Sep 2006 19:45:58 -0000 1.34
@@ -34,7 +34,7 @@
# forward this exception.
## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = dejagnu 1.6.0
+AUTOMAKE_OPTIONS = 1.6.0
ACLOCAL_AMFLAGS = -I macros
STD_DIRS = \
@@ -94,6 +94,8 @@
mudflap:
@echo "Rebuilding with GCC Mudflap support"
$(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
+check:
+ (cd testsuite ; $(MAKE) check $(RUNTESTFLAGS) )
dumpconfig:
@uname -a
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- configure.ac 14 Sep 2006 19:54:49 -0000 1.114
+++ configure.ac 17 Sep 2006 19:45:58 -0000 1.115
@@ -64,8 +64,6 @@
*) AC_MSG_ERROR([bad value ${enableval} for --enable-klash option]) ;;
esac],klash=no)
-AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config])
-AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes])
KDE_SET_PREFIX
AM_KDE_WITH_NLS
AC_PATH_KDE
@@ -258,31 +256,31 @@
AC_ERROR([Can't specify a DOM and an xmlReader parser])
fi
-dnl This enables or disables the support to make Gnash function as a
-dnl small web server.
-AC_ARG_ENABLE(http, [ --enable-http Enable support for a web
server],
-[case "${enableval}" in
- yes) http=yes ;;
- no) http=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-http option]) ;;
-esac], http=no)
+dnl dnl This enables or disables the support to make Gnash function as a
+dnl dnl small web server.
+dnl AC_ARG_ENABLE(http, [ --enable-http Enable support for a web
server],
+dnl [case "${enableval}" in
+dnl yes) http=yes ;;
+dnl no) http=no ;;
+dnl *) AC_MSG_ERROR([bad value ${enableval} for enable-http option]) ;;
+dnl esac], http=no)
-if test x$http = xyes; then
- AC_DEFINE([HTTP_SUPPORT], [], [Add the mini web server])
-fi
-AM_CONDITIONAL(HTTP, test x$http = xtrue)
+dnl if test x$http = xyes; then
+dnl AC_DEFINE([HTTP_SUPPORT], [], [Add the mini web server])
+dnl fi
+dnl AM_CONDITIONAL(HTTP, test x$http = xtrue)
-AC_ARG_ENABLE(net_conn, [ --enable-net-conn Enable support ],
-[case "${enableval}" in
- yes) net_conn=yes ;;
- no) net_conn=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-net_conn option]) ;;
-esac], net_conn=no)
+dnl AC_ARG_ENABLE(net_conn, [ --enable-net-conn Enable support ],
+dnl [case "${enableval}" in
+dnl yes) net_conn=yes ;;
+dnl no) net_conn=no ;;
+dnl *) AC_MSG_ERROR([bad value ${enableval} for enable-net_conn option]) ;;
+dnl esac], net_conn=no)
-if test x$net_conn = xyes; then
- AC_DEFINE([NETWORK_CONN], [], [Use tcp/ip for local connections])
-fi
-AM_CONDITIONAL(NET_CONN, test x$net_conn = xtrue)
+dnl if test x$net_conn = xyes; then
+dnl AC_DEFINE([NETWORK_CONN], [], [Use tcp/ip for local connections])
+dnl fi
+dnl AM_CONDITIONAL(NET_CONN, test x$net_conn = xtrue)
AC_PROG_CC
AC_PROG_CXX
@@ -293,6 +291,7 @@
AC_CHECK_FUNCS(mallinfo)
PKG_PROG_PKG_CONFIG
dnl LIBS+="-L/usr/lib64"
+AC_PATH_TOOL([AUTOTRACE], [autotrace])
dnl
dnl !! This has been moved here to make --enable-plugin work
@@ -940,6 +939,11 @@
fi
if test x"$CURL_LIBS" != x; then
+ if test x"$rtmp" = xyes; then
+ echo " This version of libCurl has RTMP support"
+ else
+ echo " This version of libCurl doesn't have RTMP support"
+ fi
if test x"$CURL_CFLAGS" != x; then
echo " CURL flags are: $CURL_CFLAGS"
else
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- backend/Makefile.am 13 Aug 2006 15:54:16 -0000 1.31
+++ backend/Makefile.am 17 Sep 2006 19:45:58 -0000 1.32
@@ -18,7 +18,7 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = # dejagnu
+AUTOMAKE_OPTIONS =
if MP3
MP3_CFLAGS = $(MAD_CFLAGS)
Index: doc/C/appendix.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/appendix.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- doc/C/appendix.xml 15 Aug 2006 05:07:34 -0000 1.8
+++ doc/C/appendix.xml 17 Sep 2006 19:45:58 -0000 1.9
@@ -10,15 +10,15 @@
url="http://www.gnu.org/prep/standards/standards.html";>GNU
Coding Standards</ulink>. Where there is some flexibility as to
the location of braces, I prefer mine on the end of a line when
- using an <code>if</code>, <code>while</code>, or <code>do</code>
+ using an <emphasis>if</emphasis>, <emphasis>while</emphasis>, or
<emphasis>do</emphasis>
statement. I find this more compact style easier to read and
parse by eye. I'm also a big fan of always using
- braces around <code>if</code> statements, even if they're one
+ braces around <emphasis>if</emphasis> statements, even if they're one
liners.
</para>
<para>
- Here's my tweaked style settings for <code>Emacs</code>, the one
+ Here's my tweaked style settings for <emphasis>Emacs</emphasis>, the one
true editor to rule them all.
<programlisting>
@@ -93,11 +93,11 @@
</para>
<para>
- <code>Doxygen</code> style comments for <code>C++</code> code is
- simply using three slashes <code>///</code> instead of the
- standard two slashes <code>//</code> used for C++
+ <emphasis>Doxygen</emphasis> style comments for <emphasis>C++</emphasis>
code is
+ simply using three slashes <emphasis>///</emphasis> instead of the
+ standard two slashes <emphasis>//</emphasis> used for C++
comments. Here's a short comment block for the
- <code>XML::cloneNode()</code> method:
+ <emphasis>XML::cloneNode()</emphasis> method:
<programlisting>
/// \brief copy a node
@@ -114,7 +114,7 @@
</para>
<para>
- The <code>\brief</code> keyword has that text get associated
+ The <emphasis>\brief</emphasis> keyword has that text get associated
when listing all the classes on the generated web pages. The
text after the blank link becomes the detailed description that
is on the generated web page for that class and method.
Index: doc/C/fdl-appendix.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/fdl-appendix.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/C/fdl-appendix.xml 22 Apr 2006 03:12:08 -0000 1.2
+++ doc/C/fdl-appendix.xml 17 Sep 2006 19:45:58 -0000 1.3
@@ -31,7 +31,7 @@
<title>0. PREAMBLE</title>
<para>
The purpose of this License is to make a manual, textbook, or
- other written document <quote>free</quote> in the sense of
+ other written document "free" in the sense of
freedom: to assure everyone the effective freedom to copy and
redistribute it, with or without modifying it, either
commercially or non-commercially. Secondarily, this License
@@ -41,7 +41,7 @@
</para>
<para>
- This License is a kind of <quote>copyleft</quote>, which means
+ This License is a kind of "copyleft", which means
that derivative works of the document must themselves be free in
the same sense. It complements the GNU General Public License,
which is a copyleft license designed for free software.
@@ -64,20 +64,20 @@
This License applies to any manual or other work that contains a
notice placed by the copyright holder saying it can be
distributed under the terms of this License. The
- <quote>Document</quote>, below, refers to any such manual or
+ "Document", below, refers to any such manual or
work. Any member of the public is a licensee, and is addressed
- as <quote>you</quote>.
+ as "you".
</para>
<para id="fdl-modified">
- A <quote>Modified Version</quote> of the Document means any work
+ A "Modified Version" of the Document means any work
containing the Document or a portion of it, either copied
verbatim, or with modifications and/or translated into another
language.
</para>
<para id="fdl-secondary">
- A <quote>Secondary Section</quote> is a named appendix or a
+ A "Secondary Section" is a named appendix or a
front-matter section of the <link
linkend="fdl-document">Document</link> that deals exclusively
with the relationship of the publishers or authors of the
@@ -92,7 +92,7 @@
</para>
<para id="fdl-invariant">
- The <quote>Invariant Sections</quote> are certain <link
+ The "Invariant Sections" are certain <link
linkend="fdl-secondary"> Secondary Sections</link> whose titles
are designated, as being those of Invariant Sections, in the
notice that says that the <link
@@ -101,7 +101,7 @@
</para>
<para id="fdl-cover-texts">
- The <quote>Cover Texts</quote> are certain short passages of
+ The "Cover Texts" are certain short passages of
text that are listed, as Front-Cover Texts or Back-Cover Texts,
in the notice that says that the <link
linkend="fdl-document">Document</link> is released under this
@@ -109,7 +109,7 @@
</para>
<para id="fdl-transparent">
- A <quote>Transparent</quote> copy of the <link
+ A "Transparent" copy of the <link
linkend="fdl-document"> Document</link> means a machine-readable
copy, represented in a format whose specification is available
to the general public, whose contents can be viewed and edited
@@ -121,8 +121,7 @@
formatters. A copy made in an otherwise Transparent file format
whose markup has been designed to thwart or discourage
subsequent modification by readers is not Transparent. A copy
- that is not <quote>Transparent</quote> is called
- <quote>Opaque</quote>.
+ that is not "Transparent" is called "Opaque".
</para>
<para>
@@ -139,11 +138,11 @@
</para>
<para id="fdl-title-page">
- The <quote>Title Page</quote> means, for a printed book, the
+ The "Title Page" means, for a printed book, the
title page itself, plus such following pages as are needed to
hold, legibly, the material this License requires to appear in
the title page. For works in formats which do not have any title
- page as such, <quote>Title Page</quote> means the text near the
+ page as such, "Title Page" means the text near the
most prominent appearance of the work's title, preceding the
beginning of the body of the text.
</para>
@@ -345,12 +344,12 @@
<formalpara>
<title>I</title>
<para>
- Preserve the section entitled <quote>History</quote>, and
+ Preserve the section entitled "History", and
its title, and add to it an item stating at least the
title, year, new authors, and publisher of the <link
linkend="fdl-modified">Modified Version </link>as given on
the <link linkend="fdl-title-page">Title Page</link>. If
- there is no section entitled <quote>History</quote> in the
+ there is no section entitled "History" in the
<link linkend="fdl-document">Document</link>, create one
stating the title, year, authors, and publisher of the
Document as given on its Title Page, then add an item
@@ -369,7 +368,7 @@
to a <link linkend="fdl-transparent">Transparent</link>
copy of the Document, and likewise the network locations
given in the Document for previous versions it was based
- on. These may be placed in the <quote>History</quote>
+ on. These may be placed in the "History"
section. You may omit a network location for a work that
was published at least four years before the Document
itself, or if the original publisher of the version it
@@ -382,8 +381,8 @@
<formalpara>
<title>K</title>
<para>
- In any section entitled <quote>Acknowledgements</quote> or
- <quote>Dedications</quote>, preserve the section's title,
+ In any section entitled "Acknowledgements" or
+ "Dedications", preserve the section's title,
and preserve in the section all the substance and tone of
each of the contributor acknowledgements and/or
dedications given therein.
@@ -409,7 +408,7 @@
<title>M</title>
<para>
Delete any section entitled
- <quote>Endorsements</quote>. Such a section may not be
+ "Endorsements". Such a section may not be
included in the <link linkend="fdl-modified">Modified
Version</link>.
</para>
@@ -421,7 +420,7 @@
<title>N</title>
<para>
Do not retitle any existing section as
- <quote>Endorsements</quote> or to conflict in title with
+ "Endorsements" or to conflict in title with
any <link linkend="fdl-invariant">Invariant
Section</link>.
</para>
@@ -442,7 +441,7 @@
</para>
<para>
- You may add a section entitled <quote>Endorsements</quote>,
+ You may add a section entitled "Endorsements",
provided it contains nothing but endorsements of your <link
linkend="fdl-modified">Modified Version</link> by various
parties--for example, statements of peer review or that the text
@@ -504,11 +503,11 @@
<para>
In the combination, you must combine any sections entitled
- <quote>History</quote> in the various original documents,
- forming one section entitled <quote>History</quote>; likewise
- combine any sections entitled <quote>Acknowledgements</quote>,
- and any sections entitled <quote>Dedications</quote>. You must
- delete all sections entitled <quote>Endorsements.</quote>
+ "History" in the various original documents,
+ forming one section entitled "History"; likewise
+ combine any sections entitled "Acknowledgements",
+ and any sections entitled "Dedications". You must
+ delete all sections entitled "Endorsements."
</para>
</sect1>
@@ -543,7 +542,7 @@
count as a <link linkend="fdl-modified">Modified Version</link>
of the Document, provided no compilation copyright is claimed
for the compilation. Such a compilation is called an
- <quote>aggregate</quote>, and this License does not apply to the
+ "aggregate", and this License does not apply to the
other self-contained works thus compiled with the Document , on
account of their being thus compiled, if they are not themselves
derivative works of the Document. If the <link
@@ -607,7 +606,7 @@
Each version of the License is given a distinguishing version
number. If the <link linkend="fdl-document">Document</link>
specifies that a particular numbered version of this License
- <quote>or any later version</quote> applies to it, you have the
+ "or any later version" applies to it, you have the
option of following the terms and conditions either of that
specified version or of any later version that has been
published (not as a draft) by the Free Software Foundation. If
@@ -639,18 +638,18 @@
linkend="fdl-cover-texts">Front-Cover Texts</link> being LIST,
and with the <link linkend="fdl-cover-texts">Back-Cover
Texts</link> being LIST. A copy of the license is included in
- the section entitled <quote>GNU Free Documentation
- License</quote>.
+ the section entitled "GNU Free Documentation
+ License".
</para>
</blockquote>
<para>
If you have no <link linkend="fdl-invariant">Invariant
- Sections</link>, write <quote>with no Invariant Sections</quote>
+ Sections</link>, write "with no Invariant Sections"
instead of saying which ones are invariant. If you have no
<link linkend="fdl-cover-texts">Front-Cover Texts</link>, write
- <quote>no Front-Cover Texts</quote> instead of
- <quote>Front-Cover Texts being LIST</quote>; likewise for <link
+ "no Front-Cover Texts" instead of
+ "Front-Cover Texts being LIST"; likewise for <link
linkend="fdl-cover-texts">Back-Cover Texts</link>.
</para>
Index: doc/C/gnash.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/gnash.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- doc/C/gnash.xml 2 Sep 2006 16:00:29 -0000 1.26
+++ doc/C/gnash.xml 17 Sep 2006 19:45:58 -0000 1.27
@@ -294,7 +294,7 @@
<para>
- <code>gnash samples/car_smash.swf</code>
+ <emphasis>gnash samples/car_smash.swf</emphasis>
</para>
<para>
@@ -314,7 +314,7 @@
<para>
While by default no options are necessary, there are options
- that can be used to change <code>Gnash's</code> basic
+ that can be used to change <emphasis>Gnash's</emphasis> basic
behavior.
</para>
@@ -358,7 +358,7 @@
<para>
Number of milli-seconds to delay in main loop. The main
loop polls continuously with a delay to adjust how long
- <code>gnash</code> sleeps between iterations of the
+ <emphasis>gnash</emphasis> sleeps between iterations of the
loop. The smaller the number, the higher the CPU load
gets, and of course, you get more iterations of the main
command loop.
Index: doc/C/internals.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/internals.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- doc/C/internals.xml 1 Sep 2006 22:24:15 -0000 1.22
+++ doc/C/internals.xml 17 Sep 2006 19:45:59 -0000 1.23
@@ -5,10 +5,10 @@
<title>A Tour of Gnash</title>
<para>
- The top level of Gnash has several libraries, <code>libgnashbase</code>,
- <code>libgnashgeo</code>, <code>libgnashserver</code>,
- <code>libgasnhasobjs</code>and
- <code>libgnashbackend</code>. There are two utility programs
+ The top level of Gnash has several libraries,
<emphasis>libgnashbase</emphasis>,
+ <emphasis>libgnashgeo</emphasis>, <emphasis>libgnashserver</emphasis>,
+ <emphasis>libgasnhasobjs</emphasis>and
+ <emphasis>libgnashbackend</emphasis>. There are two utility programs
included for debug parsing and processing of Flash movie files
to test the Actionscript interpreter. There is also a standalone
flash movie player.
@@ -138,7 +138,7 @@
<para>
Gprocesser is used to print out the actions (using the -va
option) or the parsing (using the -vp option) of a flash
- movie. It is also used to produce the <code>.gsc</code>
+ movie. It is also used to produce the <emphasis>.gsc</emphasis>
files that Gnash uses to cache data, thereby speeding up the
loading of files.
</para>
@@ -244,7 +244,7 @@
<para>
<ulink type="http"
url="http://mozplugger.mozdev.org/";>Mozplugger</ulink>. is a
- <code>Mozilla/Firefox</code> plugin that uses external
+ <emphasis>Mozilla/Firefox</emphasis> plugin that uses external
programs to play video, audio, and other multimedia content
in the browser. With some support added to the external
application, it's possible to force the external program to
@@ -267,7 +267,7 @@
</para>
<para>
- Add this to your <code>$(HOME)/.mozilla/mozpluggerrc</code>
+ Add this to your <emphasis>$(HOME)/.mozilla/mozpluggerrc</emphasis>
file to enable this:
<programlisting>
@@ -279,10 +279,10 @@
<para>
Once this is added, you must delete the
- <code>$(HOME)/.mozilla/firefox/pluginreg.dat</code> file to
+ <emphasis>$(HOME)/.mozilla/firefox/pluginreg.dat</emphasis> file to
force Firefox to register the plugins again. This is an
ascii text file, so if the patch has been added correctly,
- you'll see an entry for <code>swf</code> files after it is
+ you'll see an entry for <emphasis>swf</emphasis> files after it is
recreated. You will need to restart Firefox to recreate this
file.
</para>
@@ -291,7 +291,7 @@
This file is not recreated immediately when restarting
Firefox, but waits till the first time a plugin is used. You
can force creation of this file by typing
- <code>about:plugins</code> into the URL entry of the browser
+ <emphasis>about:plugins</emphasis> into the URL entry of the browser
window. The output will also contain information about the
mozplugger. You should see an entry for Gnash now.
</para>
@@ -302,7 +302,7 @@
<title>Klash</title>
<para>
Klash is MozPlugger type support for KDE's Konqueror web
- browser. Klash makes Gnash a <code>kpart</code>, so it's
+ browser. Klash makes Gnash a <emphasis>kpart</emphasis>, so it's
integrated into KDE better than when using MozPlugger. Klash
uses the standalone player, utilizing Gnash's "-x" window
plugin command line option.
@@ -310,7 +310,7 @@
<para>
By default, Klash is not built. To enable building Klash,
- use the <code>--enable-klash</code> option when
+ use the <emphasis>--enable-klash</emphasis> option when
configuring. Other than installing, there is nothing else
that needs to be done to install Klash.
</para>
@@ -335,9 +335,9 @@
process. A new file is created to hold the code, with an
associated header file. The file name is usually the name of
the ActionScript class itself, something like
- <code>XML</code>. All implementations are written in
- <code>C++</code>. In the CVS source tree for Gnash, there is a
- utility file called <code>gen-files.sh</code> that can be used
+ <emphasis>XML</emphasis>. All implementations are written in
+ <emphasis>C++</emphasis>. In the CVS source tree for Gnash, there is a
+ utility file called <emphasis>gen-files.sh</emphasis> that can be used
to generate a template for a new ActionScript class. At this
time templates have been generated for all documented
ActionScript classes.
@@ -354,7 +354,7 @@
<para>
Each class needs an associated version that is a derived form
- of the <code>as_object</code> class used to internally
+ of the <emphasis>as_object</emphasis> class used to internally
represent objects in Gnash. At it's simplest, this structure
just encapsulates an object of the desired class.
@@ -371,7 +371,7 @@
Foo obj;
}
</programlisting>
- The <code>obj</code> is an instantiation of the data for
+ The <emphasis>obj</emphasis> is an instantiation of the data for
this object. It isn't required unless this object needs
internal data that has to stay resident in the player.
</para>
@@ -380,7 +380,7 @@
Whenever this object is being handled the code for this
class, it is initially accessed by it's derived
binding. Internal data for this object can be accessed
- through the <code>obj</code>.
+ through the <emphasis>obj</emphasis>.
<programlisting>
foo_as_object *foo = env.top(0).to_object();
@@ -411,7 +411,7 @@
<para>
An even more complex example might be to add hooks to how
the list of member of a class is kept. The element
- <code>m_members</code>, is a list of each symbol name and it's
+ <emphasis>m_members</emphasis>, is a list of each symbol name and it's
associated code. Normally this is kept internally within the
interpreter engine, but in this example for certain methods we
want to return a point to itself, instead of getting the data
@@ -449,8 +449,8 @@
<para>
To add a new object to the list maintained by Gnash, it needs
- to be added to the function <code>gnash::action_init()</code>,
- in <code>action.cpp</code>. The symbol name is specified along
+ to be added to the function <emphasis>gnash::action_init()</emphasis>,
+ in <emphasis>action.cpp</emphasis>. The symbol name is specified along
with a function pointer that will be called when the symbol
name is seen by the interpreter.
@@ -460,23 +460,23 @@
</para>
<para>
The function used to instantiate a new object is passed the
- creation data in a <code>fn_call</code> data structure. This is
+ creation data in a <emphasis>fn_call</emphasis> data structure. This
is
used to pass data both into and returned from this function.
</para>
<para>
- The <code>fn_call</code> data structure has several methods
+ The <emphasis>fn_call</emphasis> data structure has several methods
for operating on the data for the
- function. <code>fn_call::nargs</code> is a variable that
+ function. <emphasis>fn_call::nargs</emphasis> is a variable that
soecifies how many arguments are being passed in. Al the
arguments are on a stack. To pop an argument off the stack,
- use <code>fn.env->top(0)</code>. In this case popping the
+ use <emphasis>fn.env->top(0)</emphasis>. In this case popping the
first argument off the stack.
</para>
<para>
The object popped off the stack also has it's own methods. The
- main one of interest is <code>get_type</code>. This returns
+ main one of interest is <emphasis>get_type</emphasis>. This returns
the type of the object being referred to.
<programlisting>
@@ -488,24 +488,24 @@
<para>
The supported data types for an object are
- <code>BOOLEAN</code>, <code>STRING</code>,
- <code>NUMBER</code>, <code>OBJECT</code>,
- <code>C_FUNCTION</code>, <code>AS_FUNCTION</code>. Because
+ <emphasis>BOOLEAN</emphasis>, <emphasis>STRING</emphasis>,
+ <emphasis>NUMBER</emphasis>, <emphasis>OBJECT</emphasis>,
+ <emphasis>C_FUNCTION</emphasis>, <emphasis>AS_FUNCTION</emphasis>.
Because
they are defined as part of the as_value class, they need to
always have the class name prefixed to use these as a
constant. You can retrieve the value of an
- <code>as_value</code> using the conversion methods. For
- example, <code>to_tu_string</code> returns the value as string
+ <emphasis>as_value</emphasis> using the conversion methods. For
+ example, <emphasis>to_tu_string</emphasis> returns the value as string
using the Gnash small STL library. Similarly,
- <code>to_number</code> would return this same value as a
- <code>double.</code>
+ <emphasis>to_number</emphasis> would return this same value as a
+ <emphasis>double.</emphasis>
</para>
<para>
To add methods to the class, a new class needs to be
instantiated as an object. Each ActionScript object can have
child methods attached in a similar way as the object was. In
- this case, the built-in <code>set_member</code> function is
+ this case, the built-in <emphasis>set_member</emphasis> function is
used.
<programlisting>
@@ -516,7 +516,7 @@
<para>
To make the object active within the interpreter, the new
object gets returned by the function using the
- <code>fn_call</code> typed parameter.
+ <emphasis>fn_call</emphasis> typed parameter.
<programlisting>
fn.result->set_as_object_interface(xml_obj);
@@ -571,7 +571,7 @@
When this is looked up by a Flash movie as a property, the
value is found, instead of needing to make a function
call. This scrap of ActionScript code as compiled by
- Ming's <code>makeswf</code> compiler shows the
+ Ming's <emphasis>makeswf</emphasis> compiler shows the
difference.
<programlisting>
@@ -595,7 +595,7 @@
<para>
Parameters are passed to the callback functions for a class's
- methods and properties using the <code>fn_call</code> data
+ methods and properties using the <emphasis>fn_call</emphasis> data
structure. This data structure contains all the incoming
parameters for a callback, as well as it contains the final
result from the callback to be passed back into the
@@ -607,7 +607,7 @@
<para>
Parameter data is passed on the stack in a similar way to
any function call in any language. There are several fields
- of the <code>fn_call</code> data structure that get used in
+ of the <emphasis>fn_call</emphasis> data structure that get used in
this example:
<programlisting>
@@ -618,37 +618,37 @@
</programlisting>
</para>
<para>
- Using the <code>fn</code> variable which was passed as the
+ Using the <emphasis>fn</emphasis> variable which was passed as the
sole parameter of the callback, we can access the data. The
- <code>fn.this_ptr</code> returns a reference to the class
+ <emphasis>fn.this_ptr</emphasis> returns a reference to the class
that is invoking this method. This is how the object data
- can be retrieved. The <code>fn.nargs</code> is a count of
+ can be retrieved. The <emphasis>fn.nargs</emphasis> is a count of
how many objects are being passed into the callback.
</para>
<para>
The current stack of the player is passed in via the
- <code>fn.env</code> field. This is used to access the data
+ <emphasis>fn.env</emphasis> field. This is used to access the data
passes to this callback. To find the location of this
particular stack frame, the
- <code>fn.first_arg_bottom_index</code> field is used to
+ <emphasis>fn.first_arg_bottom_index</emphasis> field is used to
point to the stack frame. More detail on the environment stack
can <link linkend="envstack">be found here.</link>.
</para>
<para>
For this example, the stack has a
- <code>as_environment::top()</code> and a
- <code>as_environment::bottom()</code> that are used to pull
+ <emphasis>as_environment::top()</emphasis> and a
+ <emphasis>as_environment::bottom()</emphasis> that are used to pull
arguments off the stack. When using
- <code>fn.first_arg_bottom_index</code>, the
- <code>as_environment::bottom()</code> method should be used
+ <emphasis>fn.first_arg_bottom_index</emphasis>, the
+ <emphasis>as_environment::bottom()</emphasis> method should be used
as in the example.
</para>
<para>
The top of the stack for this frame can also be accessed
- using the <code>as_environment::top()</code> method. Top
+ using the <emphasis>as_environment::top()</emphasis> method. Top
takes an integer index as to which value to retrieve,
</para>
@@ -660,7 +660,7 @@
<para>
If the type of the object is needed, that can be accessed by
- using the <code>as_value::get_type()</code> method. There
+ using the <emphasis>as_value::get_type()</emphasis> method. There
are more details on the types of values in the
<link linkend="handval">Handling Values</link> section of
this manual.
@@ -708,8 +708,8 @@
</para>
<para>
- The <code>result</code> field of the <code>fn</code>
- variable is a <code>gnash::as_value</code> object., so it's
+ The <emphasis>result</emphasis> field of the <emphasis>fn</emphasis>
+ variable is a <emphasis>gnash::as_value</emphasis> object., so it's
possible to set the value of several data types.
</para>
@@ -745,7 +745,7 @@
<term>as_value::set_string()</term>
<listitem>
<para>
- Set the result to a <code>const char*</code> value.
+ Set the result to a <emphasis>const char*</emphasis> value.
</para>
</listitem>
</varlistentry>
@@ -1441,20 +1441,20 @@
<para>
All of the main values in Gnash as used by the interpreter,
- are usually an <code>as_value</code> class. This is a generic
+ are usually an <emphasis>as_value</emphasis> class. This is a generic
object to hold data. The supported data types for an object
- are <code>BOOLEAN</code>, <code>STRING</code>,
- <code>NUMBER</code>, <code>OBJECT</code>,
- <code>C_FUNCTION</code>, <code>AS_FUNCTION</code>. You can
- retrieve the value of an <code>as_value</code> using the
- conversion methods. For example, <code>to_tu_string</code>
+ are <emphasis>BOOLEAN</emphasis>, <emphasis>STRING</emphasis>,
+ <emphasis>NUMBER</emphasis>, <emphasis>OBJECT</emphasis>,
+ <emphasis>C_FUNCTION</emphasis>, <emphasis>AS_FUNCTION</emphasis>. You
can
+ retrieve the value of an <emphasis>as_value</emphasis> using the
+ conversion methods. For example, <emphasis>to_tu_string</emphasis>
returns the value as string using the Gnash small STL
- library. Similarly, <code>to_number</code> would return this
- same value as a <code>double.</code>
+ library. Similarly, <emphasis>to_number</emphasis> would return this
+ same value as a <emphasis>double.</emphasis>
</para>
<para>
- <code>as_value</code> is often used as the initializer for a
+ <emphasis>as_value</emphasis> is often used as the initializer for a
property or the data for a callback. This is done so the
type of the object is specified along with the data.
@@ -1486,12 +1486,12 @@
<title>as_value set methods</title>
<para>
- While <code>as_value</code> allows you to use any of the
+ While <emphasis>as_value</emphasis> allows you to use any of the
supported data types when invoking the constructor (as in
the prior example). This is a common way to set the data
and type of a value. Often it's necessary to set the value
of an object after it is created, or to change the
- existing value. The <code>=</code> operator is also
+ existing value. The <emphasis>=</emphasis> operator is also
supported, so it is also possible to set a value and it's
type this way as well. I sort of lean towards the explicit
style of setting a type, so here's all the methods that
@@ -1527,7 +1527,7 @@
<term>as_value::set_string(const char*)</term>
<listitem>
<para>
- Set the value to a <code>const char*</code> value.
+ Set the value to a <emphasis>const char*</emphasis> value.
</para>
</listitem>
</varlistentry>
@@ -1553,7 +1553,7 @@
<term>as_value::set_null()</term>
<listitem>
<para>
- Set the value so this is a <code>NULL</code>
+ Set the value so this is a <emphasis>NULL</emphasis>
object.
</para>
</listitem>
@@ -1562,7 +1562,7 @@
<term>as_value::set_undefined()</term>
<listitem>
<para>
- Set the value so this is an <code>undefined</code>
+ Set the value so this is an <emphasis>undefined</emphasis>
object.
</para>
</listitem>
@@ -1626,7 +1626,7 @@
<term>as_value::to_string()</term>
<listitem>
<para>
- Return the value as a <code>const char*</code>.
+ Return the value as a <emphasis>const char*</emphasis>.
</para>
</listitem>
</varlistentry>
@@ -1670,11 +1670,11 @@
<listitem>
<para>
Return the value as an
- <code>as_object_interface</code>. This is often used
+ <emphasis>as_object_interface</emphasis>. This is often used
as the "handle" for an object within Gnash. You
would use this when you need to do
- <code>set_member()</code> or
- <code>get_member()</code> operations.
+ <emphasis>set_member()</emphasis> or
+ <emphasis>get_member()</emphasis> operations.
</para>
</listitem>
</varlistentry>
@@ -1893,8 +1893,8 @@
<para>
The primary compiler used at this time is <ulink type="http"
url="http://ming.sf.net";>Ming</ulink>. Since release 0.3,
- <code>Ming</code> includes a command-line compiler,
- <code>makeswf</code>. This lets test case development happen
+ <emphasis>Ming</emphasis> includes a command-line compiler,
+ <emphasis>makeswf</emphasis>. This lets test case development happen
purely with free tools.
</para>
@@ -1903,7 +1903,7 @@
<ulink type="http"
url="http://www.gnu.org/software/dejagnu";>DejaGnu</ulink>.
This is used to run multiple test cases in an automated
- manner. <code>DejaGnu </code> is used by many other <ulink
+ manner. <emphasis>DejaGnu </emphasis> is used by many other <ulink
type="http" url="http://www.gnu.org";>GNU</ulink> projects like
<ulink type="http" url="http://gcc.gnu.org";>GCC</ulink> and
<ulink type="http" url="http://www.samba.org";>Samba</ulink>.
@@ -1931,15 +1931,15 @@
<para>
Writing ActionScript tests is very simple. The
- <code>makeswf</code> compiler makes use of the C preprocessor,
+ <emphasis>makeswf</emphasis> compiler makes use of the C preprocessor,
thus allowing definition of macros and external files
inclusion. We use these feature to provide common utilities
for test units.
</para>
<para>
- Each test unit sets an <code>rcsid</code> variable, includes the
- <code>check.as</code> file and performs some checks using
+ Each test unit sets an <emphasis>rcsid</emphasis> variable, includes the
+ <emphasis>check.as</emphasis> file and performs some checks using
the provided macros. Here is an example:
<programlisting>
@@ -1965,15 +1965,15 @@
</para>
<para>
- The check(expr) macro will <code>trace</code> PASSED or FAILED
+ The check(expr) macro will <emphasis>trace</emphasis> PASSED or FAILED
together with the expression being evaluated and the linenumber
of the check. This is the format expected by DejaGnu.
</para>
<para>
- The <code>check_equals(obtained, expected)</code> macro uses equality
operator
- <code>==</code> to check for equality. When possible, use of the
- <code>check_equals()</code> macro is preferred over <code>check()</code>
+ The <emphasis>check_equals(obtained, expected)</emphasis> macro uses
equality operator
+ <emphasis>==</emphasis> to check for equality. When possible, use of the
+ <emphasis>check_equals()</emphasis> macro is preferred over
<emphasis>check()</emphasis>
in that it shows what the obtained result was in case of a mismatch.
DejaGnu.
</para>
@@ -1985,16 +1985,16 @@
</para>
<para>
- Test units are built by running <code>make TestName.swf</code>.
+ Test units are built by running <emphasis>make TestName.swf</emphasis>.
This will use TestName.as as source. To build "visual" tracing
- version you'd run <code>make TestName.vswf</code>.
+ version you'd run <emphasis>make TestName.vswf</emphasis>.
</para>
<para>
Note that if you get a syntax error from the compiler, the line
number will refer to the pre-processed file. This file is called
- <code>TestName.as.pp</code> and it's not thrown away by
- <code>makeswf</code> to make debugging easier.
+ <emphasis>TestName.as.pp</emphasis> and it's not thrown away by
+ <emphasis>makeswf</emphasis> to make debugging easier.
</para>
<para>
@@ -2021,10 +2021,10 @@
<para>
The simple way to run the tests is to install
- <code>DejaGnu</code>, and use that to run the tests. That
+ <emphasis>DejaGnu</emphasis>, and use that to run the tests. That
handles all the details to compile and execute the tests. To
run the tests using DejaGnu, change to the
- <code>testsuite</code> directory and type:
+ <emphasis>testsuite</emphasis> directory and type:
<programlisting>
make check
</programlisting>
@@ -2032,22 +2032,22 @@
<para>
You can get more details by adding command line option when
- invoking <code>make</code>. The <code>make check</code> target
- in the Makefile supports a variable, <code>RUNTESTFLAGS</code>
- that gets passed to DejaGnu when it's invoked by <code>make</code>.
+ invoking <emphasis>make</emphasis>. The <emphasis>make
check</emphasis> target
+ in the Makefile supports a variable, <emphasis>RUNTESTFLAGS</emphasis>
+ that gets passed to DejaGnu when it's invoked by
<emphasis>make</emphasis>.
<programlisting>
make check RUNTESTFLAGS="-v -a"
</programlisting>
- This adds the<code>verbose (-v)</code> option and the
- <code>all (-a)</code> option. Verbose prints much more
+ This adds the<emphasis>verbose (-v)</emphasis> option and the
+ <emphasis>all (-a)</emphasis> option. Verbose prints much more
information about how DejaGnu is running the test. It may be
too much information, but if you think you are having a
problem with running a test case, this is a good way to track
- it down. The <code>all</code> option tells DejaGnu to print
- all the tests that <code>PASS</code>, as well as those that
- <code>FAIL</code>.
+ it down. The <emphasis>all</emphasis> option tells DejaGnu to print
+ all the tests that <emphasis>PASS</emphasis>, as well as those that
+ <emphasis>FAIL</emphasis>.
</para>
</sect4>
@@ -2063,9 +2063,9 @@
<para>
The first step is to compile the test case. Ming's
- <code>makeswf</code> program is used to compile the test
+ <emphasis>makeswf</emphasis> program is used to compile the test
case into Flash. By default, no options are
- required. Running <code>makeswf</code> looks like this:
+ required. Running <emphasis>makeswf</emphasis> looks like this:
<programlisting>
shellprompt> makeswf XML.as
Index: doc/C/localconnection.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/localconnection.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/C/localconnection.xml 22 Apr 2006 03:12:08 -0000 1.5
+++ doc/C/localconnection.xml 17 Sep 2006 19:45:59 -0000 1.6
@@ -5,15 +5,15 @@
This class implements an LocalConnection object. This is basically
a Flash version of the a standard RPC (Remote Procedure
Call). This is used to have multiple flash movies exchange data
- without converting it to <code>XML</code> first. This class uses shared
memory
- to transfer the data in the <code>AMF</code> format.
+ without converting it to <emphasis>XML</emphasis> first. This class uses
shared memory
+ to transfer the data in the <emphasis>AMF</emphasis> format.
</para>
<para>
- There is some documentation of the <code>AMF</code> format at online, but
not
- much. There appear to be a few free <code>AMF</code> projects, but none
that I
+ There is some documentation of the <emphasis>AMF</emphasis> format at
online, but not
+ much. There appear to be a few free <emphasis>AMF</emphasis> projects, but
none that I
could find have any code. So I'm stuck developing a C/C++ based
- <code>AMF</code> library to transfer data.
+ <emphasis>AMF</emphasis> library to transfer data.
</para>
<sect5 id="localconnectionmethods">
@@ -59,7 +59,7 @@
<listitem>
<para>
Execute a method of the local object. Data is encoded in
- the <code>AMF</code> format.
+ the <emphasis>AMF</emphasis> format.
</para>
</listitem>
</varlistentry>
Index: doc/C/logging.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/logging.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/C/logging.xml 22 Apr 2006 03:12:08 -0000 1.3
+++ doc/C/logging.xml 17 Sep 2006 19:45:59 -0000 1.4
@@ -3,31 +3,31 @@
<para>
Gnash supports a debug logging system that supports both C and C++
- natively. This means you can use both <code>printf()</code> style
- debug messages and C++ <code>iostreams</code> style, where you can
+ natively. This means you can use both <emphasis>printf()</emphasis> style
+ debug messages and C++ <emphasis>iostreams</emphasis> style, where you can
print C++ objects directly as you would when using
- <code>cout</code>.
+ <emphasis>cout</emphasis>.
</para>
<para>
In the beginning, Gnash only supported the C API for debug
logging, so that is the most heavily used in Gnash. This API was
- the <code>log_msg()</code> and <code>log_error()</code> functions,
+ the <emphasis>log_msg()</emphasis> and <emphasis>log_error()</emphasis>
functions,
and used a callback to set them up.
</para>
<para>
It became apparent one day the callback was never needed, and I
- got tired of having to use <code>c_str()</code> on string data
+ got tired of having to use <emphasis>c_str()</emphasis> on string data
just to print them out.
</para>
<para>
If a filename is not specified at object construction time, a
- default name of <code>gnash-dbg.log</code> is used. If Gnash was
+ default name of <emphasis>gnash-dbg.log</emphasis> is used. If Gnash was
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
+ <emphasis>GNOME</emphasis> or <emphasis>KDE</emphasis> the debug file goes
in your
home directory, since that's considered the current directory.
</para>
@@ -35,7 +35,7 @@
There is common functionality between using the C or C++
API. Optional output is based on flags that can be set or
unset. Multiple levels of verbosity are supported, so you can get
- more output by supplying multiple <code>-v</code> options on the
+ more output by supplying multiple <emphasis>-v</emphasis> options on the
command line. You can also disable the creating of the debug log.
</para>
@@ -98,7 +98,7 @@
There are two macros used for program tracing. these can be used
in both C or C++ code with one little difference. Since C
doesn't have destructors, you must call
- <code>GNASH_REPORT_RETURN</code> at the end of a function to
+ <emphasis>GNASH_REPORT_RETURN</emphasis> at the end of a function to
display the function returning message.
</para>
@@ -130,7 +130,7 @@
<para>
This is the main API for the logging system. By default
everything is setup to write to the default
- <code>gnash-dbg.log</code> file whenever a verbose option is
+ <emphasis>gnash-dbg.log</emphasis> file whenever a verbose option is
supplied. Optionally it is possible to open a log file with a
specified name, allowing multiple output files.
</para>
@@ -141,7 +141,7 @@
<listitem>
<para>
Open the debug file with the name specified by
- <code>filespec</code>. This file goes in the current
+ <emphasis>filespec</emphasis>. This file goes in the current
directory, or your home directory if using a menu based
launcher.
</para>
@@ -183,9 +183,9 @@
<term>setStamp(bool flag)</term>
<listitem>
<para>
- If <code>flag</code> is <code>true</code>, then print a
+ If <emphasis>flag</emphasis> is <emphasis>true</emphasis>, then
print a
timestamp prefixed to every output line. If
- <code>flag</code> is <code>false</code>, then don't print
+ <emphasis>flag</emphasis> is <emphasis>false</emphasis>, then don't
print
a timestamp.
</para>
</listitem>
@@ -194,8 +194,8 @@
<term>setWriteDisk(bool flag)</term>
<listitem>
<para>
- If <code>flag</code> is <code>true</code>, then create the
- disk file. If <code>flag</code> is <code>false</code>,
+ If <emphasis>flag</emphasis> is <emphasis>true</emphasis>, then
create the
+ disk file. If <emphasis>flag</emphasis> is
<emphasis>false</emphasis>,
then don't create the disk file.
</para>
</listitem>
Index: doc/C/netconnection.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/netconnection.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/C/netconnection.xml 22 Apr 2006 03:12:08 -0000 1.5
+++ doc/C/netconnection.xml 17 Sep 2006 19:45:59 -0000 1.6
@@ -17,14 +17,14 @@
</para>
<para>
- The URL that can be passed to <code>connect()</code> in newer
+ The URL that can be passed to <emphasis>connect()</emphasis> in newer
versions of the swf format is as follows:
<programlisting>
protocol:[//host][:port]/appname/[instanceName]
</programlisting>
- For protocol, specify either <code>RTMP</code> or
- <code>RTMPT</code>. If rtmp is specified, Flash Player will create
- a client connection. If <code>RTMPT</code> is specified, Flash
+ For protocol, specify either <emphasis>RTMP</emphasis> or
+ <emphasis>RTMPT</emphasis>. If rtmp is specified, Flash Player will create
+ a client connection. If <emphasis>RTMPT</emphasis> is specified, Flash
Player will create an HTTP "tunneling" connection to the server.
</para>
Index: doc/C/opcodes.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/opcodes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/C/opcodes.xml 22 Apr 2006 03:12:08 -0000 1.2
+++ doc/C/opcodes.xml 17 Sep 2006 19:45:59 -0000 1.3
@@ -1,4 +1,4 @@
- <sect2 id="opcodes">
+ <sect2 id="op codes">
<title>Flash Opcodes</title>
<para>
@@ -6,10 +6,10 @@
majority of them up to version 7 of the Flash format. Gnash will
print an "unimplemented" message whenever it sees an opcode that
isn't implemented. If you try to play a movie and it doesn't
- appear to be executing properly, run <code>gnash</code> or
- <code>gprocessor</code> with the <code>-v</code> option to see
- the debug messages. You can also use the <code>-w</code> option
- to <code>gnash</code> to write the debug messages to disk.
+ appear to be executing properly, run <emphasis>gnash</emphasis> or
+ <emphasis>gprocessor</emphasis> with the <emphasis>-v</emphasis> option
to see
+ the debug messages. You can also use the <emphasis>-w</emphasis> option
+ to <emphasis>gnash</emphasis> to write the debug messages to disk.
</para>
<sect3 id="missops">
@@ -26,7 +26,7 @@
<term>0x2A Throw</term>
<listitem>
<para>
- Throw an error that can be caught by a <code>catch</code>
statement.
+ Throw an error that can be caught by a <emphasis>catch</emphasis>
statement.
</para>
</listitem>
</varlistentry>
Index: doc/C/plugin.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/plugin.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/C/plugin.xml 22 Apr 2006 03:12:08 -0000 1.6
+++ doc/C/plugin.xml 17 Sep 2006 19:45:59 -0000 1.7
@@ -13,7 +13,7 @@
</para>
<para>
- Most of the programming of a plugin is filling in real code for
+ Most of the programming of a plugin is filling in real emphasis for
the standard API functions and methods. Firefox uses these to
create the plugin, and to send it data.
</para>
@@ -30,10 +30,10 @@
<para>
The lower layer is a C based API that is used by Firefox to
initialize and destroy a plugin. This is so a plugin can be
- portable across multiple systems, since C++ code is not portable
+ portable across multiple systems, since C++ emphasis is not portable
between most C++ compilers. This where most of the behind the
scenes work is done in a plugin. For Gnash, the sources this
- lower layer are in <code>plugin/mozilla-sdk</code>. They were
+ lower layer are in <emphasis>plugin/mozilla-sdk</emphasis>. They were
added to the Gnash source tree so it wouldn't be necessary to
have the Mozilla development packages installed to compile the
Gnash plugin.
@@ -68,7 +68,7 @@
<para>
This instantiates a new object for the browser. Returning
a pointer to the C++ plugin object is what ties the C++
- and C code parts of the API together.
+ and C emphasis parts of the API together.
</para>
</listitem>
</varlistentry>
@@ -121,9 +121,9 @@
<para>
The higher level layer is the one we are most concerned
with. This is an instantiation of the
- <code>nsPluginInstanceBase</code> class, as defined by the
+ <emphasis>nsPluginInstanceBase</emphasis> class, as defined by the
Mozilla SDK, for our plugin. With this API, a plugin is mostly
- defining the standard entry points for Firefox, and the code
+ defining the standard entry points for Firefox, and the emphasis
that implements the glue between the Firefox and our plugin.
</para>
@@ -133,8 +133,8 @@
created. Unfortunately for plugin programmers, these functions
may randomly be called more than once, so it's good to use
initialization flags for things that should only be done one per
- thread. For instance, <code>nsPluginInstance::init()</code> and
- <code>nsPluginInstance::SetWindow()</code> are called more than
+ thread. For instance, <emphasis>nsPluginInstance::init()</emphasis> and
+ <emphasis>nsPluginInstance::SetWindow()</emphasis> are called more than
once, so the plugin must protect against actions that could be
destructive.
</para>
@@ -169,7 +169,7 @@
the plugin to setup the window. This may get called
multiple times by each instantiated object, so it can't
do much but window specific setup here. This is where the
- main code is that sets up the window for the plugin.
+ main emphasis is that sets up the window for the plugin.
</para>
</listitem>
</varlistentry>
@@ -223,7 +223,7 @@
<term>nsPluginInstance::shut</term>
<listitem>
<para>
- This is where the movie playing specific shutdown code goes.
+ This is where the movie playing specific shutdown emphasis goes.
</para>
</listitem>
</varlistentry>
@@ -300,24 +300,24 @@
<para>
The X11 context is maintained one per instantiation of the
plugin. It is necessary to lock access to the X11 context when
- using threads by using <code>XLockDisplay()</code> and
- <code>XUnlockDisplay()</code>. A connection to the X11
+ using threads by using <emphasis>XLockDisplay()</emphasis> and
+ <emphasis>XUnlockDisplay()</emphasis>. A connection to the X11
server is opened for every instantiation of the plugin using
- <code>XOpenDisplay()</code>.
+ <emphasis>XOpenDisplay()</emphasis>.
</para>
<para>
- The <code>The GLX Context</code> is maintained one per
+ The <emphasis>The GLX Context</emphasis> is maintained one per
instantiation of the plugin for a web page. If there are more
than one Flash movie, there is more than one GLX Context. A GLX
- context can be created by using <code>glXCreateContext()</code>,
- and then later destroyed by using <code>glXDestroyContext()</code>.
+ context can be created by using <emphasis>glXCreateContext()</emphasis>,
+ and then later destroyed by using
<emphasis>glXDestroyContext()</emphasis>.
When swapping threads, the context is changed using
- <code>glXMakeCurrent()</code>.
+ <emphasis>glXMakeCurrent()</emphasis>.
</para>
<para>
- All the code that directly accesses a GLX context or the X11
+ All the emphasis that directly accesses a GLX context or the X11
display must be wrapped with a mutex.
</para>
@@ -335,14 +335,14 @@
</para>
<para>
- It is also possible to disable the <code>GTK</code> support so
- only the older <code>SDL</code> support is used. In this case
+ It is also possible to disable the <emphasis>GTK</emphasis> support so
+ only the older <emphasis>SDL</emphasis> support is used. In this case
Gnash can't support event handling within the browser. This
means that when using the SDL of the plugin, mouse clicks and
keys pressed get ignored. Windows also can't be resized, and
sometimes they overrun their boundaries as well. To disable the
GTK support and force SDL to be used anyway, configure with
- <code>--disable-glext</code>
+ <emphasis>--disable-glext</emphasis>
</para>
<para>
Index: doc/C/rtmp.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/rtmp.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/C/rtmp.xml 15 Aug 2006 05:07:34 -0000 1.2
+++ doc/C/rtmp.xml 17 Sep 2006 19:45:59 -0000 1.3
@@ -4,11 +4,11 @@
<para>
This document is based mostly on my own reverse engineering of the
- RTMP protocol and AMF format. <code>tcpdump</code> and
- <code>ethereal</code> are your friend. Some addition info that got
+ RTMP protocol and AMF format. <emphasis>tcpdump</emphasis> and
+ <emphasis>ethereal</emphasis> are your friend. Some additional info that
got
me started was from the <ulink type="http"
url="http://www.osflash.org/red5";>Red5</ulink>
- project. <code>Red5</code> is the only other open source Flash
+ project. <emphasis>Red5</emphasis> is the only other open source Flash
server. So some details are still vague, but as the implementation
appears to work, we'll figure out what they are later.
</para>
@@ -38,12 +38,12 @@
<para>
The basics of the RTMP protocol are as follows. All communications
are initiated by the client.
- </para>
<mediaobject>
<imageobject>
<imagedata align="center" fileref="images/rtmp.png"/>
</imageobject>
</mediaobject>
+ </para>
<para>
The client starts the RTMP connection by sending a single byte
@@ -74,13 +74,13 @@
</para>
<para>
- The second packet is the <code>NetConnection</code> object from
+ The second packet is the <emphasis>NetConnection</emphasis> object from
the client. This ActionScript class is used by the Flash movie to
create the network connection to the server.
</para>
<para>
- The third packet is the <code>NetStream</code> object from the
+ The third packet is the <emphasis>NetStream</emphasis> object from the
client. This is the ActionScript class used to specify the file to
be streamed by the server.
</para>
@@ -89,11 +89,15 @@
The RTMP packet for our example looks like this:
<programlisting>
-
030000190000c91400000000020007connect00?f0000000000000030003app0200#software/gnash/tests/1153948634.flv0008flashVer02000cLNX
6,0,82,0
0006swfUrl02001dfile:///file|%2Ftmp%2Fout.swfc30005tcUrl\002\0004rtmp://localhost/software/gnash/tests/1153948634.flv\000\000\t\002\000\005userx
+ 030000190000c91400000000020007connect00?f0000000000000030003app0200#
+ software/gnash/tests/1153948634.flv0008flashVer02000cLNX 6,0,82,0 0006
+ swfUrl02001dfile:///file|%2Ftmp%2Fout.swfc30005tcUrl\002\0004
+ rtmp://localhost/software/gnash/tests/1153948634.flv\000\000\t
+ \002\000\005userx
</programlisting>
We'll take this apart in a bit, but you can see how all three AMF
- packets are in the same message. The message ius recieved in
+ packets are in the same message. The message is recieved in
several 128 byte blocks, with the last one being less than
that. The total size of the RTMP message is in the header, so the
reader can tell if the entire message was read or not.
@@ -102,7 +106,7 @@
<para>
The RTMP header is first, followed by the connect message as an
ascii string as the message body. The following AMF packet is the
- <code>NetConnection</code> one, that specifies this is coming from
+ <emphasis>NetConnection</emphasis> one, that specifies this is coming from
a Flash application/ This also contains the file path the server
can use to find the file to stream. This is then followed by the
version number, which I assume is the version of the Flash player,
@@ -110,7 +114,7 @@
</para>
<para>
- The third packet is the one from <code>NetStream</code>, which
+ The third packet is the one from <emphasis>NetStream</emphasis>, which
specifies the URL used for the movie, followed by the user name
for a semblance of security.
</para>
@@ -130,7 +134,7 @@
<variablelist>
<varlistentry>
- <term>0x0</term>
+ <term>00</term>
<listitem>
<para>
This specifies the header contains 12 bytes, including
@@ -139,7 +143,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>0x1</term>
+ <term>01</term>
<listitem>
<para>
This specifies the header contains 8 bytes, including this
@@ -157,7 +161,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>0x3</term>
+ <term>03</term>
<listitem>
<para>
This specifies the header contains 1 byte, so this is the
@@ -208,7 +212,7 @@
<listitem>
<para>
This specifies the content type of the RTMP message is a
- <code>ping</code> packet.
+ <emphasis>ping</emphasis> packet.
</para>
</listitem>
</varlistentry>
@@ -281,9 +285,6 @@
</para>
<para>
- </para>
-
- <para>
There are two sets of data types to consider. One set is used by
the to specify the content type of the AMF object, the other is an
ActionScript data type tag used to denote which type of object is
@@ -300,7 +301,7 @@
<para>
This specifies the data in the AMF packet is a numeric
value. All numeric values in Flash are 64 bit,
- <code>big-endian</code>.
+ <emphasis>big-endian</emphasis>.
</para>
</listitem>
</varlistentry>
@@ -320,7 +321,7 @@
<listitem>
<para>
This specifies the data in the AMF packet is an
- <code>ASCII</code> string.
+ <emphasis>ASCII</emphasis> string.
</para>
</listitem>
</varlistentry>
@@ -426,7 +427,7 @@
<para>
This specifies the data in the AMF packet is a multibyte
string. Multibyt strings are used for international
- language support to represent non <code>ASCII</code>
+ language support to represent non <emphasis>ASCII</emphasis>
fonts.
</para>
</listitem>
@@ -458,7 +459,7 @@
<para>
This specifies the data in the AMF packet is a AML
object. XML objects are then parsed by the
- <code>XML</code> ActionScript class.
+ <emphasis>XML</emphasis> ActionScript class.
</para>
</listitem>
</varlistentry>
Index: doc/C/sources.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/sources.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- doc/C/sources.xml 14 Aug 2006 23:44:07 -0000 1.12
+++ doc/C/sources.xml 17 Sep 2006 19:45:59 -0000 1.13
@@ -138,7 +138,7 @@
<ulink type="http"
url="http://www.libpng.org/pub/png/";>PNG</ulink> is a
patent free image format that is comparable to
- <code>GIF</code>.
+ <emphasis>GIF</emphasis>.
</para>
<para>
To install a binary package using apt-get (on Debian based
@@ -275,8 +275,8 @@
<ulink type="http" url="http://www.tldp.org/";>Linux
Documentation Project.</ulink>. It is customizable by using
style-sheets for each output device. Default style-sheets are
- included for a variety of print formats, like <code>PDF</code>
- and <code>HTML</code>.
+ included for a variety of print formats, like <emphasis>PDF</emphasis>
+ and <emphasis>HTML</emphasis>.
</para>
<para>
You can get Docbook from this link:
@@ -305,7 +305,7 @@
documentation into HTML and <ulink type="http"
url="http://www.gnu.org/software/texinfo/";>
Texinfo</ulink>formats. Texinfo can later be converted to
- standard GNU <code>info</code> pages.
+ standard GNU <emphasis>info</emphasis> pages.
</para>
<para>
You can get DocBook2X from this link:
@@ -332,7 +332,7 @@
FOP (Formatting Objects Processor) is the world's first print
formatter driven by XSL formatting objects (XSL-FO) and the
world's first output independent formatter. It is a
- <code>Java</code> application that reads a formatting object
+ <emphasis>Java</emphasis> application that reads a formatting object
(FO) tree and renders the resulting pages to a specified
output. Output formats currently supported include PDF, PCL,
PS, SVG, XML, Print, AWT, MIF and Text. The default output
@@ -340,10 +340,10 @@
</para>
<para>
- You can get <code>fop</code> from this link:
+ You can get <emphasis>fop</emphasis> from this link:
<ulink type="http" url="http://xmlgraphics.apache.org/fop/";>
http://xmlgraphics.apache.org/fop/</ulink>. Currently only
- <code>fop version 0.20.5</code> works with the current DocBook
+ <emphasis>fop version 0.20.5</emphasis> works with the current DocBook
tools.
</para>
</sect3>
@@ -352,10 +352,10 @@
<title>Java</title>
<para>
- The <code>fop</code> processor is a <code>Java</code>
+ The <emphasis>fop</emphasis> processor is a <emphasis>Java</emphasis>
application, so it needs a Java runtime to work. This is
installed on many platforms by default, but unfortunately
- <code>fop</code> doesn't work with the <ulink type="http"
+ <emphasis>fop</emphasis> doesn't work with the <ulink type="http"
url="http://gcc.gnu.org/java/";>GCJ</ulink> runtime. There is
apparently work being done on FOP to make it usable, but for
now, this means installing <ulink type="http"
@@ -363,21 +363,21 @@
</para>
<para>
- In addition to the default <code>j2re</code> package, you also
- need to install <code>JAI</code>, the Java Advanced Imaging
- library. You can get <code>JAI</code> from <ulink type="http"
+ In addition to the default <emphasis>j2re</emphasis> package, you also
+ need to install <emphasis>JAI</emphasis>, the Java Advanced Imaging
+ library. You can get <emphasis>JAI</emphasis> from <ulink type="http"
url="http://java.sun.com/products/java-media/jai/iio.html";>
- this link</ulink>. <code>JAI</code> is not required, and the
- <code>PDF</code> file will be generated. It will just be
+ this link</ulink>. <emphasis>JAI</emphasis> is not required, and the
+ <emphasis>PDF</emphasis> file will be generated. It will just be
missing all the graphics.
</para>
<para>
- <code>Fop</code> also requires an environment variable to be
+ <emphasis>Fop</emphasis> also requires an environment variable to be
set. This is JAVA_HOME. This needs to point to the top
- directory where your <code>Sun j2re</code> is installed. If
+ directory where your <emphasis>Sun j2re</emphasis> is installed. If
you have any other problems with your Java installation, you
- can also try adding the <code>Sun j2re</code> path to the
- <code>CLASSPATH</code> environment variable.
+ can also try adding the <emphasis>Sun j2re</emphasis> path to the
+ <emphasis>CLASSPATH</emphasis> environment variable.
</para>
</sect3>
@@ -394,13 +394,13 @@
</para>
<para>
- The <code>configure</code> script is not included in the CVS
+ The <emphasis>configure</emphasis> script is not included in the CVS
sources. It must be produced by running the
- <code>./autogen.sh</code> script in the top level source
- drirectory. This script requirs you have <code>autoconf</code>,
- <code>automake</code>, and <code>libtool</code> installed. After
+ <emphasis>./autogen.sh</emphasis> script in the top level source
+ drirectory. This script requirs you have <emphasis>autoconf</emphasis>,
+ <emphasis>automake</emphasis>, and <emphasis>libtool</emphasis>
installed. After
building this script, you can configure Gnash by running it from
- the source directory like this <code>./configure</code>, from
+ the source directory like this <emphasis>./configure</emphasis>, from
another directory by specifying the full path to configure.
</para>
@@ -430,13 +430,13 @@
<title>Specifying A Custom Path</title>
<para>
- This set of options typically use a <code>--with-[name]</code>
+ This set of options typically use a <emphasis>--with-[name]</emphasis>
naming convention. A Prefix can often be supplied, which is
the top level directory that can be used to look for the other
sub directories. Most options of this type have two
variations, one to specify a path to the header files, and
another to specify a path to the libraries. This lets you
- override the default paths <code>configure</code> finds, or
+ override the default paths <emphasis>configure</emphasis> finds, or
specify your own paths.
</para>
@@ -851,7 +851,7 @@
features of Gnash. There are defaults for all of these
options. These are typically used only by developers who don't
have all the other development packages installed, and wants
- to limit what is required for a quite build of <code>Gnash</code>.
+ to limit what is required for a quite build of
<emphasis>Gnash</emphasis>.
</para>
<variablelist>
@@ -882,7 +882,7 @@
Disable building the plugin. By default the
Mozilla Firefox plugin will be built if all the required
files are found by configure. Configure
- <code>--with-plugindir</code> to specify where the
+ <emphasis>--with-plugindir</emphasis> to specify where the
plugin should be installed.
</para>
</listitem>
@@ -971,7 +971,7 @@
<listitem>
<para>
Turn on tons of GCC compiler warnings. By default only
- <code>-Wall</code> is used with GCC.
+ <emphasis>-Wall</emphasis> is used with GCC.
</para>
</listitem>
</varlistentry>
@@ -1084,10 +1084,10 @@
To cross configure and compile Gnash, you first need to build
a target system on your workstation. This includes cross
compilers for the target architecture, and typically some
- system headers. You will also need <code>libxml2</code>,
- <code>libpng</code>, <code>libjpeg</code>, <code>sdl</code>,
- <code>sdl mixer</code>, <code>opengl</code>, and
- <code>ogg</code> development packages built for the target
+ system headers. You will also need <emphasis>libxml2</emphasis>,
+ <emphasis>libpng</emphasis>, <emphasis>libjpeg</emphasis>,
<emphasis>sdl</emphasis>,
+ <emphasis>sdl mixer</emphasis>, <emphasis>opengl</emphasis>, and
+ <emphasis>ogg</emphasis> development packages built for the target
system.
</para>
@@ -1136,12 +1136,12 @@
<para>
The host architecture. This is the architecture the
executables are supposed to run on. This is usually the
- same as <code>--target</code> except when building a
+ same as <emphasis>--target</emphasis> except when building a
compiler as a
Canadian Cross. This is when you build a cross
compiler on a Unix machine, that runs on a
- <code>win32</code> machine, producing code for yet
- a third architecture, like the <code>ARM</code>.
+ <emphasis>win32</emphasis> machine, producing code for yet
+ a third architecture, like the <emphasis>ARM</emphasis>.
</para>
</listitem>
</varlistentry>
@@ -1165,22 +1165,22 @@
<para>
After managing to configure Gnash, building the code is
- simple. Gnash is built using <code>GNU make</code>.
+ simple. Gnash is built using <emphasis>GNU make</emphasis>.
</para>
<sect3 id="compile">
<title>Compiling The Code</title>
<para>
- After configuring, typing <code>make</code> will compile the
+ After configuring, typing <emphasis>make</emphasis> will compile the
code. No options are necessary. If desired, you can redefine
- the variables used by <code>make</code> on the command line
+ the variables used by <emphasis>make</emphasis> on the command line
when invoking the program. The few flags of interest are
- <code>CFLAGS</code> and <code>CXXFLAGS</code>, often used to
+ <emphasis>CFLAGS</emphasis> and <emphasis>CXXFLAGS</emphasis>, often
used to
turn on debugging or turn off optimizing. Invoking make as in
this example would build all the code with debugging turned
on, and optimizing turned off. The default values for both of
- these variables is <code>-O2 -g</code>.
+ these variables is <emphasis>-O2 -g</emphasis>.
<programlisting>
make CFLAGS=-g CXXFLAGS=-g
@@ -1199,25 +1199,25 @@
<para>
By default, the documentation isn't built at all. It isn't
- even built when typing <code>make install</code> from the top
+ even built when typing <emphasis>make install</emphasis> from the top
level build directory. It's only built when specified with a
- specific target in the generated <code>Makefile</code> in the
- <code>doc/C/</code> sub-directory. All the docs are built in
- this directory when executing a <code>make install</code>.
+ specific target in the generated <emphasis>Makefile</emphasis> in the
+ <emphasis>doc/C/</emphasis> sub-directory. All the docs are built in
+ this directory when executing a <emphasis>make install</emphasis>.
</para>
<para>
- There is a target for each output format, <code>make
- html</code>, <code>make pdf</code>, <code>make info</code>,
- and <code>make man</code>. A higher level target, <code>make
- alldocs</code>, builds the four main formats for the
+ There is a target for each output format, <emphasis>make
+ html</emphasis>, <emphasis>make pdf</emphasis>, <emphasis>make
info</emphasis>,
+ and <emphasis>make man</emphasis>. A higher level target, <emphasis>make
+ alldocs</emphasis>, builds the four main formats for the
documentation.
</para>
<para>
Gnash also has support to use <ulink type="http"
url="http://www.stack.nl/~dimitri/doxygen/index.html";>
- Doxygen</ulink> to produce <code>HTML</code> pages documenting
+ Doxygen</ulink> to produce <emphasis>HTML</emphasis> pages documenting
the internals of Gnash. While this is not necessarily
internals documentation, it does give very useful information
about all the files, the classes, a cross reference, and other
@@ -1225,9 +1225,9 @@
</para>
<para>
You need to have Doxygen installed to produce these docs. If
- you do have it installed, typing <code>make apidoc</code> in
- the <code>doc</code> directory will make these docs under a
- sub directory of <code>apidoc/html</code>
+ you do have it installed, typing <emphasis>make apidoc</emphasis> in
+ the <emphasis>doc</emphasis> directory will make these docs under a
+ sub directory of <emphasis>apidoc/html</emphasis>
</para>
</sect3>
</sect2>
@@ -1255,7 +1255,7 @@
<para>
For GNU/Linux systems, the custom path to the libraries can be
added to the /etc/ld.so.conf file. After adding the custom
- path, then run (as root) the <code>ldconfig</code> command to
+ path, then run (as root) the <emphasis>ldconfig</emphasis> command to
update the runtime cache.
</para>
@@ -1264,41 +1264,41 @@
<para>
Several libraries get installed, as well as the three
- executables. All the libraries, <code>libbase, libgeometry,
- libgbackend, libserver, and libmozsdk</code> get installed in the
- directory pointed to by <code>$prefix</code>. This variable is
- set by the <code>--prefix</code> option at configure time, and
- if not specified, it defaults to <code>/usr/local</code>. All
- the libraries get installed in <code>$prefix/lib</code> where
+ executables. All the libraries, <emphasis>libbase, libgeometry,
+ libgbackend, libserver, and libmozsdk</emphasis> get installed in the
+ directory pointed to by <emphasis>$prefix</emphasis>. This variable is
+ set by the <emphasis>--prefix</emphasis> option at configure time, and
+ if not specified, it defaults to <emphasis>/usr/local</emphasis>. All
+ the libraries get installed in <emphasis>$prefix/lib</emphasis> where
most packages also install their libraries.
</para>
<para>
The plugin gets installed in the plugins directory of the
- version of the<code>Firefox</code> or <code>Mozilla</code> you
+ version of the<emphasis>Firefox</emphasis> or
<emphasis>Mozilla</emphasis> you
have the development packaged installed for. For builds from
Mozilla CVS, the default installation directory is
- <code>/usr/local/lib/firefox-[version
- number]/plugins/</code>. The default system directory used
+ <emphasis>/usr/local/lib/firefox-[version
+ number]/plugins/</emphasis>. The default system directory used
when installing packages is
- <code>/usr/lib/mozilla/plugins</code>. Note that you have to be
- <code>root</code> to install files in a system directory. For
+ <emphasis>/usr/lib/mozilla/plugins</emphasis>. Note that you have to be
+ <emphasis>root</emphasis> to install files in a system directory. For
some reason when the plugin is installed in the users
- <code>$HOME/.mozilla/plugins</code> or
- <code>$HOME/.firefox/plugins</code> directory, unresolved
+ <emphasis>$HOME/.mozilla/plugins</emphasis> or
+ <emphasis>$HOME/.firefox/plugins</emphasis> directory, unresolved
symbols from deep within Firefox appear.
</para>
<para>
- The executables get installed in a <code>bin</code> directory of
- the directory specified by <code>$prefix</code>. Once again,
- this path defaults to <code>/usr/local/bin</code> if a special
+ The executables get installed in a <emphasis>bin</emphasis> directory of
+ the directory specified by <emphasis>$prefix</emphasis>. Once again,
+ this path defaults to <emphasis>/usr/local/bin</emphasis> if a special
prefix wasn't configured in.
</para>
<para>
- If using a single file-system <code>NFS</code>mounted to
+ If using a single file-system <emphasis>NFS</emphasis>mounted to
multiple platforms, you can specify an additional options,
- <code>--exec-prefix</code>. This is where all the platform
+ <emphasis>--exec-prefix</emphasis>. This is where all the platform
dependent executables and libraries can get installed.
</para>
</sect3>
@@ -1308,16 +1308,16 @@
<para>
The documentation only installs when GNOME Help support is
- enabled by using <code>--enable-ghelp</code>. Because GNOME
+ enabled by using <emphasis>--enable-ghelp</emphasis>. Because GNOME
help files get installed in a system directory when building
from source, you need to either change the permissions on the
- destination directory, or do the install as <code>root</code>.
+ destination directory, or do the install as <emphasis>root</emphasis>.
The default directory for GNOME Help files is:
- <code>/usr/local/share/gnash/doc/gnash/C/</code>.
+ <emphasis>/usr/local/share/gnash/doc/gnash/C/</emphasis>.
</para>
<para>
A config file in the Gnash source tree,
- <code>doc/C/gnash.omf</code> is used to specify under which
+ <emphasis>doc/C/gnash.omf</emphasis> is used to specify under which
menu item Gnash is listed in the GNOME Help system.
</para>
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libamf/Makefile.am 13 Aug 2006 15:54:16 -0000 1.11
+++ libamf/Makefile.am 17 Sep 2006 19:45:59 -0000 1.12
@@ -42,6 +42,7 @@
AM_CPPFLAGS =
AM_LDFLAGS = \
../libbase/libgnashbase.la \
+ ../server/libgnashserver.la \
$(OPENGL_LIBS) \
$(SDL_LIBS) \
$(SDL_MIXER_LIBS) \
@@ -67,7 +68,7 @@
noinst_HEADERS = amfutf8.h amf.h rtmp.h protocol.h
-check_PROGRAMS = amftest
+EXTRA_PROGRAMS = amftest
amftest_SOURCES = amftest.cpp
amftest_LDADD = $(AM_LDFLAGS) libgnashamf.la
Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libamf/amf.cpp 30 Aug 2006 09:32:19 -0000 1.16
+++ libamf/amf.cpp 17 Sep 2006 19:45:59 -0000 1.17
@@ -712,11 +712,11 @@
}
int
-AMF::parseHeader(char *in)
+AMF::parseHeader(unsigned char *in)
{
GNASH_REPORT_FUNCTION;
- char *tmpptr = in;
+ unsigned char *tmpptr = in;
unsigned char hexint[32];
hexify((unsigned char *)hexint, (unsigned char *)tmpptr, 1, false);
@@ -746,6 +746,9 @@
_total_size = _total_size & 0x0000ff;
dbglogfile << "The body size is: " << _total_size
<< " Hex value is: 0x" << hexint << endl;
+ _amf_data = new unsigned char(_total_size+1);
+ _seekptr = _amf_data;
+// memset(_amf_data, 0, _total_size+1);
}
if (_header_size >= 8) {
@@ -787,29 +790,48 @@
return _packet_size;
}
+unsigned char *
+AMF::addPacketData(unsigned char *data, int bytes)
+{
+ GNASH_REPORT_FUNCTION;
+ memcpy(_seekptr, data, bytes);
+ _seekptr+=bytes;
+ return _seekptr;
+}
+
+int
+AMF::parseBody()
+{
+ GNASH_REPORT_FUNCTION;
+
+ parseBody(_amf_data, _total_size);
+}
+
int
-AMF::parseBody(char *in, int bytes)
+AMF::parseBody(unsigned char *in, int bytes)
{
GNASH_REPORT_FUNCTION;
+ unsigned char *tmpptr;
// unsigned char hexint[(bytes*2)+1];
unsigned char* hexint;
- char buffer[AMF_VIDEO_PACKET_SIZE];
- //char *name;
+ char buffer[AMF_VIDEO_PACKET_SIZE+1];
+// char *name;
short length;
- int data_bytes = bytes;
amf_element_t el;
+ if (bytes == 0) {
+ return 0;
+ }
+
if (in == 0) {
dbglogfile << "ERROR: input data is NULL!" << endl;
return -1;
}
- hexint = (unsigned char*) malloc((bytes * 2) + 1);
-
- memset(buffer, 0, AMF_VIDEO_PACKET_SIZE);
+ hexint = (unsigned char*) malloc((bytes * 2) + 12);
// memcpy(_amf_data +_read_size, in, AMF_VIDEO_PACKET_SIZE);
// _read_size += bytes;
@@ -819,16 +841,7 @@
#endif
// tmpptr = in;
- char *tmpptr = in;
-
-// if (!_amf_data) {
-// dbglogfile << "new amf_data block, size is: " << _total_size <<
endl;
-// _amf_data = new unsigned char(_total_size+1);
-// _seekptr = _amf_data;
-// memset(_amf_data, 0, _total_size);
-// }
-// memcpy(_seekptr, tmpptr, bytes);
-// _seekptr += bytes;
+ tmpptr = in;
// All elements look like this:
// the first two bytes is the length of name of the element
@@ -836,29 +849,38 @@
// After the element name there is a type byte. If it's a Number type, then 8
bytes are read
// If it's a String type, then there is a count of characters, then the string
value
- while (data_bytes) {
-
+ while (tmpptr != (in + bytes)) {
+ memset(buffer, 0, AMF_VIDEO_PACKET_SIZE+1);
// Check the type of the element data
char type = *(astype_e *)tmpptr;
tmpptr++; // skip the header byte
- data_bytes--;
switch ((astype_e)type) {
case Number:
// memcpy(buffer, tmpptr, 8);
tmpptr += 8;
- data_bytes -= 8;
continue;
break;
case Boolean:
case String:
dbglogfile << "AMF type: " << astype_str[(int)type] << ": a work
in progress!" << endl;
+ // get the length of the name
+ length = ntohs(*(short *)tmpptr);
+ tmpptr += 2;
+ dbglogfile << "AMF String length is: " << length << endl;
+ // get the name of the element
+ if (length) {
+ memcpy(buffer, tmpptr, length);
+ }
+ tmpptr += length;
+ dbglogfile << "AMF String is: " << buffer << endl;
+ el.name = buffer;
break;
case Object:
dbglogfile << "AMF type: " << astype_str[(int)type] << ": a work
in progress!" << endl;
do {
tmpptr = extractVariables(el, tmpptr);
- } while (el.length > 0);
+ } while (el.type != ObjectEnd);
break;
case MovieClip:
case Null:
@@ -876,29 +898,8 @@
default:
// dbglogfile << astype_str[(int)type] << ": unimplemented!" << endl;
dbglogfile << (int)type << ": unimplemented!" << endl;
- break;
- }
-
- // get the length of the name
- length = ntohs(*(short *)tmpptr);
-#if 0
- hexify((unsigned char *)hexint, (unsigned char *)tmpptr, length+2,
true);
- dbglogfile << "The element is: 0x" << hexint << endl;
-#endif
- tmpptr += 2;
- dbglogfile << "AMF element length is: " << length << endl;
- // get the name of the element
- if (length) {
- memcpy(buffer, tmpptr, length);
+ return -1;
}
- tmpptr += length;
-
- dbglogfile << "AMF element name is: " << buffer << endl;
-
- el.name = buffer;
- data_bytes -= length - 2;
-
-//}
}
free(hexint);
@@ -906,13 +907,13 @@
return -1;
}
-char *
-AMF::extractVariables(amf_element_t &el, const char *in)
+unsigned char *
+AMF::extractVariables(amf_element_t &el, unsigned char *in)
{
GNASH_REPORT_FUNCTION;
- char buffer[AMF_VIDEO_PACKET_SIZE];
- const char *tmpptr = in;
+ unsigned char buffer[AMF_VIDEO_PACKET_SIZE+1];
+ unsigned char *tmpptr = in;
short length = 0;
el.length = 0;
@@ -921,7 +922,7 @@
el.data = 0;
}
- memset(buffer, 0, AMF_VIDEO_PACKET_SIZE);
+ memset(buffer, 0, AMF_VIDEO_PACKET_SIZE+1);
// @@ casting generic pointers to bigger types may be dangerous
// due to memory alignment constraints
length = ntohs(*(const short *)tmpptr);
@@ -929,10 +930,15 @@
if (length == 0) {
if (*(tmpptr+2) == ObjectEnd) {
dbglogfile << "End of Object definition." << endl;
+ el.length = 0;
+ el.type = ObjectEnd;
+ tmpptr+=3;
+ return tmpptr;
}
}
-#if 0
+#if 1
+ unsigned char hexint[25];
hexify((unsigned char *)hexint, (unsigned char *)tmpptr, length+2, true);
dbglogfile << "The element is: 0x" << hexint << endl;
#endif
@@ -941,7 +947,7 @@
// get the name of the element
if (length) {
memcpy(buffer, tmpptr, length);
- el.name = buffer;
+ el.name = reinterpret_cast<char *>(buffer);
tmpptr += length;
} else {
// when reading in an object definition, a byte of 0x9 after
@@ -955,7 +961,7 @@
el.data = 0;
// @@ we're dropping constness of input here..
// it might be a problem, but strchr does it as well...
- return const_cast<char*>(tmpptr);
+ return tmpptr;
}
}
@@ -1001,7 +1007,7 @@
break;
}
- return const_cast<char*>(tmpptr); // we're dropping const specification
+ return tmpptr; // we're dropping const specification
}
} // end of amf namespace
Index: libamf/amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libamf/amf.h 30 Aug 2006 09:32:19 -0000 1.7
+++ libamf/amf.h 17 Sep 2006 19:45:59 -0000 1.8
@@ -217,14 +217,19 @@
std::string extractString(const char *in); // FIXME:
int extractNumber(const char *in); // FIXME:
- char *extractVariables(amf_element_t &el, const char *in);
+ unsigned char *extractVariables(amf_element_t &el, unsigned char *in);
bool parseAMF(char *in);
static int headerSize(char header);
int packetReadAMF(int bytes);
- int parseHeader(char *in);
- int parseBody(char *in, int bytes);
+ int parseHeader(unsigned char *in);
+ int parseBody();
+ int parseBody(unsigned char *in, int bytes);
+
+ int getHeaderSize() { return _header_size; };
+ int getTotalSize() { return _total_size; };
+ unsigned char *addPacketData(unsigned char *data, int bytes);
// std::map<amf_element_t *, std::vector<unsigned char *> >
*getElements() { return &_elements; };
private:
content_types_e _type;
Index: libamf/rtmp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/rtmp.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libamf/rtmp.cpp 26 Aug 2006 13:09:52 -0000 1.7
+++ libamf/rtmp.cpp 17 Sep 2006 19:45:59 -0000 1.8
@@ -148,7 +148,7 @@
return true;
}
-// The response is the giobberish sent back twice, followed by a byte
+// The response is the giobberish sent back twice, preceeded by a byte
// with the value of 0x3.
bool
RTMPproto::handShakeResponse()
@@ -246,20 +246,23 @@
GNASH_REPORT_FUNCTION;
int ret;
- char buffer[AMF_VIDEO_PACKET_SIZE+1];
+ unsigned char buffer[AMF_VIDEO_PACKET_SIZE+1];
memset(buffer, 0, AMF_VIDEO_PACKET_SIZE+1);
//unsigned char hexint[1024];
int packetsize = 0;
- char *tmpptr;
+ unsigned char *tmpptr;
//char *amfdata;
unsigned int amf_index, headersize;
AMF *amf=NULL;
+#if 1
+ unsigned char hexint[512];
+#endif
tmpptr = buffer;
//
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(buffer, 1)) > 0) {
+ if ((ret = readNet(reinterpret_cast<char *>(buffer), 1)) > 0) {
dbglogfile << "Read first RTMP header byte"<< endl;
} else {
dbglogfile << "ERROR: Couldn't read first RTMP header byte!" << endl;
@@ -272,7 +275,7 @@
dbglogfile << "The AMF index is: 0x" << amf_index << endl;
if (headersize > 1) {
- if ((ret = readNet(tmpptr, headersize-1)) > 0) {
+ if ((ret = readNet(reinterpret_cast<char *>(tmpptr), headersize-1)) >
0) {
dbglogfile << "Read first RTMP packet header of " << ret
<< " headersize." << endl;
} else {
@@ -285,13 +288,22 @@
}
packetsize = amf->parseHeader(buffer);
-
tmpptr += headersize;
+ tmpptr = buffer;
- while ((ret = readNet(buffer, packetsize)) > 0) {
- amf->parseBody(buffer, ret);
+ while ((ret = readNet(reinterpret_cast<char *>(buffer), packetsize)) > 0) {
dbglogfile << "Reading AMF packets till we're done..." << endl;
+ amf->addPacketData(tmpptr, ret);
+ tmpptr = buffer + 1;
+#if 0
+ hexify(hexint, buffer, packetsize, true);
+ dbglogfile << "The packet data is: 0x" << (char *)hexint << endl;
+ hexify(hexint, buffer, packetsize, false);
+ dbglogfile << "The packet data is: 0x" << (char *)hexint << endl;
+#endif
}
+ dbglogfile << "Done reading packet" << endl;
+ amf->parseBody();
return true;
}
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- libbase/Makefile.am 30 Aug 2006 11:01:44 -0000 1.37
+++ libbase/Makefile.am 17 Sep 2006 19:45:59 -0000 1.38
@@ -41,7 +41,7 @@
INCLUDES = -I.. -I$(srcdir) \
-I$(top_srcdir) \
- -I$(top_srcdir)/server\
+ -I$(top_srcdir)/server \
$(PTHREAD_CFLAGS) \
$(OPENGL_CFLAGS) \
$(LIBXML_CFLAGS) \
Index: libbase/container.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/container.cpp 14 Sep 2006 05:02:11 -0000 1.11
+++ libbase/container.cpp 17 Sep 2006 19:45:59 -0000 1.12
@@ -17,12 +17,6 @@
#include "utf8.h"
#include "tu_random.h"
-#ifdef HAVE_STRCASECMP
-# define STRCASECMP strcasecmp
-#else
-# define STRCASECMP _stricmp
-#endif
-
void tu_string::append_wide_char(uint16 c)
{
char buf[8];
Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- libbase/container.h 14 Sep 2006 23:54:22 -0000 1.36
+++ libbase/container.h 17 Sep 2006 19:45:59 -0000 1.37
@@ -83,7 +83,6 @@
#include <vector>
-
template<class T>
class fixed_size_hash
// Computes a hash of an object's representation.
@@ -124,6 +123,9 @@
// Markus: As well as with other compilers...
#ifdef WIN32_HASH_MAP
+#define STRCASECMP _stricmp
+
+
template<class T, class U, class hash_functor = fixed_size_hash<T> >
class DSOEXPORT hash {
// Hash table, linear probing, internal chaining. One
@@ -625,6 +627,9 @@
}; // WIN32 hash end
#else
+#define STRCASECMP strcasecmp
+
+#include <ext/hash_map>
template<class T, class U, class hash_functor = fixed_size_hash<T> >
class DSOEXPORT hash : public __gnu_cxx::hash_map<T, U, hash_functor >
{
Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libbase/log.cpp 16 Sep 2006 19:36:05 -0000 1.24
+++ libbase/log.cpp 17 Sep 2006 19:45:59 -0000 1.25
@@ -61,7 +61,6 @@
#endif
#include "log.h"
-//#include "gnash.h"
#include <ctime>
Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/network.cpp 16 Sep 2006 19:36:05 -0000 1.11
+++ libbase/network.cpp 17 Sep 2006 19:45:59 -0000 1.12
@@ -42,9 +42,7 @@
#include "utility.h"
#include "log.h"
-//#include "xml.h"
#include "network.h"
-#include "fn_call.h"
#include <sys/types.h>
#include <cstring>
@@ -197,8 +195,9 @@
while (retries < 5) {
if (bind(_listenfd, reinterpret_cast<struct sockaddr *>(&sock_in),
sizeof(sock_in)) == -1) {
- log_msg("WARNING: unable to bind to %s port! %s\n",
- inet_ntoa(sock_in.sin_addr), strerror(errno));
+ log_msg("WARNING: unable to bind to port %hd! %s\n",
+ port, strerror(errno));
+// inet_ntoa(sock_in.sin_addr), strerror(errno));
retries++;
}
@@ -213,7 +212,7 @@
_listenfd);
if (type == SOCK_STREAM && listen(_listenfd, 5) < 0) {
- log_msg("ERROR: unable to listen on port: %d: %s ",
+ log_msg("ERROR: unable to listen on port: %hd: %s ",
port, strerror(errno));
return false;
}
Index: libbase/network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/network.h 16 Sep 2006 19:36:05 -0000 1.7
+++ libbase/network.h 17 Sep 2006 19:45:59 -0000 1.8
@@ -57,7 +57,6 @@
# include <io.h>
#endif
-//#include "xml.h"
#ifdef ENABLE_TESTING
#include "impl.h"
#endif
Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/opengl.m4 14 Aug 2006 16:49:39 -0000 1.20
+++ macros/opengl.m4 17 Sep 2006 19:45:59 -0000 1.21
@@ -61,7 +61,7 @@
AC_CHECK_HEADERS(GL/gl.h, [ac_cv_path_opengl_includes=""],[
if test x"${ac_cv_path_opengl_includes}" = x; then
AC_MSG_CHECKING([for OpenGL headers])
- incllist="${prefix}/include /usr/include /usr/local/include
/opt/include /usr/X11R6/include /usr/pkg/include .. ../.."
+ incllist="${prefix}/include /usr/include /usr/local/include
/opt/mesa/include /opt/include /usr/X11R6/include /usr/pkg/include .. ../.."
for i in $incllist; do
if test -f $i/GL/gl.h; then
@@ -112,7 +112,7 @@
if test x"${ac_cv_path_opengl_lib}" = x; then
AC_CHECK_LIB(GL, glBegin, [ac_cv_path_opengl_lib="-lGL -lGLU"],[
AC_MSG_CHECKING([for OpenGL library])
- libslist="/usr/i586-mingw32msvc/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib /usr/lib64 /usr/lib /usr/local/lib /opt/lib /usr/pkg/lib
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib64 .. ../.."
+ libslist="/usr/i586-mingw32msvc/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib /usr/lib64 /usr/lib /usr/local/lib /opt/lib /usr/pkg/lib
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib64 /opt/mesa/lib64 /opt/mesa/lib .. ../.."
for i in $libslist; do
if test -f $i/libGL.a -o -f $i/libGL.so; then
if test x"$i" != x"/usr/lib"; then
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- plugin/Makefile.am 8 Sep 2006 11:14:47 -0000 1.40
+++ plugin/Makefile.am 17 Sep 2006 19:45:59 -0000 1.41
@@ -36,7 +36,7 @@
#
#
-AUTOMAKE_OPTIONS = dejagnu
+AUTOMAKE_OPTIONS =
if KLASH
KLASH = klash
@@ -158,9 +158,9 @@
# cp .libs/libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so
$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG)
$(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
if PLUGIN_LINK_UNDEFINED
- cp $(DESTDIR)$(plugindir)/libgnashplugin.so.0.*
$(DESTDIR)$(plugindir)/libgnashplugin.so
+ cp $(DESTDIR)$(plugindir)/.libs/libgnashplugin.so.0.*
$(DESTDIR)$(plugindir)/libgnashplugin.so
endif
- $(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a
$(DESTDIR)$(plugindir)/libgnashplugin.so.0
+ $(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a
$(DESTDIR)$(plugindir)/libgnashplugin.so.0
$(DESTDIR)$(plugindir)/libgnashplugin.*.T
# install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
# if test -d $(HOME)/.firefox ; then \
Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/asobj/NetConnection.h 26 Aug 2006 13:09:53 -0000 1.5
+++ server/asobj/NetConnection.h 17 Sep 2006 19:45:59 -0000 1.6
@@ -55,6 +55,11 @@
NetConnection();
~NetConnection();
bool connect(const char *arg);
+ private:
+ std::string _app;
+ std::string _flashVer;
+ std::string _swfUrl;
+ std::string _tcUrl;
};
class netconnection_as_object : public as_object
Index: server/asobj/System.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/System.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/System.cpp 22 Jul 2006 23:47:56 -0000 1.1
+++ server/asobj/System.cpp 17 Sep 2006 19:45:59 -0000 1.2
@@ -57,31 +57,31 @@
void
System::security_allowDomain()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
System::security_allowInsecureDomain()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
System::security_loadPolicyFile()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
System::setClipboard()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
System::showSettings()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
static as_object*
@@ -149,23 +149,23 @@
}
void system_security_allowdomain(const fn_call& /*fn*/) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void system_security_allowinsecuredomain(const fn_call& /*fn*/) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void system_security_loadpolicyfile(const fn_call& /*fn*/) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void system_setclipboard(const fn_call& /*fn*/) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void system_showsettings(const fn_call& /*fn*/) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
static void
Index: server/asobj/Video.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Video.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/Video.cpp 22 Jul 2006 23:47:56 -0000 1.1
+++ server/asobj/Video.cpp 17 Sep 2006 19:45:59 -0000 1.2
@@ -46,23 +46,27 @@
namespace gnash {
-Video::Video() {
+Video::Video()
+{
+ GNASH_REPORT_FUNCTION;
}
-Video::~Video() {
+Video::~Video()
+{
+ GNASH_REPORT_FUNCTION;
}
void
Video::attach()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
Video::clear()
{
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void
video_new(const fn_call& fn)
@@ -75,10 +79,10 @@
fn.result->set_as_object(video_obj);
}
void video_attach(const fn_call& /*fn*/) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
void video_clear(const fn_call& /*fn*/) {
- log_msg("%s:unimplemented \n", __FUNCTION__);
+ log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
} // end of gnaash namespace
Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/Makefile.am 13 May 2006 22:34:14 -0000 1.4
+++ testsuite/Makefile.am 17 Sep 2006 19:45:59 -0000 1.5
@@ -1,6 +1,5 @@
-AUTOMAKE_OPTIONS = dejagnu
+AUTOMAKE_OPTIONS =
-# We don't need --tool anymore
-RUNTESTDEFAULTFLAGS = --srcdir $$srcdir
+RUNTESTDEFAULTFLAGS =
-SUBDIRS = actionscript.all misc-ming.all libbase # movies.all
+SUBDIRS = actionscript.all # misc-ming.all # movies.all
Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- testsuite/actionscript.all/Makefile.am 4 Aug 2006 15:20:23 -0000
1.28
+++ testsuite/actionscript.all/Makefile.am 17 Sep 2006 19:45:59 -0000
1.29
@@ -40,7 +40,7 @@
AUTOMAKE_OPTIONS = dejagnu
# We don't need --tool anymore
-RUNTESTDEFAULTFLAGS = --srcdir $$srcdir
+RUNTESTDEFAULTFLAGS = swf_exists.exp
noinst_SCRIPTS = gen-test.sh
INCLUDES = -I.. \
@@ -62,6 +62,7 @@
##
GENERATED = \
array.swf \
+ rtmp.swf \
delete.swf \
Boolean.swf \
Camera.swf \
Index: testsuite/actionscript.all/swf_exists.exp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/swf_exists.exp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/actionscript.all/swf_exists.exp 10 Jul 2006 16:20:15 -0000
1.2
+++ testsuite/actionscript.all/swf_exists.exp 17 Sep 2006 19:45:59 -0000
1.3
@@ -12,12 +12,11 @@
set timeout 100
set file all
set timetol 0
-set executable "../utilities/gprocessor"
-#set params "-1 -v -r 0 "
+set executable "../../utilities/gprocessor"
set params "-v "
-foreach file [glob ${srcdir}/actionscript.all/*.as] {
- exec makeswf ${file} -o ${file}.swf
+foreach file [glob ${srcdir}/*.as] {
+ exec makeswf ${file}
# ready for Ming-0.4 naming of .pp file
exec rm -f ${file}.pp ${file}.swf.frame0.pp
if [info exists file] {
@@ -27,8 +26,8 @@
return -1
}
- verbose "The executable is $executable $params ${file}.swf" 2
- if ![file exists ${executable}] {
+# verbose "The executable is $executable $params ${file}.swf" 2
+ if ![file exists out.swf] {
perror "The executable, \"$executable\" is missing" 0
return "No source file found"
}
@@ -36,7 +35,7 @@
# spawn the executable and look for the DejaGnu output messages from the
# test case.
# spawn -noecho -open [open "|./${executable}" "r"]
- spawn ${executable} -1 -r 0 -v ${file}.swf
+ spawn ${executable} ${params} out.swf
expect {
-re "\[0-9\]\[0-9\]:..:..:${text}\r\n" {
regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output
Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-ming.all/Makefile.am 13 Jun 2006 10:06:03 -0000 1.9
+++ testsuite/misc-ming.all/Makefile.am 17 Sep 2006 19:45:59 -0000 1.10
@@ -37,10 +37,10 @@
#
-AUTOMAKE_OPTIONS = dejagnu
+AUTOMAKE_OPTIONS = # dejagnu
# We don't need --tool anymore
-RUNTESTDEFAULTFLAGS = --srcdir $$srcdir
+RUNTESTDEFAULTFLAGS =
if ENABLE_MING
@@ -102,6 +102,6 @@
./RemoveObject2Test
clean:
- rm *.swf media
+ -rm *.swf media
endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am configure.ac backen...,
Rob Savoye <=