[Gnash-commit] /srv/bzr/gnash/trunk r9576: Rename stream.{h, cpp} to SWFStream.{h, cpp} to reflect the class name.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9576
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2008-08-11 19:05:07 +0200
message:
  Rename stream.{h,cpp} to SWFStream.{h,cpp} to reflect the class name.
  
  Add constructor to sprite_definition.cpp for creating an empty MovieClip;
  the SWFStream can then be passed by reference like everywhere else.
renamed:
  libcore/stream.cpp => libcore/SWFStream.cpp
  libcore/stream.h => libcore/SWFStream.h
modified:
  libcore/Makefile.am
  libcore/cxform.cpp
  libcore/fill_style.cpp
  libcore/font.cpp
  libcore/matrix.cpp
  libcore/parser/SWFMovieDefinition.cpp
  libcore/parser/SWFMovieDefinition.h
  libcore/parser/abc_block.cpp
  libcore/parser/action_buffer.cpp
  libcore/parser/button_character_def.cpp
  libcore/parser/edit_text_character_def.cpp
  libcore/parser/filter_factory.cpp
  libcore/parser/morph2_character_def.cpp
  libcore/parser/shape_character_def.cpp
  libcore/parser/sound_definition.cpp
  libcore/parser/sprite_definition.cpp
  libcore/parser/sprite_definition.h
  libcore/parser/text_character_def.cpp
  libcore/parser/video_stream_def.cpp
  libcore/rect.cpp
  libcore/sprite_instance.cpp
  libcore/styles.cpp
  libcore/swf/CSMTextSettingsTag.cpp
  libcore/swf/DefineButtonCxformTag.h
  libcore/swf/DefineFontAlignZonesTag.cpp
  libcore/swf/DoActionTag.h
  libcore/swf/DoInitActionTag.h
  libcore/swf/PlaceObject2Tag.cpp
  libcore/swf/RemoveObjectTag.cpp
  libcore/swf/ScriptLimitsTag.h
  libcore/swf/StartSoundTag.cpp
  libcore/swf/StreamSoundBlockTag.cpp
  libcore/swf/tag_loaders.cpp
  libcore/text.cpp
  libcore/types.cpp
  testsuite/libcore.all/StreamTest.cpp
  libcore/SWFStream.cpp
    ------------------------------------------------------------
    revno: 9575.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Sun 2008-08-10 17:49:15 +0200
    message:
      Add constructor taking just a movie_definition* instead of relying on the
      SWFStream* being NULL to create an empty sprite. Take SWFStream& by 
      reference when constructing from a stream.
    modified:
      libcore/parser/sprite_definition.cpp
      libcore/parser/sprite_definition.h
      libcore/sprite_instance.cpp
      libcore/swf/tag_loaders.cpp
    ------------------------------------------------------------
    revno: 9575.1.2
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Sun 2008-08-10 19:08:19 +0200
    message:
      Rename stream.{cpp,h} to SWFStream.{cpp,h} to reflect the class name.
    renamed:
      libcore/stream.cpp => libcore/SWFStream.cpp
      libcore/stream.h => libcore/SWFStream.h
    modified:
      libcore/Makefile.am
      libcore/cxform.cpp
      libcore/fill_style.cpp
      libcore/font.cpp
      libcore/matrix.cpp
      libcore/parser/SWFMovieDefinition.cpp
      libcore/parser/SWFMovieDefinition.h
      libcore/parser/abc_block.cpp
      libcore/parser/action_buffer.cpp
      libcore/parser/button_character_def.cpp
      libcore/parser/edit_text_character_def.cpp
      libcore/parser/filter_factory.cpp
      libcore/parser/morph2_character_def.cpp
      libcore/parser/shape_character_def.cpp
      libcore/parser/sound_definition.cpp
      libcore/parser/sprite_definition.cpp
      libcore/parser/text_character_def.cpp
      libcore/parser/video_stream_def.cpp
      libcore/rect.cpp
      libcore/styles.cpp
      libcore/swf/CSMTextSettingsTag.cpp
      libcore/swf/DefineButtonCxformTag.h
      libcore/swf/DefineFontAlignZonesTag.cpp
      libcore/swf/DoActionTag.h
      libcore/swf/DoInitActionTag.h
      libcore/swf/PlaceObject2Tag.cpp
      libcore/swf/RemoveObjectTag.cpp
      libcore/swf/ScriptLimitsTag.h
      libcore/swf/StartSoundTag.cpp
      libcore/swf/StreamSoundBlockTag.cpp
      libcore/swf/tag_loaders.cpp
      libcore/text.cpp
      libcore/types.cpp
      testsuite/libcore.all/StreamTest.cpp
      libcore/SWFStream.cpp

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2008-08-08 13:46:37 +0000
+++ b/libcore/Makefile.am       2008-08-10 17:08:19 +0000
@@ -100,7 +100,7 @@
        LoadVariablesThread.cpp \
        render.cpp \
        shape.cpp \
