[Gnash-commit] gnash ChangeLog server/parser/BitmapMovieDefini...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/14 16:38:14

Modified files:
        .              : ChangeLog 
        server/parser  : BitmapMovieDefinition.cpp 
                         BitmapMovieDefinition.h 

Log message:
        Implement getBytesLoaded/getBytesTotal for loaded bitmaps
        (not 100% correct but fixing real-world movies).
        Fixes:
        http://www.veritaserum.com/flashgames/jp/puzzledharry/puzzled-harry.swf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5650&r2=1.5651
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5650
retrieving revision 1.5651
diff -u -b -r1.5650 -r1.5651
--- ChangeLog   14 Feb 2008 16:00:54 -0000      1.5650
+++ ChangeLog   14 Feb 2008 16:38:12 -0000      1.5651
@@ -1,3 +1,11 @@
+2008-02-14 Sandro Santilli <address@hidden>
+
+       * server/parser/BitmapMovieDefinition.{cpp,h}:
+         Implement getBytesLoaded/getBytesTotal for loaded bitmaps
+         (not 100% correct but fixing real-world movies).
+         Fixes:
+         
http://www.veritaserum.com/flashgames/jp/puzzledharry/puzzled-harry.swf
+
 2008-02-14 Benjamin Wolsey <address@hidden>
 
        * server/stream.cpp: throw parser exception in stream::open_tag() if

Index: server/parser/BitmapMovieDefinition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/parser/BitmapMovieDefinition.cpp     21 Jan 2008 20:55:59 -0000      
1.15
+++ server/parser/BitmapMovieDefinition.cpp     14 Feb 2008 16:38:13 -0000      
1.16
@@ -89,7 +89,8 @@
        _framecount(1),
        _framerate(12),
        _url(url),
-       _image(image)
+       _image(image),
+       _bytesTotal(_image->size())
 {
        // Do not create shape_character_def now (why?)
 }

Index: server/parser/BitmapMovieDefinition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/parser/BitmapMovieDefinition.h       21 Jan 2008 20:55:59 -0000      
1.11
+++ server/parser/BitmapMovieDefinition.h       14 Feb 2008 16:38:13 -0000      
1.12
@@ -59,6 +59,8 @@
        ///
        shape_character_def* getShapeDef();
 
+       size_t _bytesTotal;
+
 protected:
 
 #ifdef GNASH_USE_GC
@@ -82,7 +84,7 @@
        ///  - Framesize extracted from image 
        ///  - Single frame (unlabeled)
        ///  - 12 FPS
-       ///  - 0 bytes (for get_bytes_loaded()/get_bytes_total())
+       ///  - image->size() bytes (for get_bytes_loaded()/get_bytes_total())
        ///  - provided url
        ///
        BitmapMovieDefinition(std::auto_ptr<image::rgb> image, const 
std::string& url);
@@ -121,12 +123,21 @@
                return _framesize;
        }
 
+       /// Return number of bytes loaded
+       //
+       /// Since no progressive load is implemented yet
+       /// we'll always return total bytes here..
+       ///
        virtual size_t get_bytes_loaded() const {
-               return 0;
+               return get_bytes_total();
        }
 
+       /// Return total number of bytes which composed this movie
+       //
+       /// We actually cheat, and return the image size here...
+       ///
        virtual size_t get_bytes_total() const {
-               return 0;
+               return _bytesTotal;
        }
        
        /// Create a playable movie_instance from this def.