[Gnash-commit] gnash ChangeLog testsuite/media/README testsuit...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/10 18:59:35

Modified files:
        .              : ChangeLog 
        testsuite/media: README 
        testsuite/misc-swfc.all: Makefile.am check.sc sound.sc 
Added files:
        testsuite/media: sound1.wav 
Removed files:
        testsuite/misc-swfc.all: sound.wav 

Log message:
                * testsuite/media/: README, sound1.wav:
                  Moved sound1.wav data from swfc dir to media dir,
                  add some info about it and sound1.mp3.
                * testsuite/misc-swfc.all/sound.wav: moved to
                  media/sound1.wav
                * testsuite/misc-swfc.all/Makefile.am: define MEDIADIR
                * testsuite/misc-swfc.all/check.sc: define a MEDIA
                  macro
                * testsuite/misc-swfc.all/sound.sc: use the MEDIA macro
                  to find media stuff.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3988&r2=1.3989
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/media/README?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/media/sound1.wav?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/check.sc?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/sound.sc?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/sound.wav?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3988
retrieving revision 1.3989
diff -u -b -r1.3988 -r1.3989
--- ChangeLog   10 Aug 2007 18:31:01 -0000      1.3988
+++ ChangeLog   10 Aug 2007 18:59:34 -0000      1.3989
@@ -1,5 +1,18 @@
 2007-08-10 Sandro Santilli <address@hidden>
 
+       * testsuite/media/: README, sound1.wav:
+         Moved sound1.wav data from swfc dir to media dir,
+         add some info about it and sound1.mp3.
+       * testsuite/misc-swfc.all/sound.wav: moved to
+         media/sound1.wav
+       * testsuite/misc-swfc.all/Makefile.am: define MEDIADIR
+       * testsuite/misc-swfc.all/check.sc: define a MEDIA
+         macro
+       * testsuite/misc-swfc.all/sound.sc: use the MEDIA macro
+         to find media stuff.
+
+2007-08-10 Sandro Santilli <address@hidden>
+
        * Makefile.am, configure.ac, testsuite/Makefile.am,
          testsuite/misc-swfc.all/Makefile.am:
          Enable swfc testsuite if 'swfc' is found on the system.

Index: testsuite/media/README
===================================================================
RCS file: /sources/gnash/gnash/testsuite/media/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/media/README      13 Jun 2006 10:06:03 -0000      1.1
+++ testsuite/media/README      10 Aug 2007 18:59:34 -0000      1.2
@@ -7,3 +7,20 @@
        Font Definition Block (fdb) for embedding in SWF.
        Taken from http://ming.sf.net. Copyright is in
        Bitstream.COPYRIGHT
+
+sound1.wav
+
+       (tick, tick)
+       Sample Size    : 16-bits
+       Sample Encoding: signed (2's complement)
+       Channels       : 1
+       Sample Rate    : 8000
+
+sound1.mp3
+
+       (bip bip)
+       Sample Size    : 16-bits
+       Sample Encoding: MPEG audio (layer I, II or III)
+       Channels       : 1
+       Sample Rate    : 22050
+

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-swfc.all/Makefile.am 10 Aug 2007 18:31:01 -0000      1.2
+++ testsuite/misc-swfc.all/Makefile.am 10 Aug 2007 18:59:34 -0000      1.3
@@ -36,7 +36,7 @@
 
 #SWFC = swfc # this is set by ./configure
 SWFC_FLAGS = 
-SWFC_CPP = cpp -P -I$(srcdir)
+SWFC_CPP = cpp -P -I$(srcdir) -DMEDIADIR='$(srcdir)/../media'
 
 SCTESTS_OUT = $(SCTESTS:.sc=.swf)
 

Index: testsuite/misc-swfc.all/check.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/check.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/check.sc    9 Aug 2007 06:38:16 -0000       1.1
+++ testsuite/misc-swfc.all/check.sc    10 Aug 2007 18:59:34 -0000      1.2
@@ -44,5 +44,6 @@
 
 #define note(text) Dejagnu.note(text + _INFO_);
 
+#define MEDIA(x) MEDIADIR/x
 
 #endif

Index: testsuite/misc-swfc.all/sound.sc
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/sound.sc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-swfc.all/sound.sc    9 Aug 2007 06:38:16 -0000       1.1
+++ testsuite/misc-swfc.all/sound.sc    10 Aug 2007 18:59:34 -0000      1.2
@@ -1,6 +1,8 @@
 .flash bbox=200x200 filename="sound_test.swf" version=6 fps=30
 
-.sound audio "sound.wav"
+#include "check.sc"
+
+.sound audio MEDIA(sound1.wav)
 
 .box b1 100 100 color=yellow fill=red
 

Index: testsuite/media/sound1.wav
===================================================================
RCS file: testsuite/media/sound1.wav
diff -N testsuite/media/sound1.wav
Binary files /dev/null and /tmp/cvsxBZExn differ

Index: testsuite/misc-swfc.all/sound.wav
===================================================================
RCS file: testsuite/misc-swfc.all/sound.wav
diff -N testsuite/misc-swfc.all/sound.wav
Binary files /tmp/cvsUo5Hzq and /dev/null differ