-       stream.cpp \
+       SWFStream.cpp \
        styles.cpp \
        text.cpp \
        timers.cpp \
@@ -166,7 +166,7 @@
        resource.h \
        shape.h \
        sprite_instance.h \
-       stream.h \
+       SWFStream.h \
        styles.h \
        swf.h \
        swf/TagLoadersTable.h \

=== renamed file 'libcore/stream.cpp' => 'libcore/SWFStream.cpp'
--- a/libcore/stream.cpp        2008-07-22 17:44:58 +0000
+++ b/libcore/SWFStream.cpp     2008-08-10 17:08:19 +0000
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-#include "stream.h"
+#include "SWFStream.h"
 
 #include "log.h"
 #include "types.h"
@@ -27,7 +27,6 @@
 
 #include <cstring>
 #include <climits>
-//#include <iostream> // debugging only
 
 //#define USE_TU_FILE_BYTESWAPPING 1
 

=== renamed file 'libcore/stream.h' => 'libcore/SWFStream.h'
=== modified file 'libcore/cxform.cpp'
--- a/libcore/cxform.cpp        2008-06-09 09:18:18 +0000
+++ b/libcore/cxform.cpp        2008-08-10 17:08:19 +0000
@@ -20,7 +20,7 @@
 
 #include "cxform.h"
 #include "types.h" // for rgba type :(
-#include "stream.h" // for reading from SWF
+#include "SWFStream.h" // for reading from SWF
 #include "log.h"
 #include "utility.h" // for utility::clamp
 #include <iomanip>

=== modified file 'libcore/fill_style.cpp'
--- a/libcore/fill_style.cpp    2008-08-10 14:57:21 +0000
+++ b/libcore/fill_style.cpp    2008-08-10 17:08:19 +0000
@@ -24,7 +24,7 @@
 #include "impl.h"
 #include "log.h"
 #include "render.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "movie_definition.h"
 #include "swf.h"
 #include "GnashException.h"

=== modified file 'libcore/font.cpp'
--- a/libcore/font.cpp  2008-08-10 14:57:21 +0000
+++ b/libcore/font.cpp  2008-08-10 17:08:19 +0000
@@ -22,7 +22,7 @@
 
 #include "smart_ptr.h" // GNASH_USE_GC
 #include "font.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "log.h"
 #include "movie_definition.h"
 #include "shape_character_def.h"

=== modified file 'libcore/matrix.cpp'
--- a/libcore/matrix.cpp        2008-07-09 07:33:34 +0000
+++ b/libcore/matrix.cpp        2008-08-10 17:08:19 +0000
@@ -26,7 +26,7 @@
 #endif
 
 #include "matrix.h"
-#include "stream.h" // for reading from SWF
+#include "SWFStream.h" // for reading from SWF
 
 #include <cmath>
 #include <iomanip>

=== modified file 'libcore/parser/SWFMovieDefinition.cpp'
--- a/libcore/parser/SWFMovieDefinition.cpp     2008-08-10 14:57:21 +0000
+++ b/libcore/parser/SWFMovieDefinition.cpp     2008-08-10 17:08:19 +0000
@@ -27,7 +27,7 @@
 #include "sprite_instance.h" // for ??
 #include "zlib_adapter.h"
 #include "IOChannel.h" // for use
-#include "stream.h"
+#include "SWFStream.h"
 #include "GnashImageJpeg.h"
 //#include "fontlib.h"
 #include "font.h"

