[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cp...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/27 00:17:38

Modified files:
        .              : ChangeLog 
        server/parser  : movie_def_impl.cpp movie_def_impl.h 
        libbase        : zlib_adapter.cpp 

Log message:
                * server/movie_def_impl.{h,cpp}: fixed _swf_end_pos for 
compressed
                  movie (needed after zlib_adapter fix); enabled 
get_bytes_loaded.
                * libbase/zlib_adapter.cpp: fixed tell() function to include
                  header size.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.731&r2=1.732
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/zlib_adapter.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.731
retrieving revision 1.732
diff -u -b -r1.731 -r1.732
--- ChangeLog   26 Aug 2006 22:58:12 -0000      1.731
+++ ChangeLog   27 Aug 2006 00:17:38 -0000      1.732
@@ -1,5 +1,9 @@
 2006-08-27 Sandro Santilli  <address@hidden>
 
+       * server/movie_def_impl.{h,cpp}: fixed _swf_end_pos for compressed
+         movie (needed after zlib_adapter fix); enabled get_bytes_loaded.
+       * libbase/zlib_adapter.cpp: fixed tell() function to include
+         header size.
        * Split button.{h,cpp} into button_character_instance.{cpp,h},
          mouse_button_events.h and parser/button_character_def.{cpp,h};
          headers inclusion shaking.

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/parser/movie_def_impl.cpp    25 Aug 2006 00:50:59 -0000      1.4
+++ server/parser/movie_def_impl.cpp    27 Aug 2006 00:17:38 -0000      1.5
@@ -43,7 +43,7 @@
 
 #include "movie_def_impl.h"
 #include "movie_definition.h" // for inheritance
-#include "movie_instance.h"
+#include "movie_instance.h" // for create_instance()
 #include "tu_file.h"
 #include "zlib_adapter.h"
 #include "stream.h"
@@ -51,13 +51,12 @@
 #include "fontlib.h"
 #include "font.h"
 #include "log.h"
-//#include "Sprite.h"
 #include "sprite_instance.h"
-#include "render.h"
+//#include "render.h"
 #include "bitmap_character_def.h"
 #include "smart_ptr.h"
 #include "swf/TagLoadersTable.h"
-#include "execute_tag.h"
+//#include "execute_tag.h"
 #include "movie_root.h"
 
 using namespace std;
@@ -379,7 +378,6 @@
        m_frame_count(0u),
        m_version(0),
        m_loading_frame(0u),
-       _loaded_bytes(0u),
        m_jpeg_in(0),
        _loader(*this)
 {
@@ -620,10 +618,6 @@
                _zlib_file.reset(zlib_adapter::make_inflater(original_in));
                in = _zlib_file.get();
 
-               // Subtract the size of the 8-byte header, since
-               // it's not included in the compressed
-               // stream length.
-               _swf_end_pos = m_file_length - 8;
         }
 
        //stream str(in);
@@ -1016,6 +1010,7 @@
                }
                _loader.unlock();
        }
+
 }
 
 } // namespace gnash

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/parser/movie_def_impl.h      26 Aug 2006 22:58:12 -0000      1.3
+++ server/parser/movie_def_impl.h      27 Aug 2006 00:17:38 -0000      1.4
@@ -271,7 +271,6 @@
        size_t  m_loading_frame;
        int     m_loading_sound_stream;
        uint32  m_file_length;
-       size_t  _loaded_bytes;
 
        std::auto_ptr<jpeg::input> m_jpeg_in;
 
@@ -317,27 +316,14 @@
                return m_loading_frame;
        }
 
-#if 0 // renamed to get_bytes_total
-       uint32  get_file_bytes() const {
-               return m_file_length;
-       }
-#endif
-
        /// Get number of bytes loaded from input stream
        size_t  get_bytes_loaded() const {
-#if 0 // temporarly disabled because broken
-               uint32 ret = _loaded_bytes;
-#else
-               uint32 ret = m_file_length;
-#endif
-               log_msg("get_bytes_loaded returning %u (loaded frame: %zu/%zu)",
-                       ret, m_loading_frame, m_frame_count);
-               return ret;
+               // we assume seek-backs are disabled
+               return _str->get_position();
        }
 
        /// Get total number of bytes in input stream
        size_t  get_bytes_total() const {
-               log_msg("get_bytes_total returning %u", m_file_length);
                return m_file_length;
        }
 

Index: libbase/zlib_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/zlib_adapter.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/zlib_adapter.cpp    26 Aug 2006 20:47:56 -0000      1.8
+++ libbase/zlib_adapter.cpp    27 Aug 2006 00:17:38 -0000      1.9
@@ -43,7 +43,10 @@
        public:
 
                z_stream        m_zstream;
-               int             m_logical_stream_pos;   // current stream 
position of uncompressed data.
+
+               // current stream position of uncompressed data.
+               int             m_logical_stream_pos;
+
                bool            m_at_eof;
                int             m_error;
                
@@ -52,7 +55,7 @@
                        :
                        m_in(in),
                        m_initial_stream_pos(in->get_position()),
-                       m_logical_stream_pos(0),
+                       m_logical_stream_pos(m_initial_stream_pos),
                        m_at_eof(false),
                        m_error(0)
                {
@@ -100,7 +103,7 @@
                        // Rewind the underlying stream.
                        m_in->set_position(m_initial_stream_pos);
 
-                       m_logical_stream_pos = 0;
+                       m_logical_stream_pos = m_initial_stream_pos;
                }