[Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/03 20:10:00

Modified files:
        .              : ChangeLog 
        server/swf     : tag_loaders.cpp 

Log message:
                * server/swf/tag_loaders.cpp: warn only once and avoid parsing
                  tags when no GST sound backend is selected and unsupported 
sound
                  tags are encountered.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.578&r2=1.579
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -b -r1.578 -r1.579
--- ChangeLog   3 Aug 2006 19:16:37 -0000       1.578
+++ ChangeLog   3 Aug 2006 20:10:00 -0000       1.579
@@ -1,5 +1,8 @@
 2006-08-03 Sandro Santilli <address@hidden>
 
+       * server/swf/tag_loaders.cpp: warn only once and avoid parsing
+         tags when no GST sound backend is selected and unsupported sound
+         tags are encountered.
        * server/gnash.h, server/impl.cpp, server/movie_def_impl.cpp,
          server/movie_def_impl.h, server/sound.cpp, server/sound.h,
          server/swf/tag_loaders.cpp, server/swf/tag_loaders.h:

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/swf/tag_loaders.cpp  3 Aug 2006 19:16:38 -0000       1.20
+++ server/swf/tag_loaders.cpp  3 Aug 2006 20:10:00 -0000       1.21
@@ -1542,6 +1542,11 @@
        // 18 || 45
        assert(tag == SWF::SOUNDSTREAMHEAD || tag == SWF::SOUNDSTREAMHEAD2);
 
+       // If we don't have a sound_handler registered stop here
+       if (!s_sound_handler) return;
+
+#ifdef SOUND_GST
+
        // FIXME:
        // no character id for soundstreams... so we make one up... 
        // This only works if there is only one stream in the movie...
@@ -1567,10 +1572,6 @@
        log_parse("sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, 
ct=%d\n",
                  int(format), sample_rate, int(sample_16bit), int(stereo), 
sample_count);
 
-       // If we don't have a sound_handler registered stop here
-       if (!s_sound_handler) return;
-
-#ifdef SOUND_GST
        // Ask sound_handler it to init this sound.
        int     data_bytes = 0;
 
@@ -1590,7 +1591,13 @@
        m->set_loading_sound_stream_id(handler_id);
 
 #else
-       log_error("Only Gstreamer sound backend supports SoundStreamHead tag");
+       static bool already_warned=false;
+       if ( ! already_warned )
+       {
+               log_warning("Only Gstreamer sound backend "
+                       "supports SoundStreamHead tag");
+               already_warned=true;
+       }
 #endif
 }
 
@@ -1603,6 +1610,8 @@
 
        assert(tag == SWF::SOUNDSTREAMBLOCK); // 19
 
+#ifdef SOUND_GST
+
 
        // extract garbage data
        int     garbage = in->read_uint(32);
@@ -1612,8 +1621,6 @@
        if (!s_sound_handler) return;
 
        // store the data with the appropiate sound.
-#ifdef SOUND_GST
-
        int     data_bytes = 0;
        unsigned char*  data = NULL;
 
@@ -1639,9 +1646,16 @@
        start_stream_sound_tag* ssst = new start_stream_sound_tag();
        ssst->read(m, handle_id, start);
 
-#else
-       log_error("Only Gstreamer sound backend supports SoundStreamBlock tag");
+       // @@ who's going to delete the start_stream_sound_tag ??
 
+#else
+       static bool already_warned=false;
+       if ( ! already_warned )
+       {
+               log_warning("Only Gstreamer sound backend "
+                       "supports SoundStreamBlock tag");
+               already_warned=true;
+       }
 #endif
 }