=== modified file 'libcore/parser/SWFMovieDefinition.h'
--- a/libcore/parser/SWFMovieDefinition.h       2008-08-06 17:11:45 +0000
+++ b/libcore/parser/SWFMovieDefinition.h       2008-08-10 17:08:19 +0000
@@ -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 and visitbility of dtor 
(composition)
+#include "SWFStream.h" // for get_bytes_loaded and visitbility of dtor 
(composition)
 #include "StringPredicates.h" // for case-insensitive string comparision 
(ExportMap)
 #include "utility.h" // for TWIPS_TO_PIXELS 
 

=== modified file 'libcore/parser/abc_block.cpp'
--- a/libcore/parser/abc_block.cpp      2008-08-10 14:57:21 +0000
+++ b/libcore/parser/abc_block.cpp      2008-08-10 17:08:19 +0000
@@ -20,7 +20,7 @@
 
 #include "gnashconfig.h"
 #include "abc_block.h"
-#include "stream.h" // for use
+#include "SWFStream.h" // for use
 #include "VM.h"
 #include "log.h"
 #include "ClassHierarchy.h"

=== modified file 'libcore/parser/action_buffer.cpp'
--- a/libcore/parser/action_buffer.cpp  2008-08-07 10:02:35 +0000
+++ b/libcore/parser/action_buffer.cpp  2008-08-10 17:08:19 +0000
@@ -24,7 +24,7 @@
 
 #include "action_buffer.h"
 #include "log.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "swf.h"
 #include "ASHandlers.h"
 #include "as_environment.h"

=== modified file 'libcore/parser/button_character_def.cpp'
--- a/libcore/parser/button_character_def.cpp   2008-08-10 11:53:31 +0000
+++ b/libcore/parser/button_character_def.cpp   2008-08-10 17:08:19 +0000
@@ -24,7 +24,7 @@
 #include "button_character_def.h"
 #include "button_character_instance.h" // for create_character_instance()
 
-#include "stream.h" // for read()
+#include "SWFStream.h" // for read()
 #include "movie_definition.h"
 #include "action_buffer.h"
 #include "filter_factory.h"

=== modified file 'libcore/parser/edit_text_character_def.cpp'
--- a/libcore/parser/edit_text_character_def.cpp        2008-08-10 14:57:21 
+0000
+++ b/libcore/parser/edit_text_character_def.cpp        2008-08-10 17:08:19 
+0000
@@ -21,7 +21,7 @@
 // Based on the public domain text.cpp of Thatcher Ulrich <address@hidden> 2003
 
 #include "smart_ptr.h" // GNASH_USE_GC
-#include "stream.h"
+#include "SWFStream.h"
 #include "log.h"
 #include "movie_definition.h" // for m_root_def use
 

=== modified file 'libcore/parser/filter_factory.cpp'
--- a/libcore/parser/filter_factory.cpp 2008-06-09 09:18:18 +0000
+++ b/libcore/parser/filter_factory.cpp 2008-08-10 17:08:19 +0000
@@ -28,7 +28,7 @@
 #include "GradientBevelFilter.h"
 
 #include "log.h"
-#include "stream.h"
+#include "SWFStream.h"
 
 namespace gnash {
 

=== modified file 'libcore/parser/morph2_character_def.cpp'
--- a/libcore/parser/morph2_character_def.cpp   2008-08-10 14:57:21 +0000
+++ b/libcore/parser/morph2_character_def.cpp   2008-08-10 17:08:19 +0000
@@ -23,7 +23,7 @@
 // Vitalij Alexeev <address@hidden> 2004.
 
 #include "morph2_character_def.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "render.h"
 #include "movie_definition.h"
 #include "bitmap_character_def.h"

=== modified file 'libcore/parser/shape_character_def.cpp'
--- a/libcore/parser/shape_character_def.cpp    2008-08-10 14:57:21 +0000
+++ b/libcore/parser/shape_character_def.cpp    2008-08-10 17:08:19 +0000
@@ -28,7 +28,7 @@
 #include "impl.h"
 #include "log.h"
 #include "render.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "sprite_instance.h"
 
 #include <cfloat>

=== modified file 'libcore/parser/sound_definition.cpp'
--- a/libcore/parser/sound_definition.cpp       2008-04-30 11:21:32 +0000
+++ b/libcore/parser/sound_definition.cpp       2008-08-10 17:08:19 +0000
@@ -7,7 +7,7 @@
 
 
 #include "sound_definition.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "impl.h"
 //#include "ControlTag.h" // for start_sound_tag inheritance
 #include "movie_definition.h"

=== modified file 'libcore/parser/sprite_definition.cpp'
--- a/libcore/parser/sprite_definition.cpp      2008-08-10 14:57:21 +0000
+++ b/libcore/parser/sprite_definition.cpp      2008-08-10 17:08:19 +0000
@@ -25,7 +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 "SWFStream.h" // for use
 
 #include <vector>
 #include <string>
@@ -186,7 +186,7 @@
     return true;
 }
 
