[Gnash-commit] /srv/bzr/gnash/trunk r12212: Fix compiler warnings in testsuite, merge and revert disabling of AVM2 (it's

[Benjamin Wolsey]

------------------------------------------------------------
revno: 12212 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2010-06-03 17:19:48 +0200
message:
  Fix compiler warnings in testsuite, merge and revert disabling of AVM2 (it's
  still enabled, that is).
modified:
  testsuite/misc-ming.all/EmbeddedSoundTest.c

=== modified file 'testsuite/misc-ming.all/EmbeddedSoundTest.c'
--- a/testsuite/misc-ming.all/EmbeddedSoundTest.c       2010-01-01 17:48:26 
+0000
+++ b/testsuite/misc-ming.all/EmbeddedSoundTest.c       2010-05-25 11:47:19 
+0000
@@ -75,10 +75,10 @@
             SWF_SOUND_16BITS |
             SWF_SOUND_STEREO);
 
-    SWFMovie_addExport(mo, (SWFSound)soundMP3a, "mono22_mp2");
-    SWFMovie_addExport(mo, (SWFSound)soundMP3b, "mono22_mp2b");
-    SWFMovie_addExport(mo, (SWFSound)soundMP3c, "stereo8_mp3");
-    SWFMovie_addExport(mo, (SWFSound)soundMP3d, "stereo8_mp3b");
+    SWFMovie_addExport(mo, (SWFBlock)soundMP3a, "mono22_mp2");
+    SWFMovie_addExport(mo, (SWFBlock)soundMP3b, "mono22_mp2b");
+    SWFMovie_addExport(mo, (SWFBlock)soundMP3c, "stereo8_mp3");
+    SWFMovie_addExport(mo, (SWFBlock)soundMP3d, "stereo8_mp3b");
 
     SWFMovie_writeExports(mo);
 }