[Gnash-commit] /srv/bzr/gnash/trunk r9969: Update expected results for ffmpeg. Gstreamer fails an extra one.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9969
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2008-10-08 18:00:20 +0200
message:
  Update expected results for ffmpeg. Gstreamer fails an extra one.
  
  Add onSoundComplete to named strings.
modified:
  libcore/namedStrings.cpp
  libcore/namedStrings.h
  libmedia/ffmpeg/MediaHandlerFfmpeg.h
  testsuite/misc-ming.all/EmbeddedSoundTest.c

=== modified file 'libcore/namedStrings.cpp'
--- a/libcore/namedStrings.cpp  2008-09-18 08:34:47 +0000
+++ b/libcore/namedStrings.cpp  2008-10-08 16:00:20 +0000
@@ -78,6 +78,7 @@
        string_table::svt( "onLoadError", NSV::PROP_ON_LOAD_ERROR ),
        string_table::svt( "onLoadProgress", NSV::PROP_ON_LOAD_PROGRESS ),
        string_table::svt( "onLoadInit", NSV::PROP_ON_LOAD_INIT ),
+    string_table::svt( "onSoundComplete", NSV::PROP_ON_SOUND_COMPLETE ),
        string_table::svt( "onUnload", NSV::PROP_ON_UNLOAD ),
        string_table::svt( "onEnterFrame", NSV::PROP_ON_ENTER_FRAME ),
        string_table::svt( "onConstruct", NSV::PROP_ON_CONSTRUCT ),

=== modified file 'libcore/namedStrings.h'
--- a/libcore/namedStrings.h    2008-09-18 08:34:47 +0000
+++ b/libcore/namedStrings.h    2008-10-08 16:00:20 +0000
@@ -158,7 +158,8 @@
                PROP_ON_ROLL_OVER,
                PROP_ON_SELECT,
                PROP_ON_SET_FOCUS,
-               PROP_ON_STATUS,
+        PROP_ON_SOUND_COMPLETE,
+        PROP_ON_STATUS,
                PROP_ON_TIMER,
                PROP_ON_UNLOAD,
                PROP_ON_XML,

=== modified file 'libmedia/ffmpeg/MediaHandlerFfmpeg.h'
--- a/libmedia/ffmpeg/MediaHandlerFfmpeg.h      2008-10-08 13:52:46 +0000
+++ b/libmedia/ffmpeg/MediaHandlerFfmpeg.h      2008-10-08 16:00:20 +0000
@@ -41,7 +41,7 @@
 
        virtual std::auto_ptr<AudioDecoder> createAudioDecoder(AudioInfo& info);
 
-    size_t getInputPaddingSize() const;
+    virtual size_t getInputPaddingSize() const;
 
 };
 

=== modified file 'testsuite/misc-ming.all/EmbeddedSoundTest.c'
--- a/testsuite/misc-ming.all/EmbeddedSoundTest.c       2008-10-08 11:58:12 
+0000
+++ b/testsuite/misc-ming.all/EmbeddedSoundTest.c       2008-10-08 16:00:20 
+0000
@@ -23,7 +23,7 @@
 
 #include "ming_utils.h"
 
-#define OUTPUT_VERSION 6
+#define OUTPUT_VERSION 8
 #define OUTPUT_FILENAME "EmbeddedSoundTest.swf"
 
 void addSoundExport(SWFMovie mo);
@@ -129,9 +129,12 @@
     add_actions(mo, "d = new Sound(); d.attachSound('stereo8_mp3b');");
 
     check_equals(mo, "a.duration", "13740");
+    add_actions(mo, "check_equals(a.getBytesTotal(), undefined);");
+    add_actions(mo, "check_equals(a.getBytesLoaded(), undefined);");
+    add_actions(mo, "check_equals(a.id3, undefined);");
     check_equals(mo, "a.position", "0");
     add_actions(mo, "a.start();");
-    check_equals(mo, "a.position", "0");
+    xcheck_equals(mo, "a.position", "0");
 
     check_equals(mo, "b.duration", "13740");
     check_equals(mo, "b.position", "0");