[Gnash-commit] [patch #8993] Patches to fix problems when `--disable-media` configure option was used

[Nutchanon Wetchasit]

Follow-up Comment #10, patch #8993 (project gnash):

@strk:
Hmm, not really; at the time of previous post, I already have a working patch.
The fix looks like this:

--- a/libcore/swf/SoundStreamHeadTag.cpp
+++ b/libcore/swf/SoundStreamHeadTag.cpp
@@ -146,8 +146,14 @@ SoundStreamHeadTag::loader(SWFStream& in, TagType tag,
movie_definition& m,
 
     IF_VERBOSE_PARSE(
         log_parse(_("sound stream head: format=%s, rate=%d, 16=%d, "
-            "stereo=%d, ct=%d, latency=%d"), format, streamSoundRate,
-            +streamSound16bit, +streamSoundStereo, +sampleCount, +latency);
+            "stereo=%d, ct=%d, latency=%d"),
+#ifdef USE_MEDIA
+            format,
+#else
+            std::to_string(static_cast<int>(format)),
+#endif
+            streamSoundRate, +streamSound16bit, +streamSoundStereo,
+            +sampleCount, +latency);
     );
 
     // Store all the data in a SoundInfo object
--- a/libcore/swf/tag_loaders.cpp
+++ b/libcore/swf/tag_loaders.cpp
@@ -188,8 +188,13 @@ define_sound_loader(SWFStream& in, TagType tag,
movie_definition& m,
 
     IF_VERBOSE_PARSE(
         log_parse(_("define sound: ch=%d, format=%s, rate=%d, 16=%d, "
-            "stereo=%d, ct=%d, delay=%d"), id, format, sample_rate,
-            sample_16bit, stereo, sample_count, delaySeek);
+            "stereo=%d, ct=%d, delay=%d"), id,
+#ifdef USE_MEDIA
+            format,
+#else
+            std::to_string(static_cast<int>(format)),
+#endif
+            sample_rate, sample_16bit, stereo, sample_count, delaySeek);
     );
 
     // If we have a sound_handler, ask it to init this sound.


I'm personally leaning toward fixing it this way as it is less invasive (and
considerably more stright to the point) than the original MediaParser fix.

Gnash: 0.8.11dev (patched against git 484ca4c 29-Mar-2016)
System: Debian GNU/Linux 7.0 Wheezy i386


    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/patch/?8993>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/