[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libmedia/sound_handler.h server...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog libmedia/sound_handler.h server... |
|
Date: |
Mon, 09 Jun 2008 10:18:31 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/06/09 10:18:29
Modified files:
. : ChangeLog
libmedia : sound_handler.h
server : BevelFilter.cpp BevelFilter.h BitmapFilter.h
BlurFilter.cpp BlurFilter.h
ColorMatrixFilter.cpp ColorMatrixFilter.h
ConvolutionFilter.cpp ConvolutionFilter.h
DropShadowFilter.cpp DropShadowFilter.h
GlowFilter.cpp GlowFilter.h
GradientBevelFilter.cpp GradientBevelFilter.h
GradientGlowFilter.cpp GradientGlowFilter.h
cxform.cpp cxform.h fill_style.cpp fill_style.h
font.cpp font.h impl.h matrix.cpp matrix.h
rect.cpp rect.h stream.cpp stream.h styles.cpp
styles.h text.cpp text.h types.cpp types.h
server/parser : abc_block.cpp abc_block.h action_buffer.cpp
action_buffer.h button_character_def.cpp
button_character_def.h
edit_text_character_def.cpp
edit_text_character_def.h filter_factory.cpp
filter_factory.h morph2_character_def.cpp
morph2_character_def.h movie_def_impl.cpp
movie_def_impl.h shape_character_def.cpp
shape_character_def.h sound_definition.h
sprite_definition.cpp sprite_definition.h
text_character_def.cpp text_character_def.h
video_stream_def.cpp video_stream_def.h
server/swf : DefineFontAlignZonesTag.cpp
DefineFontAlignZonesTag.h DoActionTag.h
DoInitActionTag.h PlaceObject2Tag.cpp
PlaceObject2Tag.h RemoveObjectTag.cpp
RemoveObjectTag.h ScriptLimitsTag.h
SetBackgroundColorTag.h StartSoundTag.cpp
StartSoundTag.h StreamSoundBlockTag.cpp
StreamSoundBlockTag.h TagLoadersTable.h
tag_loaders.cpp tag_loaders.h
Log message:
Rename gnash::stream to gnash::SWFStream
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6859&r2=1.6860
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sound_handler.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapFilter.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ColorMatrixFilter.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ColorMatrixFilter.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.h?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.h?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/rect.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/rect.h?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.h?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.h?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.h?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sound_definition.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DefineFontAlignZonesTag.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DefineFontAlignZonesTag.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DoActionTag.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DoInitActionTag.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/RemoveObjectTag.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/RemoveObjectTag.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ScriptLimitsTag.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/SetBackgroundColorTag.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StartSoundTag.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StartSoundTag.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StreamSoundBlockTag.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StreamSoundBlockTag.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/TagLoadersTable.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.206&r2=1.207
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.h?cvsroot=gnash&r1=1.27&r2=1.28
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6859
retrieving revision 1.6860
diff -u -b -r1.6859 -r1.6860
--- ChangeLog 9 Jun 2008 08:43:55 -0000 1.6859
+++ ChangeLog 9 Jun 2008 10:18:18 -0000 1.6860
@@ -1,5 +1,9 @@
2008-06-09 Sandro Santilli <address@hidden>
+ * lots of files: renames gnash::stream to gnash::SWFStream.
+
+2008-06-09 Sandro Santilli <address@hidden>
+
* libbase/: Makefile.am, tu_file_SDL.cpp: drop unused file.
2008-06-09 Sandro Santilli <address@hidden>
Index: libmedia/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sound_handler.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libmedia/sound_handler.h 26 May 2008 10:19:13 -0000 1.18
+++ libmedia/sound_handler.h 9 Jun 2008 10:18:19 -0000 1.19
@@ -37,7 +37,6 @@
#include <cstring>
namespace gnash {
- class stream;
// class SoundInfo;
}
Index: server/BevelFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/BevelFilter.cpp 5 Mar 2008 03:55:57 -0000 1.5
+++ server/BevelFilter.cpp 9 Jun 2008 10:18:19 -0000 1.6
@@ -21,7 +21,7 @@
namespace gnash {
// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool BevelFilter::read(stream* in);
+//bool BevelFilter::read(SWFStream* in);
} // Namespace gnash
Index: server/BevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/BevelFilter.h 27 Mar 2008 10:50:13 -0000 1.11
+++ server/BevelFilter.h 9 Jun 2008 10:18:19 -0000 1.12
@@ -36,8 +36,8 @@
FULL_BEVEL = 3
} bevel_type;
- // Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& in);
+ // Fill from a SWFStream. See parser/filter_factory.cpp for the
implementations.
+ virtual bool read(SWFStream& in);
virtual ~BevelFilter() { return; }
Index: server/BitmapFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapFilter.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/BitmapFilter.h 27 Mar 2008 10:50:13 -0000 1.7
+++ server/BitmapFilter.h 9 Jun 2008 10:18:19 -0000 1.8
@@ -23,7 +23,7 @@
namespace gnash {
-class stream;
+class SWFStream;
class BitmapFilter;
typedef boost::shared_ptr<BitmapFilter> Filter;
@@ -32,7 +32,7 @@
{
public:
// Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& /*in*/) { return true; }
+ virtual bool read(SWFStream& /*in*/) { return true; }
BitmapFilter() { return; }
virtual ~BitmapFilter() { return; }
Index: server/BlurFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BlurFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/BlurFilter.cpp 5 Mar 2008 03:55:57 -0000 1.5
+++ server/BlurFilter.cpp 9 Jun 2008 10:18:19 -0000 1.6
@@ -21,7 +21,7 @@
namespace gnash {
// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool BlurFilter::read(stream* in);
+//bool BlurFilter::read(SWFStream* in);
} // Namespace gnash
Index: server/BlurFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BlurFilter.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/BlurFilter.h 27 Mar 2008 10:50:13 -0000 1.9
+++ server/BlurFilter.h 9 Jun 2008 10:18:20 -0000 1.10
@@ -29,8 +29,8 @@
class BlurFilter : public BitmapFilter
{
public:
- // Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& in);
+ // Fill from a SWFStream. See parser/filter_factory.cpp for the
implementations.
+ virtual bool read(SWFStream& in);
virtual ~BlurFilter() { return; }
Index: server/ColorMatrixFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ColorMatrixFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/ColorMatrixFilter.cpp 5 Mar 2008 03:55:57 -0000 1.5
+++ server/ColorMatrixFilter.cpp 9 Jun 2008 10:18:20 -0000 1.6
@@ -21,7 +21,7 @@
namespace gnash {
// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool ConvolutionFilter::read(stream* in);
+//bool ConvolutionFilter::read(SWFStream* in);
} // Namespace gnash
Index: server/ColorMatrixFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/ColorMatrixFilter.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/ColorMatrixFilter.h 27 Mar 2008 10:50:13 -0000 1.7
+++ server/ColorMatrixFilter.h 9 Jun 2008 10:18:20 -0000 1.8
@@ -28,8 +28,8 @@
class ColorMatrixFilter : public BitmapFilter
{
public:
- // Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& in);
+ // Fill from a SWFStream. See parser/filter_factory.cpp for the
implementations.
+ virtual bool read(SWFStream& in);
virtual ~ColorMatrixFilter() { return; }
Index: server/ConvolutionFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ConvolutionFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/ConvolutionFilter.cpp 5 Mar 2008 03:55:57 -0000 1.5
+++ server/ConvolutionFilter.cpp 9 Jun 2008 10:18:20 -0000 1.6
@@ -21,7 +21,7 @@
namespace gnash {
// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool ConvolutionFilter::read(stream* in);
+//bool ConvolutionFilter::read(SWFStream* in);
} // Namespace gnash
Index: server/ConvolutionFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/ConvolutionFilter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/ConvolutionFilter.h 27 Mar 2008 10:50:13 -0000 1.10
+++ server/ConvolutionFilter.h 9 Jun 2008 10:18:20 -0000 1.11
@@ -30,8 +30,8 @@
class ConvolutionFilter : public BitmapFilter
{
public:
- // Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& in);
+ // Fill from a SWFStream. See parser/filter_factory.cpp for the
implementations.
+ virtual bool read(SWFStream& in);
virtual ~ConvolutionFilter() { return; }
Index: server/DropShadowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DropShadowFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/DropShadowFilter.cpp 5 Mar 2008 03:55:58 -0000 1.5
+++ server/DropShadowFilter.cpp 9 Jun 2008 10:18:20 -0000 1.6
@@ -21,7 +21,7 @@
namespace gnash {
// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool DropShadowFilter::read(stream* in);
+//bool DropShadowFilter::read(SWFStream* in);
} // Namespace gnash
Index: server/DropShadowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/DropShadowFilter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/DropShadowFilter.h 27 Mar 2008 10:50:13 -0000 1.10
+++ server/DropShadowFilter.h 9 Jun 2008 10:18:20 -0000 1.11
@@ -29,8 +29,8 @@
class DropShadowFilter : public BitmapFilter
{
public:
- // Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& in);
+ // Fill from a SWFStream. See parser/filter_factory.cpp for the
implementations.
+ virtual bool read(SWFStream& in);
virtual ~DropShadowFilter() { return; }
Index: server/GlowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GlowFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/GlowFilter.cpp 5 Mar 2008 03:55:58 -0000 1.5
+++ server/GlowFilter.cpp 9 Jun 2008 10:18:20 -0000 1.6
@@ -21,7 +21,7 @@
namespace gnash {
// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool DropShadowFilter::read(stream* in);
+//bool DropShadowFilter::read(SWFStream* in);
} // Namespace gnash
Index: server/GlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GlowFilter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/GlowFilter.h 27 Mar 2008 10:50:13 -0000 1.10
+++ server/GlowFilter.h 9 Jun 2008 10:18:20 -0000 1.11
@@ -29,8 +29,8 @@
class GlowFilter : public BitmapFilter
{
public:
- // Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& in);
+ // Fill from a SWFStream. See parser/filter_factory.cpp for the
implementations.
+ virtual bool read(SWFStream& in);
virtual ~GlowFilter() { return; }
Index: server/GradientBevelFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GradientBevelFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/GradientBevelFilter.cpp 5 Mar 2008 03:55:58 -0000 1.5
+++ server/GradientBevelFilter.cpp 9 Jun 2008 10:18:20 -0000 1.6
@@ -21,7 +21,7 @@
namespace gnash {
// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool GradientBevelFilter::read(stream* in);
+//bool GradientBevelFilter::read(SWFStream* in);
} // Namespace gnash
Index: server/GradientBevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientBevelFilter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/GradientBevelFilter.h 27 Mar 2008 10:50:13 -0000 1.10
+++ server/GradientBevelFilter.h 9 Jun 2008 10:18:21 -0000 1.11
@@ -37,8 +37,8 @@
FULL_BEVEL = 3
} glow_types;
- // Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& in);
+ // Fill from a SWFStream. See parser/filter_factory.cpp for the
implementations.
+ virtual bool read(SWFStream& in);
virtual ~GradientBevelFilter() { return; }
Index: server/GradientGlowFilter.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/GradientGlowFilter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/GradientGlowFilter.cpp 5 Mar 2008 03:55:58 -0000 1.5
+++ server/GradientGlowFilter.cpp 9 Jun 2008 10:18:21 -0000 1.6
@@ -21,7 +21,7 @@
namespace gnash {
// See parser/filter_factory.cpp for the implementation. Purposefully not here.
-//bool GradientGlowFilter::read(stream* in);
+//bool GradientGlowFilter::read(SWFStream* in);
} // Namespace gnash
Index: server/GradientGlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientGlowFilter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/GradientGlowFilter.h 27 Mar 2008 10:50:13 -0000 1.10
+++ server/GradientGlowFilter.h 9 Jun 2008 10:18:21 -0000 1.11
@@ -38,8 +38,8 @@
FULL_GLOW = 3
} glow_types;
- // Fill from a stream. See parser/filter_factory.cpp for the
implementations.
- virtual bool read(stream& in);
+ // Fill from a SWFStream. See parser/filter_factory.cpp for the
implementations.
+ virtual bool read(SWFStream& in);
virtual ~GradientGlowFilter() { return; }
Index: server/cxform.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/cxform.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/cxform.cpp 3 Jun 2008 12:27:25 -0000 1.18
+++ server/cxform.cpp 9 Jun 2008 10:18:21 -0000 1.19
@@ -86,7 +86,7 @@
a = (uint8_t)(clamp<int16_t>(at, 0, 255));
}
-void cxform::read_rgb(stream& in)
+void cxform::read_rgb(SWFStream& in)
{
in.align();
@@ -125,7 +125,7 @@
}
}
-void cxform::read_rgba(stream& in)
+void cxform::read_rgba(SWFStream& in)
{
in.align();
Index: server/cxform.h
===================================================================
RCS file: /sources/gnash/gnash/server/cxform.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/cxform.h 6 Jun 2008 10:51:40 -0000 1.16
+++ server/cxform.h 9 Jun 2008 10:18:21 -0000 1.17
@@ -26,7 +26,7 @@
namespace gnash {
class rgba;
- class stream;
+ class SWFStream;
}
namespace gnash {
@@ -96,18 +96,18 @@
bool is_invisible() const;
/// Read RGB from the SWF input stream.
- void read_rgb(stream& in);
+ void read_rgb(SWFStream& in);
// TODO: temp hack, should drop!
// why read_xxx(stream *) and read_xxx(stream &) are mixed together?
- void read_rgb(stream* in) { read_rgb(*in); }
+ void read_rgb(SWFStream* in) { read_rgb(*in); }
/// Read RGBA from the SWF input stream.
- void read_rgba(stream& in);
+ void read_rgba(SWFStream& in);
// TODO: temp hack, should drop!
// why read_xxx(stream *) and read_xxx(stream &) are mixed together?
- void read_rgba(stream* in) { read_rgba(*in); }
+ void read_rgba(SWFStream* in) { read_rgba(*in); }
friend bool operator== (const cxform&, const cxform&);
Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/fill_style.cpp 4 Jun 2008 14:00:30 -0000 1.34
+++ server/fill_style.cpp 9 Jun 2008 10:18:21 -0000 1.35
@@ -37,7 +37,7 @@
//
void
-gradient_record::read(stream* in, int tag_type)
+gradient_record::read(SWFStream* in, int tag_type)
{
in->ensureBytes(1);
m_ratio = in->read_u8();
@@ -63,7 +63,7 @@
void
-fill_style::read(stream* in, int tag_type, movie_definition* md,
+fill_style::read(SWFStream* in, int tag_type, movie_definition* md,
fill_style *pOther)
{
const bool is_morph = pOther != NULL;
Index: server/fill_style.h
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/fill_style.h 28 May 2008 08:06:05 -0000 1.20
+++ server/fill_style.h 9 Jun 2008 10:18:21 -0000 1.21
@@ -30,7 +30,7 @@
namespace gnash {
-class stream;
+class SWFStream;
class gradient_record
{
@@ -47,7 +47,7 @@
m_color(color)
{}
- void read(stream* in, int tag_type);
+ void read(SWFStream* in, int tag_type);
//data:
boost::uint8_t m_ratio;
@@ -127,11 +127,11 @@
/// Throw a ParserException if there's no enough bytes in the
/// currently opened tag for reading. See stream::ensureBytes()
///
- void read(stream* in, int tag_type, movie_definition* m,
+ void read(SWFStream* in, int tag_type, movie_definition* m,
fill_style *pOther = NULL);
/// Read the fill style from a stream, morph version.
- void read_morph(stream* in, int tag_type, movie_definition* m,
+ void read_morph(SWFStream* in, int tag_type, movie_definition* m,
fill_style *pOther);
/// \brief
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/font.cpp 9 Jun 2008 08:09:19 -0000 1.68
+++ server/font.cpp 9 Jun 2008 10:18:21 -0000 1.69
@@ -126,16 +126,16 @@
}
- void font::read(stream* in, SWF::tag_type tag, movie_definition* m)
+ void font::read(SWFStream* in, SWF::tag_type tag, movie_definition*
m)
{
if (tag == SWF::DEFINEFONT)
{
- readDefineFont(in, m);
+ readDefineFont(*in, m);
}
else
{
assert (tag == SWF::DEFINEFONT2 || tag ==
SWF::DEFINEFONT3);
- readDefineFont2_or_3(in, m);
+ readDefineFont2_or_3(*in, m);
if (tag == SWF::DEFINEFONT3)
{
m_subpixel_font = true;
@@ -150,20 +150,20 @@
}
// Read a DefineFont tag
- void font::readDefineFont(stream* in, movie_definition* m)
+ void font::readDefineFont(SWFStream& in, movie_definition* m)
{
IF_VERBOSE_PARSE (
log_parse(_("reading DefineFont"));
);
- unsigned long table_base = in->get_position();
+ unsigned long table_base = in.get_position();
// Read the glyph offsets. Offsets
// are measured from the start of the
// offset table.
std::vector<unsigned> offsets;
- in->ensureBytes(2);
- offsets.push_back(in->read_u16());
+ in.ensureBytes(2);
+ offsets.push_back(in.read_u16());
IF_VERBOSE_PARSE (
log_parse("offset[0] = %d", offsets[0]);
@@ -172,10 +172,10 @@
int count = offsets[0] >> 1;
if ( count > 0 )
{
- in->ensureBytes(count*2);
+ in.ensureBytes(count*2);
for (int i = 1; i < count; i++)
{
- offsets.push_back(in->read_u16());
+ offsets.push_back(in.read_u16());
IF_VERBOSE_PARSE (
log_parse("offset[%d] = %d", i, offsets[i]);
@@ -195,28 +195,28 @@
// Seek to the start of the shape data.
unsigned long new_pos = table_base + offsets[i];
- if ( ! in->set_position(new_pos) )
+ if ( ! in.set_position(new_pos) )
{
throw ParserException(_("Glyphs offset table
corrupted in DefineFont tag"));
}
// Create & read the shape.
shape_character_def* s = new shape_character_def;
- s->read(in, SWF::DEFINEFONT, false, m);
+ s->read(&in, SWF::DEFINEFONT, false, m);
_embedGlyphTable[i].glyph = s;
}
}
// Read a DefineFont2 or DefineFont3 tag
- void font::readDefineFont2_or_3(stream* in, movie_definition* m)
+ void font::readDefineFont2_or_3(SWFStream& in, movie_definition* m)
{
IF_VERBOSE_PARSE (
log_parse(_("reading DefineFont2 or DefineFont3"));
);
- in->ensureBytes(2); // 1 for the flags, 1 unknown
- int flags = in->read_u8();
+ in.ensureBytes(2); // 1 for the flags, 1 unknown
+ int flags = in.read_u8();
bool has_layout = flags & (1 << 7);
m_shift_jis_chars = flags & (1 << 6);
m_unicode_chars = flags & (1 << 5);
@@ -226,7 +226,7 @@
m_is_italic = flags & (1 << 1);
m_is_bold = flags & (1 << 0);
// don't know the usage, so we discard it.
- int discarded = in->read_u8();
+ int discarded = in.read_u8();
UNUSED(discarded);
IF_VERBOSE_PARSE (
@@ -240,12 +240,12 @@
log_parse(" is_bold = %d", m_is_bold);
);
- in->read_string_with_length(m_name);
+ in.read_string_with_length(m_name);
- in->ensureBytes(2);
- boost::uint16_t glyph_count = in->read_u16();
+ in.ensureBytes(2);
+ boost::uint16_t glyph_count = in.read_u16();
- unsigned long table_base = in->get_position();
+ unsigned long table_base = in.get_position();
// Read the glyph offsets. Offsets
// are measured from the start of the
@@ -255,10 +255,10 @@
if (wide_offsets)
{
// 32-bit offsets.
- in->ensureBytes(4*glyph_count + 4);
+ in.ensureBytes(4*glyph_count + 4);
for (unsigned int i = 0; i < glyph_count; i++)
{
- boost::uint32_t off = in->read_u32();
+ boost::uint32_t off = in.read_u32();
IF_VERBOSE_PARSE (
log_parse(_("Glyph %d at offset %u"), i, off);
@@ -266,15 +266,15 @@
offsets.push_back(off);
}
- font_code_offset = in->read_u32();
+ font_code_offset = in.read_u32();
}
else
{
// 16-bit offsets.
- in->ensureBytes(2*glyph_count + 2);
+ in.ensureBytes(2*glyph_count + 2);
for (unsigned int i = 0; i < glyph_count; i++)
{
- boost::uint16_t off = in->read_u16();
+ boost::uint16_t off = in.read_u16();
IF_VERBOSE_PARSE (
log_parse(_("Glyph %d at offset %u"), i, off);
@@ -282,7 +282,7 @@
offsets.push_back(off);
}
- font_code_offset = in->read_u16();
+ font_code_offset = in.read_u16();
}
_embedGlyphTable.resize(glyph_count);
@@ -295,21 +295,21 @@
// It seems completely possible to
// have such seeks-back, see bug #16311
- //assert(new_pos >= in->get_position());
+ //assert(new_pos >= in.get_position());
- if ( ! in->set_position(new_pos) )
+ if ( ! in.set_position(new_pos) )
{
throw ParserException(_("Glyphs offset table
corrupted in DefineFont2/3 tag"));
}
// Create & read the shape.
shape_character_def* s = new shape_character_def;
- s->read(in, SWF::DEFINEFONT2, false, m); // .. or
DEFINEFONT3 actually..
+ s->read(&in, SWF::DEFINEFONT2, false, m); // .. or
DEFINEFONT3 actually..
_embedGlyphTable[i].glyph = s;
}
- unsigned long current_position = in->get_position();
+ unsigned long current_position = in.get_position();
if (font_code_offset + table_base != current_position)
{
// Bad offset! Don't try to read any more.
@@ -324,17 +324,17 @@
// Read layout info for the glyphs.
if (has_layout)
{
- in->ensureBytes(6);
- m_ascent = (float) in->read_s16();
- m_descent = (float) in->read_s16();
- m_leading = (float) in->read_s16();
+ in.ensureBytes(6);
+ m_ascent = (float) in.read_s16();
+ m_descent = (float) in.read_s16();
+ m_leading = (float) in.read_s16();
// Advance table; i.e. how wide each character is.
size_t nGlyphs = _embedGlyphTable.size();
- in->ensureBytes(nGlyphs*2);
+ in.ensureBytes(nGlyphs*2);
for (size_t i = 0; i < nGlyphs; i++)
{
- _embedGlyphTable[i].advance = (float)
in->read_s16();
+ _embedGlyphTable[i].advance = (float)
in.read_s16();
}
// Bounds table.
@@ -345,15 +345,15 @@
}
// Kerning pairs.
- in->ensureBytes(2);
- int kerning_count = in->read_u16();
+ in.ensureBytes(2);
+ int kerning_count = in.read_u16();
if ( m_wide_codes )
{
- in->ensureBytes(6*kerning_count); // includes
the adjustment
+ in.ensureBytes(6*kerning_count); // includes
the adjustment
}
else
{
- in->ensureBytes(4*kerning_count); // includes
the adjustment
+ in.ensureBytes(4*kerning_count); // includes
the adjustment
}
for (int i = 0; i < kerning_count; i++)
@@ -361,15 +361,15 @@
boost::uint16_t char0, char1;
if (m_wide_codes)
{
- char0 = in->read_u16();
- char1 = in->read_u16();
+ char0 = in.read_u16();
+ char1 = in.read_u16();
}
else
{
- char0 = in->read_u8();
- char1 = in->read_u8();
+ char0 = in.read_u8();
+ char1 = in.read_u8();
}
- float adjustment = (float) in->read_s16();
+ float adjustment = (float) in.read_s16();
kerning_pair k;
k.m_char0 = char0;
@@ -389,7 +389,7 @@
}
// Read the font name, display and legal, from a DefineFontName tag.
- void font::read_font_name(stream* in, SWF::tag_type tag,
+ void font::read_font_name(SWFStream* in, SWF::tag_type tag,
movie_definition* /*m*/)
{
assert(tag == SWF::DEFINEFONTNAME);
@@ -400,7 +400,7 @@
// Read additional information about this font, from a
// DefineFontInfo tag. The caller has already read the tag
// type and font id.
- void font::read_font_info(stream* in, SWF::tag_type tag,
+ void font::read_font_info(SWFStream* in, SWF::tag_type tag,
movie_definition* /*m*/)
{
assert(tag == SWF::DEFINEFONTINFO || tag ==
SWF::DEFINEFONTINFO2);
@@ -432,13 +432,13 @@
m_is_bold = flags & (1 << 1);
m_wide_codes = flags & (1 << 0);
- read_code_table(in);
+ read_code_table(*in);
}
- void font::read_code_table(stream* in)
+ void font::read_code_table(SWFStream& in)
{
IF_VERBOSE_PARSE (
- log_parse(_("reading code table at offset %lu"),
in->get_position());
+ log_parse(_("reading code table at offset %lu"),
in.get_position());
);
assert(_embedded_code_table.empty());
@@ -446,21 +446,21 @@
size_t nGlyphs = _embedGlyphTable.size();
if (m_wide_codes)
{
- in->ensureBytes(2*nGlyphs);
+ in.ensureBytes(2*nGlyphs);
// Code table is made of boost::uint16_t's.
for (size_t i=0; i<nGlyphs; ++i)
{
- boost::uint16_t code = in->read_u16();
+ boost::uint16_t code = in.read_u16();
_embedded_code_table.insert(std::make_pair(code, i));
}
}
else
{
// Code table is made of bytes.
- in->ensureBytes(1*nGlyphs);
+ in.ensureBytes(1*nGlyphs);
for (size_t i=0; i<nGlyphs; ++i)
{
- boost::uint8_t code = in->read_u8();
+ boost::uint8_t code = in.read_u8();
_embedded_code_table.insert(std::make_pair(code, i));
}
}
Index: server/font.h
===================================================================
RCS file: /sources/gnash/gnash/server/font.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/font.h 9 Jun 2008 08:09:19 -0000 1.41
+++ server/font.h 9 Jun 2008 10:18:22 -0000 1.42
@@ -42,7 +42,7 @@
class movie_definition;
class shape_character_def;
-class stream;
+class SWFStream;
// @@ replace this with a flat hash, or else a sorted array
@@ -166,7 +166,7 @@
/// @param m is the movie_definition containing this definition
/// (used to resolve dictionary simbols referred to by glyphs,
if any)
///
- void read(stream* in, SWF::tag_type tag, movie_definition* m);
+ void read(SWFStream* in, SWF::tag_type tag, movie_definition* m);
/// \brief
/// Read additional information about this font, from a
@@ -176,7 +176,7 @@
///
/// @see SWF::define_font_info_loader
///
- void read_font_info(stream* in, SWF::tag_type tag, movie_definition*
m);
+ void read_font_info(SWFStream* in, SWF::tag_type tag,
movie_definition* m);
/// \brief
/// Read the name of this font, from a DEFINEFONTNAME tag.
@@ -185,7 +185,7 @@
//
/// @see SWF::define_font_name_loader
///
- void read_font_name(stream* in, SWF::tag_type tag, movie_definition*
m);
+ void read_font_name(SWFStream* in, SWF::tag_type tag,
movie_definition* m);
/// Get name of this font. Warning: can be NULL.
const std::string& get_name() const { return m_name; }
@@ -251,13 +251,13 @@
private:
/// Read the table that maps from glyph indices to character codes.
- void read_code_table(stream* in);
+ void read_code_table(SWFStream& in);
/// Read a DefineFont2 or DefineFont3 tag
- void readDefineFont2_or_3(stream* in, movie_definition* m);
+ void readDefineFont2_or_3(SWFStream& in, movie_definition* m);
/// Read a DefineFont tag
- void readDefineFont(stream* in, movie_definition* m);
+ void readDefineFont(SWFStream& in, movie_definition* m);
/// Add a glyph from the os font into the device glyphs table
//
Index: server/impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/impl.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/impl.h 28 May 2008 08:37:13 -0000 1.57
+++ server/impl.h 9 Jun 2008 10:18:22 -0000 1.58
@@ -37,7 +37,6 @@
class character_def;
class font;
class movie_root;
-class stream;
class sprite_instance;
DSOEXPORT void save_extern_movie(sprite_instance* m);
Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/matrix.cpp 6 Jun 2008 03:48:28 -0000 1.33
+++ server/matrix.cpp 9 Jun 2008 10:18:22 -0000 1.34
@@ -42,7 +42,7 @@
}
void
-matrix::read(stream& in)
+matrix::read(SWFStream& in)
// Initialize from the stream.
{
in.align();
Index: server/matrix.h
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/matrix.h 6 Jun 2008 03:48:29 -0000 1.21
+++ server/matrix.h 9 Jun 2008 10:18:22 -0000 1.22
@@ -34,7 +34,7 @@
// Forward declarations
namespace gnash {
- class stream;
+ class SWFStream;
}
@@ -132,10 +132,10 @@
}
/// Initialize from the SWF input stream.
- void read(stream& in);
+ void read(SWFStream& in);
// temp hack, should drop..
- void read(stream* in) { read(*in); }
+ void read(SWFStream* in) { read(*in); }
/// Transform point 'p' by our matrix.
//
Index: server/rect.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/rect.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/rect.cpp 19 May 2008 13:03:54 -0000 1.19
+++ server/rect.cpp 9 Jun 2008 10:18:22 -0000 1.20
@@ -26,18 +26,18 @@
namespace gnash {
-void rect::read(stream* in)
+void rect::read(SWFStream& in)
{
- in->align();
+ in.align();
- in->ensureBits(5);
- unsigned int nbits = in->read_uint(5);
+ in.ensureBits(5);
+ unsigned int nbits = in.read_uint(5);
- in->ensureBits(nbits*4);
- float xmin = (float) in->read_sint(nbits);
- float xmax = (float) in->read_sint(nbits);
- float ymin = (float) in->read_sint(nbits);
- float ymax = (float) in->read_sint(nbits);
+ in.ensureBits(nbits*4);
+ float xmin = (float) in.read_sint(nbits);
+ float xmax = (float) in.read_sint(nbits);
+ float ymin = (float) in.read_sint(nbits);
+ float ymax = (float) in.read_sint(nbits);
// Check for swapped X or Y values
if (xmax < xmin || ymax < ymin)
Index: server/rect.h
===================================================================
RCS file: /sources/gnash/gnash/server/rect.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/rect.h 27 Mar 2008 10:50:15 -0000 1.25
+++ server/rect.h 9 Jun 2008 10:18:22 -0000 1.26
@@ -30,7 +30,7 @@
// Forward decl
namespace gnash {
class matrix;
- class stream;
+ class SWFStream;
}
namespace gnash {
@@ -39,7 +39,7 @@
/// Rectangle class, basically a wrapper around a
/// gnash::geometry::Range2d<float> with a few
/// additional methods for reading it from the
-/// stream ..
+/// SWFStream ..
//
/// used by render handler (?)
///
@@ -108,7 +108,10 @@
/// rectangle to the NULL rectangle. See is_null().
///
///
- void read(stream* in);
+ void read(SWFStream& in);
+
+ // TODO: drop this, currently here to avoid touching all callers
+ void read(SWFStream* in) { read(*in); }
void print() const;
Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/stream.cpp 4 Jun 2008 12:11:21 -0000 1.53
+++ server/stream.cpp 9 Jun 2008 10:18:22 -0000 1.54
@@ -32,7 +32,7 @@
namespace gnash {
-stream::stream(tu_file* input)
+SWFStream::SWFStream(tu_file* input)
:
m_input(input),
m_current_byte(0),
@@ -41,12 +41,12 @@
}
-stream::~stream()
+SWFStream::~SWFStream()
{
}
void
-stream::ensureBytes(unsigned long needed)
+SWFStream::ensureBytes(unsigned long needed)
{
#ifndef GNASH_TRUST_SWF_INPUT
@@ -62,7 +62,7 @@
#endif
}
-unsigned stream::read(char *buf, unsigned count)
+unsigned SWFStream::read(char *buf, unsigned count)
{
align();
@@ -82,7 +82,7 @@
return m_input->read_bytes(buf, count);
}
-bool stream::read_bit()
+bool SWFStream::read_bit()
{
if (!m_unused_bits)
{
@@ -96,7 +96,7 @@
}
}
-unsigned stream::read_uint(unsigned short bitcount)
+unsigned SWFStream::read_uint(unsigned short bitcount)
{
// htf_sweet.swf fails when this is set to 24. There seems to
// be no reason why this should be limited to 32 other than
@@ -185,7 +185,7 @@
int
-stream::read_sint(unsigned short bitcount)
+SWFStream::read_sint(unsigned short bitcount)
{
//assert(bitcount <= 32); // already asserted in read_uint
@@ -196,13 +196,13 @@
value |= -1 << bitcount;
}
-// IF_DEBUG(log_debug("stream::read_sint(%d) == %d\n", bitcount,
value));
+// IF_DEBUG(log_debug("SWFStream::read_sint(%d) == %d\n", bitcount,
value));
return value;
}
-float stream::read_fixed()
+float SWFStream::read_fixed()
{
// align(); // read_u32 will align
return static_cast<float> (
@@ -213,7 +213,7 @@
// float is not large enough to hold a 32 bit value without doing the wrong
thing with the sign.
// So we upgrade to double for the calculation and then resize when we know
it's small enough.
-float stream::read_ufixed()
+float SWFStream::read_ufixed()
{
// align(); // read_u32 will align
return static_cast<float> (
@@ -222,21 +222,21 @@
}
// Read a short fixed value, unsigned.
-float stream::read_short_ufixed()
+float SWFStream::read_short_ufixed()
{
// align(); // read_u16 will align
return static_cast<float> ( read_u16() / 256.0f );
}
// Read a short fixed value, signed.
-float stream::read_short_sfixed()
+float SWFStream::read_short_sfixed()
{
// align(); // read_s16 will align
return static_cast<float> ( read_s16() / 256.0f );
}
/// Read a 16bit (1:sign 5:exp 10:mantissa) floating point value
-float stream::read_short_float()
+float SWFStream::read_short_float()
{
// read_s16 will align
return static_cast<float> ( read_s16() );
@@ -286,7 +286,7 @@
}
/// Read a 32bit (1:sign 8:exp 23:mantissa) floating point value
-float stream::read_long_float()
+float SWFStream::read_long_float()
{
const unsigned short dataLength = 4;
@@ -301,7 +301,7 @@
}
// Read a 64-bit double value
-long double stream::read_d64()
+long double SWFStream::read_d64()
{
#ifdef USE_TU_FILE_BYTESWAPPING
align();
@@ -332,19 +332,19 @@
#endif
}
-boost::uint8_t stream::read_u8()
+boost::uint8_t SWFStream::read_u8()
{
align();
return m_input->read_byte();
}
-int8_t stream::read_s8()
+int8_t SWFStream::read_s8()
{
// read_u8 will align
return read_u8();
}
-boost::uint16_t stream::read_u16()
+boost::uint16_t SWFStream::read_u16()
{
#ifdef USE_TU_FILE_BYTESWAPPING
align();
@@ -367,13 +367,13 @@
#endif
}
-boost::int16_t stream::read_s16()
+boost::int16_t SWFStream::read_s16()
{
// read_u16 will align
return read_u16();
}
-boost::uint32_t stream::read_u32()
+boost::uint32_t SWFStream::read_u32()
{
#ifdef USE_TU_FILE_BYTESWAPPING
align();
@@ -400,14 +400,14 @@
#endif
}
-boost::int32_t stream::read_s32()
+boost::int32_t SWFStream::read_s32()
{
// read_u32 will align
return read_u32();
}
void
-stream::read_string(std::string& to)
+SWFStream::read_string(std::string& to)
{
align();
@@ -423,7 +423,7 @@
}
-void stream::read_string_with_length(std::string& to)
+void SWFStream::read_string_with_length(std::string& to)
{
align();
@@ -432,7 +432,7 @@
read_string_with_length(len, to); // will check 'len'
}
-void stream::read_string_with_length(unsigned len, std::string& to)
+void SWFStream::read_string_with_length(unsigned len, std::string& to)
{
align();
@@ -448,7 +448,7 @@
unsigned long
-stream::get_position()
+SWFStream::get_position()
{
int pos = m_input->get_position();
// TODO: check return value? Could be negative.
@@ -457,7 +457,7 @@
bool
-stream::set_position(unsigned long pos)
+SWFStream::set_position(unsigned long pos)
{
align();
@@ -498,7 +498,7 @@
unsigned long
-stream::get_tag_end_position()
+SWFStream::get_tag_end_position()
{
assert(_tagBoundsStack.size() > 0);
@@ -507,7 +507,7 @@
SWF::tag_type
-stream::open_tag()
+SWFStream::open_tag()
{
align();
@@ -584,7 +584,7 @@
void
-stream::close_tag()
+SWFStream::close_tag()
{
assert(_tagBoundsStack.size() > 0);
Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/stream.h 6 May 2008 16:15:57 -0000 1.44
+++ server/stream.h 9 Jun 2008 10:18:23 -0000 1.45
@@ -52,11 +52,11 @@
/// - aligned reads always start on a byte boundary
/// - bitwise reads can cross byte boundaries
///
-class DSOEXPORT stream
+class DSOEXPORT SWFStream
{
public:
- stream(tu_file* input);
- ~stream();
+ SWFStream(tu_file* input);
+ ~SWFStream();
/// \brief
/// Reads a bit-packed unsigned integer from the stream
Index: server/styles.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/styles.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/styles.cpp 2 Jun 2008 20:21:34 -0000 1.47
+++ server/styles.cpp 9 Jun 2008 10:18:23 -0000 1.48
@@ -39,7 +39,7 @@
}
void
-line_style::read_morph(stream* in, int tag_type, movie_definition *md,
+line_style::read_morph(SWFStream* in, int tag_type, movie_definition *md,
line_style *pOther)
{
if (tag_type == SWF::DEFINEMORPHSHAPE)
@@ -91,7 +91,7 @@
}
void
-line_style::read(stream* in, int tag_type, movie_definition *md)
+line_style::read(SWFStream* in, int tag_type, movie_definition *md)
{
if (!(tag_type == SWF::DEFINESHAPE4 || tag_type == SWF::DEFINESHAPE4_))
{
Index: server/styles.h
===================================================================
RCS file: /sources/gnash/gnash/server/styles.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/styles.h 2 May 2008 17:11:56 -0000 1.30
+++ server/styles.h 9 Jun 2008 10:18:23 -0000 1.31
@@ -16,7 +16,7 @@
namespace gnash {
-class stream;
+class SWFStream;
class movie_definition;
typedef enum { CAP_ROUND=0, CAP_NONE=1, CAP_SQUARE=2 } cap_style_e;
@@ -84,11 +84,11 @@
/// Throw a ParserException if there's no enough bytes in the
/// currently opened tag for reading. See stream::ensureBytes()
///
- void read(stream* in, int tag_type, movie_definition *md);
+ void read(SWFStream* in, int tag_type, movie_definition *md);
/// Read two lines styles from the SWF stream
/// at the same time -- this is used in morphing.
- void read_morph(stream* in, int tag_type, movie_definition *md,
+ void read_morph(SWFStream* in, int tag_type, movie_definition *md,
line_style *pOther);
/// Return thickness of the line, in TWIPS
Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/text.cpp 29 May 2008 10:34:55 -0000 1.51
+++ server/text.cpp 9 Jun 2008 10:18:23 -0000 1.52
@@ -65,7 +65,7 @@
return true;
}
- void text_glyph_record::read(stream* in, int glyph_count,
+ void text_glyph_record::read(SWFStream* in, int glyph_count,
int glyph_bits, int advance_bits)
{
// TODO: shouldn't we take unsigned for *_bits ?
Index: server/text.h
===================================================================
RCS file: /sources/gnash/gnash/server/text.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/text.h 29 May 2008 10:34:55 -0000 1.27
+++ server/text.h 9 Jun 2008 10:18:23 -0000 1.28
@@ -29,6 +29,7 @@
class text_character_def;
class text_glyph_record;
class text_style;
+ class SWFStream;
// Helper class.
// @@ text_character_def friend ?
@@ -205,7 +206,7 @@
text_style m_style;
std::vector<glyph_entry> m_glyphs;
- void read(stream* in, int glyph_count,
+ void read(SWFStream* in, int glyph_count,
int glyph_bits, int advance_bits);
};
Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/types.cpp 2 Jun 2008 12:19:26 -0000 1.31
+++ server/types.cpp 9 Jun 2008 10:18:23 -0000 1.32
@@ -20,7 +20,7 @@
//
/// Can throw ParserException on premature end of input stream
- void rgba::read(stream* in, int tag_type)
+ void rgba::read(SWFStream* in, int tag_type)
{
switch (tag_type)
{
@@ -36,7 +36,7 @@
}
/// Can throw ParserException on premature end of input stream
- void rgba::read_rgba(stream* in)
+ void rgba::read_rgba(SWFStream* in)
{
read_rgb(in);
in->ensureBytes(1);
@@ -44,7 +44,7 @@
}
/// Can throw ParserException on premature end of input stream
- void rgba::read_rgb(stream* in)
+ void rgba::read_rgb(SWFStream* in)
{
in->ensureBytes(3);
m_r = in->read_u8();
Index: server/types.h
===================================================================
RCS file: /sources/gnash/gnash/server/types.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/types.h 6 Jun 2008 10:51:40 -0000 1.24
+++ server/types.h 9 Jun 2008 10:18:23 -0000 1.25
@@ -15,7 +15,7 @@
inline int PIXELS_TO_TWIPS(double d) { return d * 20; }
namespace gnash {
- class stream; // forward declaration
+ class SWFStream; // forward declaration
/// RGBA record
class rgba
@@ -87,17 +87,17 @@
/// Throw a ParserException if there's no enough bytes in the
/// currently opened tag for reading. See stream::ensureBytes()
///
- void read(stream* in, int tag_type);
+ void read(SWFStream* in, int tag_type);
/// Initialize from intput stream (reads RGBA)
//
/// Throw a ParserException if there's no enough bytes in the
/// currently opened tag for reading. See stream::ensureBytes()
///
- void read_rgba(stream* in);
+ void read_rgba(SWFStream* in);
/// Initialize from intput stream (reads RGB)
- void read_rgb(stream* in);
+ void read_rgb(SWFStream* in);
/// Set r,g,b.a values
void set(boost::uint8_t r, boost::uint8_t g, boost::uint8_t
b, boost::uint8_t a)
Index: server/parser/abc_block.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/abc_block.cpp 21 Jan 2008 20:56:00 -0000 1.12
+++ server/parser/abc_block.cpp 9 Jun 2008 10:18:24 -0000 1.13
@@ -19,7 +19,7 @@
//
#include "abc_block.h"
-#include "stream.h"
+#include "stream.h" // for use
#include "VM.h"
#include "log.h"
#include "ClassHierarchy.h"
@@ -159,7 +159,7 @@
/// Read an AS3 'trait'
bool
-abc_Trait::read(stream* in, abc_block *pBlock)
+abc_Trait::read(SWFStream* in, abc_block *pBlock)
{
boost::uint32_t name = in->read_V32();
if (name >= pBlock->mMultinamePool.size())
@@ -1111,7 +1111,7 @@
// Load up all of the data.
bool
-abc_block::read(stream* in)
+abc_block::read(SWFStream* in)
{
mS = in;
if (!read_version()) return false;
Index: server/parser/abc_block.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/parser/abc_block.h 2 Jun 2008 09:52:54 -0000 1.11
+++ server/parser/abc_block.h 9 Jun 2008 10:18:24 -0000 1.12
@@ -25,12 +25,15 @@
#include <string>
#include <boost/scoped_array.hpp>
-#include "stream.h"
#include "string_table.h"
#include "asClass.h"
#include "asName.h"
namespace gnash {
+ class SWFStream; // for read signature
+}
+
+namespace gnash {
typedef std::vector<asNamespace *> abcNamespaceSet;
@@ -75,7 +78,7 @@
mNamespace(NULL), mMethod(NULL), mValueSet(false)
{/**/}
- bool read(stream* in, abc_block *pBlock);
+ bool read(SWFStream* in, abc_block *pBlock);
bool finalize(abc_block *pBlock, asClass *pClass, bool do_static);
bool finalize_mbody(abc_block *pBlock, asMethod *pMethod);
@@ -140,7 +143,7 @@
std::vector<abc_parsing::abc_Trait*> mTraits;
string_table* mStringTable;
- stream *mS; // Not stored beyond one read.
+ SWFStream *mS; // Not stored beyond one read.
asClass *mTheObject;
ClassHierarchy *mCH;
@@ -172,7 +175,7 @@
bool read_scripts();
bool read_method_bodies();
- bool read(stream* in);
+ bool read(SWFStream* in);
bool pool_value(boost::uint32_t index, boost::uint8_t type, as_value
&v);
Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/parser/action_buffer.cpp 8 May 2008 08:00:37 -0000 1.41
+++ server/parser/action_buffer.cpp 9 Jun 2008 10:18:24 -0000 1.42
@@ -57,7 +57,7 @@
}
void
-action_buffer::read(stream& in, unsigned long endPos)
+action_buffer::read(SWFStream& in, unsigned long endPos)
{
unsigned long startPos = in.get_position();
assert(endPos <= in.get_tag_end_position());
Index: server/parser/action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/parser/action_buffer.h 2 Jun 2008 09:52:54 -0000 1.29
+++ server/parser/action_buffer.h 9 Jun 2008 10:18:24 -0000 1.30
@@ -32,6 +32,7 @@
class as_environment;
class as_value;
class movie_definition;
+ class SWFStream; // for read signature
}
@@ -61,7 +62,7 @@
/// <= in.get_tag_end_position() or an assertion will
/// fail.
///
- void read(stream& in, unsigned long endPos);
+ void read(SWFStream& in, unsigned long endPos);
bool is_null() const
{
Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/parser/button_character_def.cpp 2 Jun 2008 09:52:54 -0000
1.36
+++ server/parser/button_character_def.cpp 9 Jun 2008 10:18:24 -0000
1.37
@@ -37,7 +37,7 @@
//
-button_action::button_action(stream& in, int tag_type, unsigned long endPos,
movie_definition& mdef)
+button_action::button_action(SWFStream& in, int tag_type, unsigned long
endPos, movie_definition& mdef)
:
m_actions(mdef)
{
@@ -113,7 +113,7 @@
}
bool
-button_record::read(stream* in, int tag_type,
+button_record::read(SWFStream* in, int tag_type,
movie_definition* m, unsigned long endPos)
{
// caller should check this
@@ -244,7 +244,7 @@
}
-void button_character_definition::sound_info::read(stream* in)
+void button_character_definition::sound_info::read(SWFStream* in)
{
in->ensureBytes(1);
m_in_point = m_out_point = m_loop_count = 0;
@@ -305,7 +305,7 @@
}
void
-button_character_definition::readDefineButton(stream* in, movie_definition* m)
+button_character_definition::readDefineButton(SWFStream* in, movie_definition*
m)
{
assert(m);
assert(in);
@@ -348,7 +348,7 @@
}
void
-button_character_definition::readDefineButton2(stream* in, movie_definition* m)
+button_character_definition::readDefineButton2(SWFStream* in,
movie_definition* m)
{
// Character ID has been read already
@@ -437,7 +437,7 @@
}
void
-button_character_definition::readDefineButtonSound(stream* in,
movie_definition* m)
+button_character_definition::readDefineButtonSound(SWFStream* in,
movie_definition* m)
{
// Character ID has been read already
@@ -479,8 +479,7 @@
void
-button_character_definition::read(stream* in, int tag_type, movie_definition*
m)
-// Initialize from the given stream.
+button_character_definition::read(SWFStream* in, int tag_type,
movie_definition* m)
{
// Character ID has been read already
Index: server/parser/button_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/parser/button_character_def.h 21 Apr 2008 11:27:45 -0000
1.28
+++ server/parser/button_character_def.h 9 Jun 2008 10:18:24 -0000
1.29
@@ -43,6 +43,7 @@
class sprite_instance;
class movie_definition;
class event_id;
+ class SWFStream; // for read signatures
}
namespace gnash {
@@ -100,7 +101,7 @@
///
/// TODO: take the stream by ref, not pointer
///
- bool read(stream* in, int tag_type, movie_definition* m, unsigned
long endPos);
+ bool read(SWFStream* in, int tag_type, movie_definition* m, unsigned
long endPos);
/// Return true if the button_record is valid
//
@@ -136,7 +137,7 @@
/// The movie_definition this button action was read from
///
///
- button_action(stream& in, int tag_type, unsigned long endPos,
movie_definition& mdef);
+ button_action(SWFStream& in, int tag_type, unsigned long endPos,
movie_definition& mdef);
/// Return true if this action should be triggered by the given event.
bool triggeredBy(const event_id& ev) const;
@@ -182,7 +183,7 @@
struct sound_info
{
- void read(stream* in);
+ void read(SWFStream* in);
bool m_no_multiple;
bool m_stop_playback;
@@ -221,7 +222,7 @@
struct button_sound_def
{
// TODO: implement ?
- //void read(stream* in, movie_definition* m);
+ //void read(SWFStream* in, movie_definition* m);
button_sound_info m_button_sounds[4];
@@ -252,16 +253,16 @@
character* create_character_instance(character* parent, int id);
/// Read a SWF::DEFINEBUTTON, SWF::DEFINEBUTTONSOUND or
SWF::DEFINEBUTTON2
- void read(stream* in, int tag_type, movie_definition* m);
+ void read(SWFStream* in, int tag_type, movie_definition* m);
/// Read a SWF::DEFINEBUTTON tag
- void readDefineButton(stream* in, movie_definition* m);
+ void readDefineButton(SWFStream* in, movie_definition* m);
/// Read a SWF::DEFINEBUTTON2 tag
- void readDefineButton2(stream* in, movie_definition* m);
+ void readDefineButton2(SWFStream* in, movie_definition* m);
/// Read a SWF::DEFINEBUTTONSOUND tag
- void readDefineButtonSound(stream* in, movie_definition* m);
+ void readDefineButtonSound(SWFStream* in, movie_definition* m);
const rect& get_bound() const {
// It is required that get_bound() is implemented in character
definition
Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/parser/edit_text_character_def.cpp 29 May 2008 10:34:55 -0000
1.22
+++ server/parser/edit_text_character_def.cpp 9 Jun 2008 10:18:24 -0000
1.23
@@ -35,7 +35,7 @@
class movie_definition;
void
-edit_text_character_def::read(stream* in, int tag_type,
+edit_text_character_def::read(SWFStream* in, int tag_type,
movie_definition* m)
{
//assert(m != NULL);
Index: server/parser/edit_text_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/parser/edit_text_character_def.h 29 May 2008 10:34:56 -0000
1.29
+++ server/parser/edit_text_character_def.h 9 Jun 2008 10:18:24 -0000
1.30
@@ -19,7 +19,7 @@
#define _GNASH_EDIT_TEXT_CHARACTER_DEF_H_
#include "smart_ptr.h" // GNASH_USE_GC
-#include "types.h"
+#include "types.h" // what for ?
#include "character_def.h" // for inheritance
#include "rect.h" // for composition
@@ -27,6 +27,7 @@
// Forward declarations
class movie_definition;
+class SWFStream; // for read signature
class font;
/// \brief
@@ -60,7 +61,7 @@
character* create_character_instance(character* parent, int id);
/// Initialize from SWF input stream (tag 37)
- void read(stream* in, int tag_type, movie_definition* m);
+ void read(SWFStream* in, int tag_type, movie_definition* m);
/// Return a reference to the default text associated
/// with this EditText definition.
Index: server/parser/filter_factory.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/filter_factory.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/filter_factory.cpp 29 Apr 2008 12:58:48 -0000 1.12
+++ server/parser/filter_factory.cpp 9 Jun 2008 10:18:24 -0000 1.13
@@ -45,7 +45,7 @@
} filter_types;
int
-filter_factory::read(stream& in, bool read_multiple, Filters* store)
+filter_factory::read(SWFStream& in, bool read_multiple, Filters* store)
{
//GNASH_REPORT_FUNCTION;
@@ -116,7 +116,7 @@
return count;
}
-bool DropShadowFilter::read(stream& in)
+bool DropShadowFilter::read(SWFStream& in)
{
in.ensureBytes(4 + 8 + 8 + 2 + 1);
@@ -145,7 +145,7 @@
return true;
}
-bool BlurFilter::read(stream& in)
+bool BlurFilter::read(SWFStream& in)
{
in.ensureBytes(4 + 4 + 1);
@@ -164,7 +164,7 @@
return true;
}
-bool GlowFilter::read(stream& in)
+bool GlowFilter::read(SWFStream& in)
{
//GNASH_REPORT_FUNCTION;
@@ -190,7 +190,7 @@
return true;
}
-bool BevelFilter::read(stream& in)
+bool BevelFilter::read(SWFStream& in)
{
in.ensureBytes(4 + 4 + 8 + 8 + 2 + 1);
@@ -228,7 +228,7 @@
return true;
}
-bool GradientGlowFilter::read(stream& in)
+bool GradientGlowFilter::read(SWFStream& in)
{
in.ensureBytes(1);
@@ -275,7 +275,7 @@
return true;
}
-bool ConvolutionFilter::read(stream& in)
+bool ConvolutionFilter::read(SWFStream& in)
{
in.ensureBytes(2 + 8);
@@ -310,7 +310,7 @@
return true;
}
-bool ColorMatrixFilter::read(stream& in)
+bool ColorMatrixFilter::read(SWFStream& in)
{
in.ensureBytes(20 * 4);
@@ -335,7 +335,7 @@
return true;
}
-bool GradientBevelFilter::read(stream& in)
+bool GradientBevelFilter::read(SWFStream& in)
{
in.ensureBytes(1);
boost::uint8_t count = in.read_u8(); // How many colorings.
Index: server/parser/filter_factory.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/filter_factory.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/filter_factory.h 29 Apr 2008 12:58:48 -0000 1.5
+++ server/parser/filter_factory.h 9 Jun 2008 10:18:24 -0000 1.6
@@ -28,7 +28,7 @@
namespace gnash {
-class stream;
+class SWFStream;
typedef std::vector<Filter> Filters;
@@ -39,7 +39,7 @@
/// and push them into the vector store. Returns the number read.
/// If read_multiple is true, the first byte of the stream is
/// expected to contain the number of filters to be read.
- static int read(stream& in, bool read_multiple,
+ static int read(SWFStream& in, bool read_multiple,
Filters* store);
};
Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/morph2_character_def.cpp 3 Jun 2008 08:25:09 -0000
1.27
+++ server/parser/morph2_character_def.cpp 9 Jun 2008 10:18:25 -0000
1.28
@@ -194,7 +194,7 @@
}
- void morph2_character_def::read(stream* in, int tag_type, bool
with_style, movie_definition* md)
+ void morph2_character_def::read(SWFStream* in, int tag_type, bool
with_style, movie_definition* md)
{
assert(tag_type == SWF::DEFINEMORPHSHAPE
|| tag_type == SWF::DEFINEMORPHSHAPE2
Index: server/parser/morph2_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/parser/morph2_character_def.h 29 Apr 2008 09:10:05 -0000
1.7
+++ server/parser/morph2_character_def.h 9 Jun 2008 10:18:25 -0000
1.8
@@ -12,6 +12,8 @@
namespace gnash {
+ class SWFStream;
+
/// DefineMorphShape tag
//
class morph2_character_def : public shape_character_def
@@ -41,7 +43,7 @@
/// Must be not-null or would segfault.
/// TODO: take by reference !
///
- void read(stream* in, int tag_type, bool with_style,
movie_definition* m);
+ void read(SWFStream* in, int tag_type, bool with_style,
movie_definition* m);
virtual void display(character* inst);
void lerp_matrix(matrix& t, const matrix& m1, const matrix& m2,
const float ratio);
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- server/parser/movie_def_impl.cpp 4 Jun 2008 13:57:54 -0000 1.117
+++ server/parser/movie_def_impl.cpp 9 Jun 2008 10:18:25 -0000 1.118
@@ -155,7 +155,7 @@
//
/// Log the contents of the current tag, in hex to the output strream
-static void dumpTagBytes(stream* in, std::ostream& os)
+static void dumpTagBytes(SWFStream* in, std::ostream& os)
{
const unsigned int rowlength = 16;
os << std::endl;
@@ -373,7 +373,7 @@
assert(_in.get());
- _str.reset(new stream(_in.get()));
+ _str.reset(new SWFStream(_in.get()));
m_frame_size.read(_str.get());
// If the rect is malformed, rect::read would already
@@ -600,7 +600,7 @@
assert( ! _loader.isSelfThread() );
#endif
- stream &str = *_str;
+ SWFStream &str = *_str;
try {
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/parser/movie_def_impl.h 4 Jun 2008 13:57:54 -0000 1.80
+++ server/parser/movie_def_impl.h 9 Jun 2008 10:18:25 -0000 1.81
@@ -35,7 +35,7 @@
#include "character_def.h" // for boost::intrusive_ptr visibility of dtor
#include "bitmap_character_def.h" // for boost::intrusive_ptr visibility of
dtor
#include "resource.h" // for boost::intrusive_ptr visibility of dtor
-#include "stream.h" // for get_bytes_loaded
+#include "stream.h" // for get_bytes_loaded and visitbility of dtor
(composition)
#include "StringPredicates.h" // for case-insensitive string comparision
(ExportMap)
#include <map> // for CharacterDictionary
@@ -528,7 +528,7 @@
std::string _url;
- std::auto_ptr<stream> _str;
+ std::auto_ptr<SWFStream> _str;
std::auto_ptr<tu_file> _in;
Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- server/parser/shape_character_def.cpp 9 Jun 2008 08:15:11 -0000
1.74
+++ server/parser/shape_character_def.cpp 9 Jun 2008 10:18:25 -0000
1.75
@@ -54,7 +54,7 @@
// Read fill styles, and push them onto the given style array.
static void
- read_fill_styles(std::vector<fill_style>& styles, stream* in,
+ read_fill_styles(std::vector<fill_style>& styles, SWFStream* in,
int tag_type, movie_definition* m)
{
@@ -90,7 +90,7 @@
}
static void
- read_line_styles(std::vector<line_style>& styles, stream* in, int
tag_type,
+ read_line_styles(std::vector<line_style>& styles, SWFStream* in, int
tag_type,
movie_definition *md)
// Read line styles and push them onto the back of the given array.
{
@@ -154,7 +154,7 @@
}
void
- shape_character_def::read(stream* in, int tag_type, bool with_style,
+ shape_character_def::read(SWFStream* in, int tag_type, bool with_style,
movie_definition* m)
{
if (with_style)
Index: server/parser/shape_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/parser/shape_character_def.h 29 Apr 2008 11:29:05 -0000 1.23
+++ server/parser/shape_character_def.h 9 Jun 2008 10:18:25 -0000 1.24
@@ -18,6 +18,7 @@
namespace gnash {
+ class SWFStream;
class cxform;
class matrix;
}
@@ -74,7 +75,7 @@
/// This is used to resolve bitmap characters for fill
styles, never
/// used if with_style is false.
///
- void read(stream* in, int tag_type, bool with_style,
movie_definition* m);
+ void read(SWFStream* in, int tag_type, bool with_style,
movie_definition* m);
void display(
const matrix& mat,
Index: server/parser/sound_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sound_definition.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/sound_definition.h 30 Apr 2008 12:21:35 -0000 1.12
+++ server/parser/sound_definition.h 9 Jun 2008 10:18:25 -0000 1.13
@@ -26,7 +26,6 @@
// Forward declarations
namespace gnash {
class movie_definition;
- class stream;
}
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/parser/sprite_definition.cpp 3 Jun 2008 08:26:22 -0000 1.37
+++ server/parser/sprite_definition.cpp 9 Jun 2008 10:18:25 -0000 1.38
@@ -25,6 +25,7 @@
#include "sprite_definition.h"
#include "ControlTag.h" // for dtor visibility
#include "as_function.h" // for dtor visibility
+#include "stream.h" // for use
#include <vector>
#include <string>
@@ -66,7 +67,7 @@
/*private*/
// only called from constructors
void
-sprite_definition::read(stream* in)
+sprite_definition::read(SWFStream* in)
{
unsigned long tag_end = in->get_tag_end_position();
@@ -185,7 +186,7 @@
return true;
}
-sprite_definition::sprite_definition(movie_definition* m, stream* in)
+sprite_definition::sprite_definition(movie_definition* m, SWFStream* in)
:
// FIXME: use a class-static TagLoadersTable for sprite_definition
_tag_loaders(SWF::TagLoadersTable::getInstance()),
Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/parser/sprite_definition.h 30 May 2008 20:23:51 -0000 1.44
+++ server/parser/sprite_definition.h 9 Jun 2008 10:18:26 -0000 1.45
@@ -24,12 +24,16 @@
#include <vector>
#include <map>
#include "smart_ptr.h" // GNASH_USE_GC
-#include "movie_definition.h"
-#include "stream.h"
+#include "movie_definition.h" // for inheritance
#include "log.h"
#include "rect.h"
#include "StringPredicates.h" // StringNoCaseLessThen
+// Forward declarations
+namespace gnash {
+ class SWFStream; // for read signature
+}
+
namespace gnash
{
@@ -57,7 +61,7 @@
/// The stream associated with the sprite. It is assumed
/// to be already positioned right before the frame count
///
- sprite_definition(movie_definition* m, stream* in);
+ sprite_definition(movie_definition* m, SWFStream* in);
/// Destructor, releases playlist data
~sprite_definition();
@@ -232,7 +236,7 @@
private:
- void read(stream* in);
+ void read(SWFStream* in);
/// Tags loader table.
//
Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/text_character_def.cpp 29 May 2008 10:34:56 -0000
1.12
+++ server/parser/text_character_def.cpp 9 Jun 2008 10:18:26 -0000
1.13
@@ -14,7 +14,7 @@
namespace gnash {
-void text_character_def::read(stream* in, int tag_type,
+void text_character_def::read(SWFStream* in, int tag_type,
movie_definition* m)
{
assert(m != NULL);
Index: server/parser/text_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/text_character_def.h 29 May 2008 10:34:56 -0000 1.12
+++ server/parser/text_character_def.h 9 Jun 2008 10:18:26 -0000 1.13
@@ -32,7 +32,8 @@
namespace gnash {
-class movie_definition;
+class movie_definition; // for read signature
+class SWFStream; // for read signature
/// Text character
//
@@ -48,7 +49,7 @@
text_character_def() {}
- void read(stream* in, int tag_type, movie_definition* m);
+ void read(SWFStream* in, int tag_type, movie_definition* m);
/// Draw the string.
void display(character* inst);
Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/parser/video_stream_def.cpp 3 Jun 2008 16:11:45 -0000 1.48
+++ server/parser/video_stream_def.cpp 9 Jun 2008 10:18:27 -0000 1.49
@@ -24,6 +24,7 @@
#include "MediaHandler.h"
#include "MediaParser.h" // for VideoInfo
#include "VideoDecoder.h"
+#include "stream.h" // for read()
#include <boost/bind.hpp>
@@ -48,7 +49,7 @@
void
-video_stream_definition::readDefineVideoStream(stream* in, SWF::tag_type tag,
movie_definition* m)
+video_stream_definition::readDefineVideoStream(SWFStream* in, SWF::tag_type
tag, movie_definition* m)
{
// Character ID has been read already, and was loaded in the constructor
@@ -102,7 +103,7 @@
}
void
-video_stream_definition::readDefineVideoFrame(stream* in, SWF::tag_type tag,
movie_definition* m)
+video_stream_definition::readDefineVideoFrame(SWFStream* in, SWF::tag_type
tag, movie_definition* m)
{
// Character ID has been read already, and was loaded in the constructor
Index: server/parser/video_stream_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/parser/video_stream_def.h 3 Jun 2008 14:48:55 -0000 1.29
+++ server/parser/video_stream_def.h 9 Jun 2008 10:18:27 -0000 1.30
@@ -25,7 +25,6 @@
#endif
#include "character_def.h"
-#include "stream.h" // for read()
#include "movie_definition.h"
#include "swf.h"
#include "rect.h" // for composition
@@ -43,6 +42,9 @@
namespace gnash {
+// Forward declarations
+class SWFStream;
+
/// Class used to store data for the undecoded embedded video frames.
/// Contains the data, the data size and the type of the frame
@@ -89,7 +91,7 @@
/// This function is allowed to be called only *once* for each
/// instance of this class.
///
- void readDefineVideoStream(stream* in, SWF::tag_type tag,
movie_definition* m);
+ void readDefineVideoStream(SWFStream* in, SWF::tag_type tag,
movie_definition* m);
/// Read tag SWF::VIDEOFRAME
//
@@ -99,7 +101,7 @@
/// This function is allowed to be called zero or more times, as long
/// as readDefineVideoStream was read before.
///
- void readDefineVideoFrame(stream* in, SWF::tag_type tag,
movie_definition* m);
+ void readDefineVideoFrame(SWFStream* in, SWF::tag_type tag,
movie_definition* m);
/// Return local video bounds in twips
const rect& get_bound() const
Index: server/swf/DefineFontAlignZonesTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DefineFontAlignZonesTag.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/swf/DefineFontAlignZonesTag.cpp 4 Jun 2008 15:07:39 -0000
1.10
+++ server/swf/DefineFontAlignZonesTag.cpp 9 Jun 2008 10:18:27 -0000
1.11
@@ -29,13 +29,13 @@
namespace SWF {
DefineFontAlignZonesTag::DefineFontAlignZonesTag(movie_definition& /* m */,
- stream& /* in */)
+ SWFStream& /* in */)
{
}
/* public static */
void
-DefineFontAlignZonesTag::loader(stream* in, tag_type tag, movie_definition* m)
+DefineFontAlignZonesTag::loader(SWFStream* in, tag_type tag, movie_definition*
m)
{
assert(tag == SWF::DEFINEALIGNZONES); // 73
Index: server/swf/DefineFontAlignZonesTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DefineFontAlignZonesTag.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/swf/DefineFontAlignZonesTag.h 5 Mar 2008 03:56:03 -0000
1.7
+++ server/swf/DefineFontAlignZonesTag.h 9 Jun 2008 10:18:27 -0000
1.8
@@ -26,7 +26,7 @@
// Forward declarations
namespace gnash {
class movie_definition;
- class stream;
+ class SWFStream;
}
namespace gnash {
@@ -41,9 +41,9 @@
THICK = 2
};
- DefineFontAlignZonesTag(movie_definition& m, stream& in);
+ DefineFontAlignZonesTag(movie_definition& m, SWFStream& in);
- static void loader(stream* in, tag_type tag, movie_definition* m);
+ static void loader(SWFStream* in, tag_type tag, movie_definition* m);
private:
Index: server/swf/DoActionTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DoActionTag.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/swf/DoActionTag.h 4 Jun 2008 07:59:12 -0000 1.14
+++ server/swf/DoActionTag.h 9 Jun 2008 10:18:27 -0000 1.15
@@ -47,7 +47,7 @@
/// Read a DoAction block from the stream
//
- void read(stream* in)
+ void read(SWFStream* in)
{
m_buf.read(*in, in->get_tag_end_position());
}
@@ -63,7 +63,7 @@
return true;
}
- static void doActionLoader(stream* in, tag_type tag, movie_definition*
m)
+ static void doActionLoader(SWFStream* in, tag_type tag,
movie_definition* m)
{
DoActionTag* da = new DoActionTag(*m);
da->read(in);
Index: server/swf/DoInitActionTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DoInitActionTag.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/swf/DoInitActionTag.h 3 Jun 2008 08:30:07 -0000 1.10
+++ server/swf/DoInitActionTag.h 9 Jun 2008 10:18:28 -0000 1.11
@@ -40,7 +40,7 @@
{
public:
- DoInitActionTag(stream& in, movie_definition& md, int cid)
+ DoInitActionTag(SWFStream& in, movie_definition& md, int cid)
:
_buf(md),
_cid(cid)
@@ -64,7 +64,7 @@
return true;
}
- static void doInitActionLoader(stream* in, tag_type tag, movie_definition*
m)
+ static void doInitActionLoader(SWFStream* in, tag_type tag,
movie_definition* m)
{
in->ensureBytes(2);
int cid = in->read_u16();
@@ -81,9 +81,9 @@
private:
- /// Read a DoInitAction block from the stream
+ /// Read a DoInitAction block from the SWFStream
//
- void read(stream& in)
+ void read(SWFStream& in)
{
_buf.read(in, in.get_tag_end_position());
}
Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/swf/PlaceObject2Tag.cpp 3 Jun 2008 12:27:26 -0000 1.46
+++ server/swf/PlaceObject2Tag.cpp 9 Jun 2008 10:18:28 -0000 1.47
@@ -29,7 +29,7 @@
namespace SWF {
void
-PlaceObject2Tag::readPlaceObject(stream& in)
+PlaceObject2Tag::readPlaceObject(SWFStream& in)
{
// Original place_object tag; very simple.
in.ensureBytes(2 + 2);
@@ -59,7 +59,7 @@
// read placeObject2 actions
void
-PlaceObject2Tag::readPlaceActions(stream& in)
+PlaceObject2Tag::readPlaceActions(SWFStream& in)
{
int movie_version = _movie_def.get_version();
@@ -226,7 +226,7 @@
// read SWF::PLACEOBJECT2
void
-PlaceObject2Tag::readPlaceObject2(stream& in)
+PlaceObject2Tag::readPlaceObject2(SWFStream& in)
{
in.align();
@@ -301,7 +301,7 @@
// read SWF::PLACEOBJECT3
void
-PlaceObject2Tag::readPlaceObject3(stream& in)
+PlaceObject2Tag::readPlaceObject3(SWFStream& in)
{
in.align();
@@ -438,7 +438,7 @@
}
void
-PlaceObject2Tag::read(stream& in, tag_type tag)
+PlaceObject2Tag::read(SWFStream& in, tag_type tag)
{
m_tag_type = tag;
@@ -497,7 +497,7 @@
/* public static */
void
-PlaceObject2Tag::loader(stream* in, tag_type tag, movie_definition* m)
+PlaceObject2Tag::loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::PLACEOBJECT || tag == SWF::PLACEOBJECT2 || tag ==
SWF::PLACEOBJECT3);
Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/swf/PlaceObject2Tag.h 30 Apr 2008 09:15:11 -0000 1.26
+++ server/swf/PlaceObject2Tag.h 9 Jun 2008 10:18:28 -0000 1.27
@@ -32,7 +32,7 @@
// Forward declarations
namespace gnash {
- class stream;
+ class SWFStream;
class sprite_instance;
class swf_event;
class action_buffer;
@@ -109,12 +109,12 @@
~PlaceObject2Tag();
/// Read SWF::PLACEOBJECT or SWF::PLACEOBJECT2
- void read(stream& in, tag_type tag);
+ void read(SWFStream& in, tag_type tag);
/// Place/move/whatever our object in the given movie.
void execute(sprite_instance* m, DisplayList& dlist) const;
- static void loader(stream* in, tag_type tag, movie_definition* m);
+ static void loader(SWFStream* in, tag_type tag, movie_definition* m);
int getPlaceType() const { return m_has_flags2 & (HAS_CHARACTER_MASK |
MOVE_MASK); }
int getRatio() const { return m_ratio; }
@@ -188,16 +188,16 @@
EventHandlers m_event_handlers;
// read SWF::PLACEOBJECT
- void readPlaceObject(stream& in);
+ void readPlaceObject(SWFStream& in);
// read placeObject2 actions
- void readPlaceActions(stream& in);
+ void readPlaceActions(SWFStream& in);
// read SWF::PLACEOBJECT2
- void readPlaceObject2(stream& in);
+ void readPlaceObject2(SWFStream& in);
// read SWF::PLACEOBJECT3
- void readPlaceObject3(stream& in);
+ void readPlaceObject3(SWFStream& in);
};
Index: server/swf/RemoveObjectTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/RemoveObjectTag.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/swf/RemoveObjectTag.cpp 3 Jun 2008 08:30:07 -0000 1.11
+++ server/swf/RemoveObjectTag.cpp 9 Jun 2008 10:18:28 -0000 1.12
@@ -28,7 +28,7 @@
namespace SWF {
void
-RemoveObjectTag::read(stream* in, tag_type tag)
+RemoveObjectTag::read(SWFStream* in, tag_type tag)
{
assert(tag == SWF::REMOVEOBJECT || tag == SWF::REMOVEOBJECT2);
@@ -54,7 +54,7 @@
/* public static */
void
-RemoveObjectTag::loader(stream* in, tag_type tag, movie_definition* m)
+RemoveObjectTag::loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::REMOVEOBJECT || tag == SWF::REMOVEOBJECT2);
Index: server/swf/RemoveObjectTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/RemoveObjectTag.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/swf/RemoveObjectTag.h 30 Apr 2008 09:15:11 -0000 1.10
+++ server/swf/RemoveObjectTag.h 9 Jun 2008 10:18:28 -0000 1.11
@@ -29,7 +29,7 @@
// Forward declarations
namespace gnash {
- class stream;
+ class SWFStream;
class sprite_instance;
class swf_event;
class movie_definition;
@@ -56,12 +56,12 @@
{}
/// Read SWF::REMOVEOBJECT or SWF::REMOVEOBJECT2
- void read(stream* in, tag_type tag);
+ void read(SWFStream* in, tag_type tag);
/// Remove object at specified depth from sprite_instance DisplayList.
void execute(sprite_instance* m, DisplayList& dlist) const;
- static void loader(stream* in, tag_type tag, movie_definition* m);
+ static void loader(SWFStream* in, tag_type tag, movie_definition* m);
private:
Index: server/swf/ScriptLimitsTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ScriptLimitsTag.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/swf/ScriptLimitsTag.h 4 Jun 2008 19:54:12 -0000 1.2
+++ server/swf/ScriptLimitsTag.h 9 Jun 2008 10:18:28 -0000 1.3
@@ -33,7 +33,7 @@
/// movie_root is overridden.
namespace ScriptLimitsTag
{
- void loader(stream* in, tag_type tag, movie_definition* /*m*/)
+ void loader(SWFStream* in, tag_type tag, movie_definition* /*m*/)
{
assert(VM::isInitialized());
Index: server/swf/SetBackgroundColorTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/SetBackgroundColorTag.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/swf/SetBackgroundColorTag.h 18 May 2008 20:36:13 -0000 1.4
+++ server/swf/SetBackgroundColorTag.h 9 Jun 2008 10:18:28 -0000 1.5
@@ -32,7 +32,7 @@
// Forward declarations
namespace gnash {
- class stream;
+ class SWFStream;
class movie_definition;
}
@@ -56,7 +56,7 @@
///
/// Can throw ParserException on premature end of input stream
///
- void read(stream& in)
+ void read(SWFStream& in)
{
// may throw ParserException
m_color.read_rgb(&in);
@@ -77,7 +77,7 @@
///
/// Can throw ParserException on premature end of input stream
///
- SetBackgroundColorTag(stream& in)
+ SetBackgroundColorTag(SWFStream& in)
{
read(in);
}
@@ -96,7 +96,7 @@
}
/// Set background color tag loader (SWF::SETBACKGROUNDCOLOR)
- static void loader(stream* in, tag_type tag, movie_definition* m)
+ static void loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::SETBACKGROUNDCOLOR); // 9
assert(m);
Index: server/swf/StartSoundTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StartSoundTag.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/swf/StartSoundTag.cpp 28 May 2008 08:32:35 -0000 1.13
+++ server/swf/StartSoundTag.cpp 9 Jun 2008 10:18:28 -0000 1.14
@@ -29,7 +29,7 @@
/* public static */
void
-StartSoundTag::loader(stream* in, tag_type tag, movie_definition* m)
+StartSoundTag::loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::STARTSOUND); // 15
@@ -69,7 +69,7 @@
/* private */
void
-StartSoundTag::read(stream& in)
+StartSoundTag::read(SWFStream& in)
{
in.align();
in.ensureBytes(1); // header
Index: server/swf/StartSoundTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StartSoundTag.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/swf/StartSoundTag.h 30 Apr 2008 10:09:45 -0000 1.7
+++ server/swf/StartSoundTag.h 9 Jun 2008 10:18:28 -0000 1.8
@@ -32,7 +32,7 @@
// Forward declarations
namespace gnash {
- class stream;
+ class SWFStream;
class movie_definition;
class sound_sample;
}
@@ -84,12 +84,12 @@
///
std::vector<media::sound_handler::sound_envelope> m_envelopes;
- /// Initialize this StartSoundTag from the stream
+ /// Initialize this StartSoundTag from the SWFStream
//
/// The stream is assumed to be positioned right after the
/// sound_id field of the tag structure.
///
- void read(stream& in);
+ void read(SWFStream& in);
/// Create a StartSoundTag for starting the given sound sample
@@ -110,7 +110,7 @@
void execute(sprite_instance* /* m */, DisplayList& /* dlist */)
const;
/// Load a SWF::STARTSOUND tag.
- static void loader(stream* in, tag_type tag, movie_definition* m);
+ static void loader(SWFStream* in, tag_type tag, movie_definition* m);
};
Index: server/swf/StreamSoundBlockTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StreamSoundBlockTag.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/swf/StreamSoundBlockTag.cpp 3 Jun 2008 08:35:05 -0000 1.2
+++ server/swf/StreamSoundBlockTag.cpp 9 Jun 2008 10:18:28 -0000 1.3
@@ -45,7 +45,7 @@
/* public static */
void
-StreamSoundBlockTag::loader(stream* in, tag_type tag, movie_definition* m)
+StreamSoundBlockTag::loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::SOUNDSTREAMBLOCK); // 19
Index: server/swf/StreamSoundBlockTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StreamSoundBlockTag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/StreamSoundBlockTag.h 30 Apr 2008 12:21:36 -0000 1.1
+++ server/swf/StreamSoundBlockTag.h 9 Jun 2008 10:18:28 -0000 1.2
@@ -30,7 +30,7 @@
// Forward declarations
namespace gnash {
- class stream;
+ class SWFStream;
class movie_definition;
}
@@ -81,7 +81,7 @@
void execute(sprite_instance* m, DisplayList& /*dlist*/) const;
/// Load an SWF::SOUNDSTREAMBLOCK (19) tag.
- static void loader(stream* in, tag_type tag, movie_definition* m);
+ static void loader(SWFStream* in, tag_type tag, movie_definition* m);
/// Not a "state" (DisplayList?) tag, do doesn't need to provide
execute_state
//void execute_state(sprite_instance* m) const {}
Index: server/swf/TagLoadersTable.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/TagLoadersTable.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/swf/TagLoadersTable.h 21 Jan 2008 20:56:03 -0000 1.10
+++ server/swf/TagLoadersTable.h 9 Jun 2008 10:18:28 -0000 1.11
@@ -28,7 +28,7 @@
// Forward declarations
namespace gnash {
- class stream;
+ class SWFStream;
class movie_definition;
}
@@ -47,7 +47,7 @@
/// 'm' a pointer to the movie (or sprite) being read
///
typedef void (*loader_function)(
- stream* input, tag_type type, movie_definition* m);
+ SWFStream* input, tag_type type, movie_definition* m);
/// \brief
/// Get a pointer to the loader_function for the
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -b -r1.206 -r1.207
--- server/swf/tag_loaders.cpp 9 Jun 2008 08:15:12 -0000 1.206
+++ server/swf/tag_loaders.cpp 9 Jun 2008 10:18:28 -0000 1.207
@@ -78,12 +78,12 @@
/// Provide a tu_file interface around a gnash::stream
class StreamAdapter
{
- stream& s;
+ SWFStream& s;
unsigned long startPos;
unsigned long endPos;
unsigned long currPos;
- StreamAdapter(stream& str, unsigned long maxPos)
+ StreamAdapter(SWFStream& str, unsigned long maxPos)
:
s(str),
startPos(s.get_position()),
@@ -130,8 +130,8 @@
public:
- /// Get a tu_file from a gnash::stream
- static std::auto_ptr<tu_file> getFile(stream& str, unsigned long endPos)
+ /// Get a tu_file from a gnash::SWFStream
+ static std::auto_ptr<tu_file> getFile(SWFStream& str, unsigned long
endPos)
{
std::auto_ptr<tu_file> ret (
new tu_file (
@@ -165,13 +165,13 @@
// Silently ignore the contents of this tag.
-void null_loader(stream* /*in*/, tag_type /*tag*/, movie_definition* /*m*/)
+void null_loader(SWFStream* /*in*/, tag_type /*tag*/, movie_definition* /*m*/)
{
}
-// Label the current frame of m with the name from the stream.
+// Label the current frame of m with the name from the SWFStream.
void
-frame_label_loader(stream* in, tag_type tag, movie_definition* m)
+frame_label_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::FRAMELABEL); // 43
@@ -186,9 +186,9 @@
// if it is 1 this label can be accessed by #name and it's
// entrance sets the browser URL with anchor appended
//
- // To avoid relaying on stream::get_position (see task #5838)
+ // To avoid relaying on SWFStream::get_position (see task #5838)
// we should add a new method to that class
- // (ie: stream::current_tag_length)
+ // (ie: SWFStream::current_tag_length)
//
// See server/sample/test_clipping_layer.swf for a testcase.
//
@@ -212,9 +212,9 @@
}
// Load JPEG compression tables that can be used to load
-// images further along in the stream.
+// images further along in the SWFStream.
void
-jpeg_tables_loader(stream* in, tag_type tag, movie_definition* m)
+jpeg_tables_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
//GNASH_REPORT_FUNCTION;
assert(tag == SWF::JPEGTABLES);
@@ -240,12 +240,12 @@
try
{
- // NOTE: we can NOT limit input stream here as the same jpeg::input
+ // NOTE: we can NOT limit input SWFStream here as the same jpeg::input
// instance will be used for reading subsequent DEFINEBITS and similar
// tags, which are *different* tags, so have different boundaries !!
//
// Anyway the actual reads are limited to currently opened tag as
- // of gnash::stream::read(), so this is not a problem.
+ // of gnash::SWFStream::read(), so this is not a problem.
//
std::auto_ptr<tu_file> ad( StreamAdapter::getFile(*in,
std::numeric_limits<unsigned long>::max()) );
// transfer ownership to the jpeg::input
@@ -268,7 +268,7 @@
// A JPEG image without included tables; those should be in an
// existing jpeg::input object stored in the movie.
void
-define_bits_jpeg_loader(stream* in, tag_type tag, movie_definition* m)
+define_bits_jpeg_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINEBITS); // 6
assert(in);
@@ -322,7 +322,7 @@
void
-define_bits_jpeg2_loader(stream* in, tag_type tag, movie_definition* m)
+define_bits_jpeg2_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINEBITSJPEG2); // 21
@@ -357,7 +357,7 @@
#ifdef HAVE_ZLIB_H
-void inflate_wrapper(stream& in, void* buffer, int buffer_bytes)
+void inflate_wrapper(SWFStream& in, void* buffer, int buffer_bytes)
// Wrapper function -- uses Zlib to uncompress in_bytes worth
// of data from the input file into buffer_bytes worth of data
// into *buffer.
@@ -365,7 +365,7 @@
assert(buffer);
assert(buffer_bytes > 0);
- z_stream d_stream; /* decompression stream */
+ z_stream d_stream; /* decompression SWFStream */
d_stream.zalloc = (alloc_func)0;
d_stream.zfree = (free_func)0;
@@ -442,7 +442,7 @@
// loads a define_bits_jpeg3 tag. This is a jpeg file with an alpha
// channel using zlib compression.
void
-define_bits_jpeg3_loader(stream* in, tag_type tag, movie_definition* m)
+define_bits_jpeg3_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINEBITSJPEG3); // 35
@@ -502,7 +502,7 @@
void
-define_bits_lossless_2_loader(stream* in, tag_type tag, movie_definition* m)
+define_bits_lossless_2_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
// tags 20 || 36
assert(tag == SWF::DEFINELOSSLESS || tag == SWF::DEFINELOSSLESS2);
@@ -764,7 +764,7 @@
// This is like null_loader except it prints a message to nag us to fix it.
void
-fixme_loader(stream* /*in*/, tag_type tag, movie_definition* /*m*/)
+fixme_loader(SWFStream* /*in*/, tag_type tag, movie_definition* /*m*/)
{
static std::map<tag_type, bool> warned;
if ( ! warned[tag] )
@@ -774,7 +774,7 @@
}
}
-void define_shape_loader(stream* in, tag_type tag, movie_definition* m)
+void define_shape_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINESHAPE
|| tag == SWF::DEFINESHAPE2
@@ -794,7 +794,7 @@
m->add_character(character_id, ch);
}
-void define_shape_morph_loader(stream* in, tag_type tag, movie_definition* m)
+void define_shape_morph_loader(SWFStream* in, tag_type tag, movie_definition*
m)
{
assert(tag == SWF::DEFINEMORPHSHAPE
|| tag == SWF::DEFINEMORPHSHAPE2
@@ -818,7 +818,7 @@
//
-void define_font_loader(stream* in, tag_type tag, movie_definition* m)
+void define_font_loader(SWFStream* in, tag_type tag, movie_definition* m)
// Load a DefineFont or DefineFont2 tag.
{
assert(tag == SWF::DEFINEFONT
@@ -841,7 +841,7 @@
// See description in header
-void define_font_info_loader(stream* in, tag_type tag, movie_definition* m)
+void define_font_info_loader(SWFStream* in, tag_type tag, movie_definition*
m)
{
assert(tag == SWF::DEFINEFONTINFO || tag == SWF::DEFINEFONTINFO2);
@@ -863,7 +863,7 @@
}
// Set font name for a font.
-void define_font_name_loader(stream* in, tag_type tag, movie_definition* m)
+void define_font_name_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINEFONTNAME);
@@ -886,7 +886,7 @@
// Create and initialize a sprite, and add it to the movie.
void
-sprite_loader(stream* in, tag_type tag, movie_definition* m)
+sprite_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINESPRITE); // 39 - DefineSprite
@@ -929,7 +929,7 @@
// end_tag doesn't actually need to exist.
-void button_sound_loader(stream* in, tag_type tag, movie_definition* m)
+void button_sound_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINEBUTTONSOUND); // 17
@@ -960,7 +960,7 @@
}
-void button_character_loader(stream* in, tag_type tag, movie_definition* m)
+void button_character_loader(SWFStream* in, tag_type tag, movie_definition*
m)
{
// 7 || 34
assert(tag == SWF::DEFINEBUTTON || tag == SWF::DEFINEBUTTON2);
@@ -985,7 +985,7 @@
//
-void export_loader(stream* in, tag_type tag, movie_definition* m)
+void export_loader(SWFStream* in, tag_type tag, movie_definition* m)
// Load an export tag (for exposing internal resources of m)
{
assert(tag == SWF::EXPORTASSETS); // 56
@@ -1053,7 +1053,7 @@
//
-void import_loader(stream* in, tag_type tag, movie_definition* m)
+void import_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::IMPORTASSETS || tag == SWF::IMPORTASSETS2);
@@ -1128,7 +1128,7 @@
}
// Read a DefineText tag.
-void define_edit_text_loader(stream* in, tag_type tag, movie_definition* m)
+void define_edit_text_loader(SWFStream* in, tag_type tag, movie_definition*
m)
{
assert(tag == SWF::DEFINEEDITTEXT); // 37
@@ -1147,7 +1147,7 @@
// See description in header
void
-define_text_loader(stream* in, tag_type tag, movie_definition* m)
+define_text_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINETEXT || tag == SWF::DEFINETEXT2);
@@ -1188,7 +1188,7 @@
// Load a DefineSound tag.
void
-define_sound_loader(stream* in, tag_type tag, movie_definition* m)
+define_sound_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINESOUND); // 14
@@ -1261,7 +1261,7 @@
if (bytesRead < dataLength)
{
- throw ParserException(_("Tag boundary reported past end of
stream!"));
+ throw ParserException(_("Tag boundary reported past end of
SWFStream!"));
}
// Store all the data in a SoundInfo object
@@ -1292,7 +1292,7 @@
// Load a SoundStreamHead(2) tag.
void
-sound_stream_head_loader(stream* in, tag_type tag, movie_definition* m)
+sound_stream_head_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
media::sound_handler* handler = get_sound_handler();
@@ -1304,11 +1304,11 @@
// FIXME:
// no character id for soundstreams... so we make one up...
- // This only works if there is only one stream in the movie...
+ // This only works if there is only one SWFStream in the movie...
// The right way to do it is to make seperate structures for streams
// in SWFMovieDefinition.
- // 1 byte for playback info, 1 for stream info, 2 for sample count
+ // 1 byte for playback info, 1 for SWFStream info, 2 for sample count
in->ensureBytes(4);
// These are all unused by current implementation
@@ -1333,7 +1333,7 @@
if ( stSoundRate >= s_sample_rate_table_len )
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_("SOUNDSTREAMHEAD: stream sample rate %d (expected 0 to
%u)"),
+ log_swferror(_("SOUNDSTREAMHEAD: SWFStream sample rate %d (expected 0
to %u)"),
stSoundRate, s_sample_rate_table_len);
);
stSoundRate=0;
@@ -1345,7 +1345,7 @@
if ( playbackSoundRate != streamSoundRate )
{
LOG_ONCE(
- log_unimpl(_("Different stream/playback sound rate (%d/%d). "
+ log_unimpl(_("Different SWFStream/playback sound rate (%d/%d). "
"This seems common in SWF files, so we'll warn only
once."),
streamSoundRate,playbackSoundRate)
);
@@ -1354,7 +1354,7 @@
if ( playbackSound16bit != streamSound16bit )
{
LOG_ONCE(
- log_unimpl(_("Different stream/playback sample size (%d/%d). "
+ log_unimpl(_("Different SWFStream/playback sample size (%d/%d). "
"This seems common in SWF files, so we'll warn only
once."),
streamSound16bit ? 16 : 32,
playbackSound16bit ? 16 : 32 )
@@ -1363,7 +1363,7 @@
if ( playbackSoundStereo != streamSoundStereo )
{
LOG_ONCE(
- log_unimpl(_("Different stream/playback channels (%s/%s). "
+ log_unimpl(_("Different SWFStream/playback channels (%s/%s). "
"This seems common in SWF files, so we'll warn only
once."),
streamSoundStereo ? "stereo" : "mono",
playbackSoundStereo ? "stereo":"mono")
@@ -1381,7 +1381,7 @@
// this seems common too, we'd need to reproduce with a custom
// testcase to really tell if it's a problem or not...
IF_VERBOSE_MALFORMED_SWF(
- LOG_ONCE( log_swferror(_("No samples advertised for sound stream,
pretty common so will warn only once")) );
+ LOG_ONCE( log_swferror(_("No samples advertised for sound SWFStream,
pretty common so will warn only once")) );
);
}
@@ -1392,14 +1392,14 @@
{
in->ensureBytes(2);
latency = in->read_s16(); // UNUSED !!
- LOG_ONCE ( if ( latency ) log_unimpl("MP3 stream latency seek")
);
+ LOG_ONCE ( if ( latency ) log_unimpl("MP3 SWFStream latency
seek") );
}
catch (ParserException& ex)
{
// See https://savannah.gnu.org/bugs/?21729 for an example
// triggering this.
IF_VERBOSE_MALFORMED_SWF(
- log_swferror("MP3 sound stream lacks a 'latency' field");
+ log_swferror("MP3 sound SWFStream lacks a 'latency' field");
);
}
//garbage = in->read_uint(16);
@@ -1407,7 +1407,7 @@
IF_VERBOSE_PARSE
(
- log_parse(_("sound stream head: format=%d, rate=%d, 16=%d, stereo=%d,
ct=%d, latency=%d"),
+ log_parse(_("sound SWFStream head: format=%d, rate=%d, 16=%d,
stereo=%d, ct=%d, latency=%d"),
int(format), streamSoundRate, int(streamSound16bit),
int(streamSoundStereo), sampleCount, latency);
);
@@ -1425,7 +1425,7 @@
}
void
-define_video_loader(stream* in, tag_type tag, movie_definition* m)
+define_video_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINEVIDEOSTREAM); // 60
@@ -1440,7 +1440,7 @@
}
void
-video_loader(stream* in, tag_type tag, movie_definition* m)
+video_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::VIDEOFRAME); // 61
@@ -1451,7 +1451,7 @@
if ( ! chdef )
{
IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_("VideoFrame tag refers to unknown video stream id %d"),
character_id);
+ log_swferror(_("VideoFrame tag refers to unknown video SWFStream id
%d"), character_id);
);
return;
}
@@ -1470,7 +1470,7 @@
}
void
-file_attributes_loader(stream* in, tag_type tag, movie_definition* /*m*/)
+file_attributes_loader(SWFStream* in, tag_type tag, movie_definition* /*m*/)
{
assert(tag == SWF::FILEATTRIBUTES); // 69
@@ -1511,12 +1511,12 @@
// - attach info to movie_definition.
// - don't allow later FileAttributes tags in the same movie
// to override the first one used.
- // - only use if it is the *first* tag in the stream.
+ // - only use if it is the *first* tag in the SWFStream.
}
void
-metadata_loader(stream* in, tag_type tag, movie_definition* m)
+metadata_loader(SWFStream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::METADATA); // 77
@@ -1556,7 +1556,7 @@
}
void
-serialnumber_loader(stream* in, tag_type tag, movie_definition* /*m*/)
+serialnumber_loader(SWFStream* in, tag_type tag, movie_definition* /*m*/)
{
assert(tag == SWF::SERIALNUMBER); // 41
@@ -1587,7 +1587,7 @@
}
void
-reflex_loader(stream* in, tag_type tag, movie_definition* /*m*/)
+reflex_loader(SWFStream* in, tag_type tag, movie_definition* /*m*/)
{
assert(tag == SWF::REFLEX); // 777
@@ -1605,7 +1605,7 @@
}
void
-abc_loader(stream* in, tag_type tag, movie_definition* /*m*/)
+abc_loader(SWFStream* in, tag_type tag, movie_definition* /*m*/)
{
assert(tag == SWF::DOABC
|| tag == SWF::DOABCDEFINE); // 72 or 82
Index: server/swf/tag_loaders.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/swf/tag_loaders.h 4 Jun 2008 13:36:25 -0000 1.27
+++ server/swf/tag_loaders.h 9 Jun 2008 10:18:29 -0000 1.28
@@ -35,123 +35,123 @@
namespace tag_loaders {
/// Silently ignore the contents of this tag.
-void null_loader(stream*, tag_type, movie_definition*);
+void null_loader(SWFStream*, tag_type, movie_definition*);
/// This is like null_loader except it prints a message to nag us to fix it.
-void fixme_loader(stream*, tag_type, movie_definition*);
+void fixme_loader(SWFStream*, tag_type, movie_definition*);
/// \brief
/// Load JPEG compression tables that can be used to load
-/// images further along in the stream. (SWF::JPEGTABLES)
-void jpeg_tables_loader(stream*, tag_type, movie_definition*);
+/// images further along in the SWFStream. (SWF::JPEGTABLES)
+void jpeg_tables_loader(SWFStream*, tag_type, movie_definition*);
/// \brief
/// A JPEG image without included tables; those should be in an
/// existing jpeg::input object stored in the movie. (SWF::DEFINEBITS)
-void define_bits_jpeg_loader(stream*, tag_type, movie_definition*);
+void define_bits_jpeg_loader(SWFStream*, tag_type, movie_definition*);
/// Handler for SWF::DEFINEBITSJPEG2 tag
-void define_bits_jpeg2_loader(stream*, tag_type, movie_definition*);
+void define_bits_jpeg2_loader(SWFStream*, tag_type, movie_definition*);
/// \brief
/// Loads a define_bits_jpeg3 tag. This is a jpeg file with an alpha
/// channel using zlib compression. (SWF::DEFINEBITSJPEG3)
-void define_bits_jpeg3_loader(stream*, tag_type, movie_definition*);
+void define_bits_jpeg3_loader(SWFStream*, tag_type, movie_definition*);
-void define_shape_loader(stream*, tag_type, movie_definition*);
+void define_shape_loader(SWFStream*, tag_type, movie_definition*);
-void define_shape_morph_loader(stream*, tag_type, movie_definition*);
+void define_shape_morph_loader(SWFStream*, tag_type, movie_definition*);
/// SWF Tags DefineFont (10), DefineFont2 (48) and DefineFont3 (75)
//
/// Load a font and adds it the the movie definition.
///
-void define_font_loader(stream*, tag_type, movie_definition*);
+void define_font_loader(SWFStream*, tag_type, movie_definition*);
/// SWF Tags Reflex (777)
//
-void reflex_loader(stream*, tag_type, movie_definition*);
+void reflex_loader(SWFStream*, tag_type, movie_definition*);
/// SWF Tag DefineFontInfo (13 or 62)
//
/// Load a DefineFontInfo or DefineFontInfo2 tag.
/// This adds information to an existing font.
///
-void define_font_info_loader(stream*, tag_type, movie_definition*);
+void define_font_info_loader(SWFStream*, tag_type, movie_definition*);
/// SWF Tag DefineFontName (88)
// Load the display name and copyright string of a font.
// This adds to an existing font.
-void define_font_name_loader(stream*, tag_type, movie_definition*);
+void define_font_name_loader(SWFStream*, tag_type, movie_definition*);
/// Read SWF::DEFINETEXT and SWF::DEFINETEXT2 tags.
-void define_text_loader(stream*, tag_type, movie_definition*);
+void define_text_loader(SWFStream*, tag_type, movie_definition*);
/// Read an SWF::DEFINEEDITTEXT tag.
-void define_edit_text_loader(stream*, tag_type, movie_definition*);
+void define_edit_text_loader(SWFStream*, tag_type, movie_definition*);
-void place_object_2_loader(stream*, tag_type, movie_definition*);
+void place_object_2_loader(SWFStream*, tag_type, movie_definition*);
-void define_bits_lossless_2_loader(stream*, tag_type, movie_definition*);
+void define_bits_lossless_2_loader(SWFStream*, tag_type, movie_definition*);
/// Create and initialize a sprite, and add it to the movie.
//
/// Handles a SWF::DEFINESPRITE tag
///
-void sprite_loader(stream*, tag_type, movie_definition*);
+void sprite_loader(SWFStream*, tag_type, movie_definition*);
// end_tag doesn't actually need to exist.
// TODO: drop this loader ?
-void end_loader(stream* in, tag_type tag, movie_definition*)
+void end_loader(SWFStream* in, tag_type tag, movie_definition*)
{
assert(tag == SWF::END); // 0
assert(in->get_position() == in->get_tag_end_position());
}
-void remove_object_2_loader(stream*, tag_type, movie_definition*);
+void remove_object_2_loader(SWFStream*, tag_type, movie_definition*);
-void do_action_loader(stream*, tag_type, movie_definition*);
+void do_action_loader(SWFStream*, tag_type, movie_definition*);
-void button_character_loader(stream*, tag_type, movie_definition*);
+void button_character_loader(SWFStream*, tag_type, movie_definition*);
/// Label the current frame (SWF::FRAMELABEL)
-void frame_label_loader(stream*, tag_type, movie_definition*);
+void frame_label_loader(SWFStream*, tag_type, movie_definition*);
-void export_loader(stream*, tag_type, movie_definition*);
+void export_loader(SWFStream*, tag_type, movie_definition*);
/// Load an SWF::IMPORTASSETS or SWF::IMPORTASSETS2 tag (for pulling in
external resources)
-void import_loader(stream*, tag_type, movie_definition*);
+void import_loader(SWFStream*, tag_type, movie_definition*);
/// Load a SWF::DEFINESOUND tag.
-void define_sound_loader(stream*, tag_type, movie_definition*);
+void define_sound_loader(SWFStream*, tag_type, movie_definition*);
-void button_sound_loader(stream*, tag_type, movie_definition*);
+void button_sound_loader(SWFStream*, tag_type, movie_definition*);
-void do_init_action_loader(stream*, tag_type, movie_definition*);
+void do_init_action_loader(SWFStream*, tag_type, movie_definition*);
/// Load SWF::SOUNDSTREAMHEAD or SWF::SOUNDSTREAMHEAD2 tag.
-void sound_stream_head_loader(stream*, tag_type, movie_definition*);
+void sound_stream_head_loader(SWFStream*, tag_type, movie_definition*);
/// Load a SWF::SOUNDSTREAMBLOCK tag.
-void sound_stream_block_loader(stream*, tag_type, movie_definition*);
+void sound_stream_block_loader(SWFStream*, tag_type, movie_definition*);
-void abc_loader(stream*, tag_type, movie_definition*);
+void abc_loader(SWFStream*, tag_type, movie_definition*);
void
-define_video_loader(stream* in, tag_type tag, movie_definition* m);
+define_video_loader(SWFStream* in, tag_type tag, movie_definition* m);
void
-video_loader(stream* in, tag_type tag, movie_definition* m);
+video_loader(SWFStream* in, tag_type tag, movie_definition* m);
void
-file_attributes_loader(stream* in, tag_type tag, movie_definition* m);
+file_attributes_loader(SWFStream* in, tag_type tag, movie_definition* m);
void
-metadata_loader(stream* in, tag_type tag, movie_definition* m);
+metadata_loader(SWFStream* in, tag_type tag, movie_definition* m);
/// Load a SWF::SERIALNUMBER tag.
void
-serialnumber_loader(stream* in, tag_type tag, movie_definition* /*m*/);
+serialnumber_loader(SWFStream* in, tag_type tag, movie_definition* /*m*/);
} // namespace gnash::SWF::tag_loaders
} // namespace gnash::SWF
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libmedia/sound_handler.h server...,
Sandro Santilli <=