[Gnash-commit] gnash ChangeLog server/impl.cpp server/stream.h...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/07 18:27:34

Modified files:
        .              : ChangeLog 
        server         : impl.cpp stream.h 
        server/swf     : tag_loaders.cpp 

Log message:
                * server/stream.h: added skip_bytes() method
                * server/swf/tag_loaders.cpp: fixed compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.595&r2=1.596
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -b -r1.595 -r1.596
--- ChangeLog   7 Aug 2006 17:47:46 -0000       1.595
+++ ChangeLog   7 Aug 2006 18:27:33 -0000       1.596
@@ -1,4 +1,9 @@
-2006-08-07 Bastiaan Jacques <address@hidden>
+2006-08-07 Sandro Santilli <address@hidden>
+
+       * server/stream.h: added skip_bytes() method 
+       * server/swf/tag_loaders.cpp: fixed compiler warnings.
+
+2006-08-07 Bastiaan Jacques <address@hidden>
 
        * server/movie_def_impl.h: Fix return types to match declarations. 
 

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/impl.cpp     3 Aug 2006 22:19:59 -0000       1.49
+++ server/impl.cpp     7 Aug 2006 18:27:34 -0000       1.50
@@ -236,7 +236,7 @@
        register_tag_loader(SWF::NAMECHARACTER, fixme_loader); // 40
        register_tag_loader(SWF::SERIALNUMBER,  fixme_loader); // 41
        register_tag_loader(SWF::DEFINETEXTFORMAT, fixme_loader); // 42
-       register_tag_loader(SWF::FRAMELABEL,    frame_label_loader);
+       register_tag_loader(SWF::FRAMELABEL,    frame_label_loader); // 43
        // 44 - _UNKNOWN_ unimplemented
        register_tag_loader(SWF::SOUNDSTREAMHEAD2, sound_stream_head_loader); 
// 45
        register_tag_loader(SWF::DEFINEMORPHSHAPE, define_shape_morph_loader);

Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/stream.h     27 Jul 2006 01:47:11 -0000      1.8
+++ server/stream.h     7 Aug 2006 18:27:34 -0000       1.9
@@ -82,6 +82,18 @@
 
                tu_file*        get_underlying_stream() { return m_input; }
 
+               /// Discard given number of bytes
+               //
+               /// Note: crossing a tag boundary triggers an error,
+               /// but I'm not sure we really want this --strk;
+               void skip_bytes(unsigned int num)
+               {
+                       // there's probably a better way, but
+                       // it's the interface that counts atm
+                       size_t curpos = get_position();
+                       set_position(curpos+num);
+               }
+
        private:
                tu_file*        m_input;
                uint8_t m_current_byte;

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/swf/tag_loaders.cpp  3 Aug 2006 20:10:00 -0000       1.21
+++ server/swf/tag_loaders.cpp  7 Aug 2006 18:27:34 -0000       1.22
@@ -125,7 +125,7 @@
 
 
 // Silently ignore the contents of this tag.
-void null_loader(stream* in, tag_type tag, movie_definition* m)
+void null_loader(stream* /*in*/, tag_type /*tag*/, movie_definition* /*m*/)
 {
 }
 
@@ -133,6 +133,8 @@
 void
 frame_label_loader(stream* in, tag_type tag, movie_definition* m)
 {
+    assert(tag == SWF::FRAMELABEL); // 43
+
     char*      n = in->read_string();
     m->add_frame_name(n);
     delete [] n;
@@ -881,8 +883,11 @@
 
                                        if (action.get_length() != event_length)
                                        {
-                                               log_error("error -- 
swf_event::read(), event_length = %d, but read %ld\n",
-                                                         event_length, 
action.get_length());
+                                               log_error("swf_event::read(), "
+                                                       "event_length = %d, "
+                                                       "but read %u\n",
+                                                       event_length,
+                                                       action.get_length());
                                                break;
                                        }
 
@@ -1119,7 +1124,7 @@
 
 // end_tag doesn't actually need to exist.
 
-void   end_loader(stream* in, tag_type tag, movie_definition* m)
+void   end_loader(stream* in, tag_type tag, movie_definition* /*m*/)
 {
     assert(tag == SWF::END); // 0
     assert(in->get_position() == in->get_tag_end_position());
@@ -1613,8 +1618,9 @@
 #ifdef SOUND_GST
 
 
-       // extract garbage data
-       int     garbage = in->read_uint(32);
+       // discard garbage data
+       //int   garbage = in->read_u32();
+       in->skip_bytes(4);
 
 
        // If we don't have a sound_handler registered stop here