-sprite_definition::sprite_definition(movie_definition* m, SWFStream* in)
+sprite_definition::sprite_definition(movie_definition* m, SWFStream& in)
        :
        // FIXME: use a class-static TagLoadersTable for sprite_definition
        _tag_loaders(SWF::TagLoadersTable::getInstance()),
@@ -198,17 +198,22 @@
 {
        assert(m_movie_def);
 
-       // create empty sprite_definition (it is used for 
createEmptyMovieClip() method)
-       if (in == NULL)
-       {
-               m_frame_count = 1;
-               m_loading_frame = 1;
-       }
-       else
-       {
-               read(*in);
-       }
-}
+       read(in);
+}
+
+sprite_definition::sprite_definition(movie_definition* m)
+       :
+       // FIXME: use a class-static TagLoadersTable for sprite_definition
+       _tag_loaders(SWF::TagLoadersTable::getInstance()),
+       m_movie_def(m),
+       m_frame_count(1),
+       m_loading_frame(1),
+       registeredClass(0),
+       _loadingSoundStream(-1)
+{
+       assert(m_movie_def);
+}
+
 
 /*
  * This function is not inlined to avoid having to include as_function.h

=== modified file 'libcore/parser/sprite_definition.h'
--- a/libcore/parser/sprite_definition.h        2008-08-10 14:57:21 +0000
+++ b/libcore/parser/sprite_definition.h        2008-08-10 15:49:15 +0000
@@ -62,7 +62,18 @@
        ///     The stream associated with the sprite. It is assumed
        ///     to be already positioned right before the frame count
        ///
-       sprite_definition(movie_definition* m, SWFStream* in);
+       sprite_definition(movie_definition* m, SWFStream& in);
+
+       /// \brief
+       /// Create an empty sprite
+       //
+       /// A sprite definition consists of a series control tags.
+       ///
+       /// @param m
+       ///     the Top-Level movie_definition this sprite is read
+       ///     from (not a sprite_definition!)
+       sprite_definition(movie_definition* m);
+
 
        /// Destructor, releases playlist data
        ~sprite_definition();

=== modified file 'libcore/parser/text_character_def.cpp'
--- a/libcore/parser/text_character_def.cpp     2008-08-10 14:57:21 +0000
+++ b/libcore/parser/text_character_def.cpp     2008-08-10 17:08:19 +0000
@@ -7,7 +7,7 @@
 
 // Code for the text tags.
 
-#include "stream.h"
+#include "SWFStream.h"
 #include "log.h"
 #include "text_character_def.h"
 #include "swf.h"

=== modified file 'libcore/parser/video_stream_def.cpp'
--- a/libcore/parser/video_stream_def.cpp       2008-08-10 14:57:21 +0000
+++ b/libcore/parser/video_stream_def.cpp       2008-08-10 17:08:19 +0000
@@ -24,7 +24,7 @@
 //#include "MediaHandler.h"
 #include "MediaParser.h" // for VideoInfo
 #include "VideoDecoder.h"
-#include "stream.h" // for read()
+#include "SWFStream.h" // for read()
 
 #include <boost/bind.hpp>
 

=== modified file 'libcore/rect.cpp'
--- a/libcore/rect.cpp  2008-07-09 07:33:34 +0000
+++ b/libcore/rect.cpp  2008-08-10 17:08:19 +0000
@@ -17,7 +17,7 @@
 
 #include "rect.h"
 #include "log.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "matrix.h"
 #include "types.h" // for TWIPS_TO_PIXELS
 #include "utility.h" // for flerp, clamp...

=== modified file 'libcore/sprite_instance.cpp'
--- a/libcore/sprite_instance.cpp       2008-08-08 12:48:33 +0000
+++ b/libcore/sprite_instance.cpp       2008-08-10 15:49:15 +0000
@@ -2727,8 +2727,8 @@
 
 character* sprite_instance::add_empty_movieclip(const char* name, int depth)
 {
-  // empty_sprite_def will be deleted during deliting sprite
-  sprite_definition* empty_sprite_def = new 
sprite_definition(get_movie_definition(), NULL);
+  // empty_sprite_def will be deleted during deleting sprite
+  sprite_definition* empty_sprite_def = new 
sprite_definition(get_movie_definition());
 
   sprite_instance* sprite = new sprite_instance(empty_sprite_def, m_root, 
this, 0);
   sprite->set_name(name);

=== modified file 'libcore/styles.cpp'
--- a/libcore/styles.cpp        2008-08-10 14:57:21 +0000
+++ b/libcore/styles.cpp        2008-08-10 17:08:19 +0000
@@ -10,7 +10,7 @@
 #include "impl.h"
 #include "log.h"
 #include "render.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "movie_definition.h"
 #include "swf.h"
 #include "GnashException.h"

=== modified file 'libcore/swf/CSMTextSettingsTag.cpp'
--- a/libcore/swf/CSMTextSettingsTag.cpp        2008-08-10 14:57:21 +0000
+++ b/libcore/swf/CSMTextSettingsTag.cpp        2008-08-10 17:08:19 +0000
@@ -18,7 +18,7 @@
 //
 
 #include "log.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "movie_definition.h"
 #include "CSMTextSettingsTag.h"
 

=== modified file 'libcore/swf/DefineButtonCxformTag.h'
--- a/libcore/swf/DefineButtonCxformTag.h       2008-08-10 14:57:21 +0000
+++ b/libcore/swf/DefineButtonCxformTag.h       2008-08-10 17:08:19 +0000
@@ -20,7 +20,7 @@
 #define GNASH_SWF_DEFINEBUTTONCXFORMTAG_H
 
 #include "swf.h" // for tag_type definition
-#include "stream.h" // for inlines
+#include "SWFStream.h" // for inlines
 #include "movie_definition.h"
 #include "button_character_def.h"
 

=== modified file 'libcore/swf/DefineFontAlignZonesTag.cpp'
--- a/libcore/swf/DefineFontAlignZonesTag.cpp   2008-08-10 14:57:21 +0000
+++ b/libcore/swf/DefineFontAlignZonesTag.cpp   2008-08-10 17:08:19 +0000
@@ -21,7 +21,7 @@
 #include "font.h"
 #include "log.h"
 #include "shape.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "movie_definition.h"
 #include "DefineFontAlignZonesTag.h"
 

=== modified file 'libcore/swf/DoActionTag.h'
--- a/libcore/swf/DoActionTag.h 2008-08-10 14:57:21 +0000
+++ b/libcore/swf/DoActionTag.h 2008-08-10 17:08:19 +0000
@@ -22,7 +22,7 @@
 #include "swf.h" // for tag_type definition
 #include "action_buffer.h" // for composition
 #include "sprite_instance.h" // for inlines
-#include "stream.h" // for inlines
+#include "SWFStream.h" // for inlines
 
 // Forward declarations
 namespace gnash {

=== modified file 'libcore/swf/DoInitActionTag.h'
--- a/libcore/swf/DoInitActionTag.h     2008-08-10 14:57:21 +0000
+++ b/libcore/swf/DoInitActionTag.h     2008-08-10 17:08:19 +0000
@@ -22,7 +22,7 @@
 #include "swf.h" // for tag_type definition
 #include "action_buffer.h" // for composition
 #include "sprite_instance.h" // for inlines
-#include "stream.h" // for inlines
+#include "SWFStream.h" // for inlines
 
 // Forward declarations
 namespace gnash {

=== modified file 'libcore/swf/PlaceObject2Tag.cpp'
--- a/libcore/swf/PlaceObject2Tag.cpp   2008-08-10 14:57:21 +0000
+++ b/libcore/swf/PlaceObject2Tag.cpp   2008-08-10 17:08:19 +0000
@@ -22,7 +22,7 @@
 #include "sprite_instance.h"
 #include "swf_event.h"
 #include "log.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "filter_factory.h"
 
 namespace gnash {

=== modified file 'libcore/swf/RemoveObjectTag.cpp'
--- a/libcore/swf/RemoveObjectTag.cpp   2008-08-10 14:57:21 +0000
+++ b/libcore/swf/RemoveObjectTag.cpp   2008-08-10 17:08:19 +0000
@@ -22,7 +22,7 @@
 #include "sprite_instance.h"
 #include "swf.h" // for tag_type definition
 #include "log.h"
-#include "stream.h"
+#include "SWFStream.h"
 
 namespace gnash {
 namespace SWF {

=== modified file 'libcore/swf/ScriptLimitsTag.h'
--- a/libcore/swf/ScriptLimitsTag.h     2008-08-10 14:57:21 +0000
+++ b/libcore/swf/ScriptLimitsTag.h     2008-08-10 17:08:19 +0000
@@ -19,7 +19,7 @@
 #define GNASH_SWF_SCRIPTLIMITSTAG_H
 
 #include "swf.h" // for tag_type definition
-#include "stream.h" // for inlines
+#include "SWFStream.h" // for inlines
 #include "movie_definition.h"
 
 namespace gnash {

=== modified file 'libcore/swf/StartSoundTag.cpp'
--- a/libcore/swf/StartSoundTag.cpp     2008-08-10 14:57:21 +0000
+++ b/libcore/swf/StartSoundTag.cpp     2008-08-10 17:08:19 +0000
@@ -19,7 +19,7 @@
 
 #include "gnash.h" // get_sound_handler
 #include "StartSoundTag.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "movie_definition.h"
 #include "log.h" // for log_parse
 #include "sound_definition.h" // for sound_sample

=== modified file 'libcore/swf/StreamSoundBlockTag.cpp'
--- a/libcore/swf/StreamSoundBlockTag.cpp       2008-08-10 14:57:21 +0000
+++ b/libcore/swf/StreamSoundBlockTag.cpp       2008-08-10 17:08:19 +0000
@@ -23,7 +23,7 @@
 #include "movie_definition.h" // for addControlTag
 #include "sprite_instance.h" // for execute
 #include "SoundInfo.h" // for loader
-#include "stream.h"
+#include "SWFStream.h"
 #include "log.h" 
 //#include "sound_definition.h" // for sound_sample
 

=== modified file 'libcore/swf/tag_loaders.cpp'
--- a/libcore/swf/tag_loaders.cpp       2008-08-10 14:57:21 +0000
+++ b/libcore/swf/tag_loaders.cpp       2008-08-10 17:08:19 +0000
@@ -32,7 +32,7 @@
 #include "log.h"
 #include "morph2_character_def.h"
 #include "shape.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "styles.h"
 //#include "dlist.h"
 #include "timers.h"
@@ -907,7 +907,7 @@
     );
 
     // will automatically read the sprite
-    sprite_definition* ch = new sprite_definition(m, &in);
+    sprite_definition* ch = new sprite_definition(m, in);
     //ch->read(in);
 
     IF_VERBOSE_MALFORMED_SWF(

=== modified file 'libcore/text.cpp'
--- a/libcore/text.cpp  2008-08-10 14:57:21 +0000
+++ b/libcore/text.cpp  2008-08-10 17:08:19 +0000
@@ -24,7 +24,7 @@
 #include "utility.h"
 #include "impl.h"
 #include "shape_character_def.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "log.h"
 #include "font.h"
 #include "fontlib.h"

=== modified file 'libcore/types.cpp'
--- a/libcore/types.cpp 2008-08-10 14:57:21 +0000
+++ b/libcore/types.cpp 2008-08-10 17:08:19 +0000
@@ -8,7 +8,7 @@
 #include "types.h"
 
 #include "log.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "render.h"
 
 #include <sstream> // for ::print and ::toString

=== modified file 'testsuite/libcore.all/StreamTest.cpp'
--- a/testsuite/libcore.all/StreamTest.cpp      2008-06-09 17:12:54 +0000
+++ b/testsuite/libcore.all/StreamTest.cpp      2008-08-10 17:08:19 +0000
@@ -28,7 +28,7 @@
 #endif
 
 #include "tu_file.h"
-#include "stream.h"
+#include "SWFStream.h"
 #include "log.h"
 
 #include <cstdio>