[Scummvm-cvs-logs] CVS: scummvm README,1.256,1.257 configure,1.72,1.73

Max Horn fingolfin at users.sourceforge.net
Sun Feb 22 06:25:02 CET 2004


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv387

Modified Files:
	README configure 
Log Message:
Patch #885904 (Flac Support) with some tweaks by me

Index: README
===================================================================
RCS file: /cvsroot/scummvm/scummvm/README,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- README	13 Feb 2004 16:52:20 -0000	1.256
+++ README	22 Feb 2004 14:11:09 -0000	1.257
@@ -32,7 +32,7 @@
  * 7.2 MIDI emulation
  * 7.3 Native MIDI support
  * 7.4 UNIX native & ALSA sequencer support
- * 7.5 Using MP3 or OGG to store/compress audio
+ * 7.5 Using compressed audiofiles (MP3, Ogg Vorbis, Flac)
 8.0) Configuration Files
 9.0) Compiling
 X.X) Credits
@@ -812,7 +812,22 @@
   oggenc -q 5 track1.wav
 
 
-7.5.2) Compressing MONSTER.SOU with MP3:
+7.5.2) Using Flac files for CD audio:
+------ ------------------------------------
+Use flac or some other flac encoder to encode the audio tracks to files.
+Name the files track1.flac track2.flac etc. In your filesystem only allows 
+three letter extensions, name the files track1.fla track2.fla etc. 
+ScummVM must be compiled with flac support to use this option. You'll need to 
+rip the files from the CD as a WAV file, then encode the flac files. This can 
+be done with the following flac command line:
+
+  flac --best track1.wav
+
+Remember that the quality is always the same, varying encoder options will only
+affect the encoding time and resulting filesize. 
+
+
+7.5.3) Compressing MONSTER.SOU with MP3:
 ------ ---------------------------------
 You need LAME, and our extract util from the scummvm-tools package to perform
 this task, and ScummVM must be compiled with MAD support.
@@ -823,7 +838,7 @@
 to your game directory. You can safely remove the monster.sou file.
 
 
-7.5.3) Compressing MONSTER.SOU with Ogg Vorbis:
+7.5.4) Compressing MONSTER.SOU with Ogg Vorbis:
 ------ ----------------------------------------
 As above, but ScummVM must be compiled with OGG support. Run:
 
@@ -834,10 +849,25 @@
 than MP3, so have a good book handy.
 
 
-7.5.4) Compressing sfx/speech in Simon the Sorcerer 1 and 2
+7.5.5) Compressing MONSTER.SOU with Flac:
+------ ----------------------------------------
+As above, but ScummVM must be compiled with Flac support. Run:
+
+  extract --flac --best -b 1152 monster.sou
+
+This should produce a smaller monster.sof file, which you should copy to your
+game directory. Remember that the quality is always the same, varying encoder
+options will only affect the encoding time and resulting  filesize. Playing
+with the blocksize (-b <value>), has the biggest impact on the resulting
+filesize - 1152 seems to be a good value for those kind of soundfiles. Be sure
+to read the encoder documentation before you use other values.
+
+
+7.5.6) Compressing sfx/speech in Simon the Sorcerer 1 and 2
 ------ ----------------------------------------------------
-Use our simon2mp3 util from the scummvm-tools package to perform
-this task, and ScummVM must be compiled with MAD or VORBIS support.
+Use our simon2mp3 util from the scummvm-tools package to perform this task.
+You can choose between multiple target formats, but note that you can only use
+each if ScummVM was compiled with the respective decoder support enabled.
 
   simon2mp3 effects     (For simon1acorn)
   simon2mp3 simon       (For simon1acorn)
@@ -848,11 +878,15 @@
   simon2mp3 simon2.wav  (For simon2win) 
   simon2mp3 mac         (For simon2mac) 
 
-For Ogg Vorbis add --vorbis, ie
+For Ogg Vorbis add --vorbis to the options, i.e.
 
   simon2mp3 --vorbis
 
-Eventually you will have a much smaller *.mp3 or *.ogg file, copy this
+For Flac add --flac and optional parameters, i.e.
+
+  simon2mp3 --flac --best -b 1152 
+
+Eventually you will have a much smaller *.mp3, *.ogg or *.fla file, copy this
 file to your game dir. You can safely remove the old file.
 
 

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- configure	21 Feb 2004 15:55:26 -0000	1.72
+++ configure	22 Feb 2004 14:11:09 -0000	1.73
@@ -26,6 +26,7 @@
 
 # default lib behaviour yes/no/auto
 _vorbis=auto
+_flac=auto
 _mad=auto
 _alsa=auto
 _zlib=auto
@@ -207,6 +208,9 @@
 
   --with-mad-prefix=PFX    Prefix where libmad is installed (optional)
   --disable-mad            disable libmad (MP3) support [autodetect]
+  
+  --with-flac-prefix=PFX   Prefix where libFLAC is installed (optional)
+  --disable-flac           disable FLAC support [autodetect]
 
   --with-zlib-prefix=PFX   Prefix where zlib is installed (optional)
   --disable-zlib           disable zlib (compression) support [autodetect]
@@ -243,6 +247,8 @@
       --disable-alsa)		_alsa=no	;;
       --enable-vorbis)		_vorbis=yes	;;
       --disable-vorbis)		_vorbis=no	;;
+      --enable-flac)		_flac=yes	;;
+      --disable-flac)		_flac=no	;;
       --enable-mad)		_mad=yes	;;
       --disable-mad)		_mad=no		;;
       --enable-zlib)		_zlib=yes	;;
@@ -269,6 +275,11 @@
 	VORBIS_CFLAGS="-I$_prefix/include"
 	VORBIS_LIBS="-L$_prefix/lib"
 	;;
+      --with-flac-prefix=*)
+	_prefix=`echo $ac_option | cut -d '=' -f 2`
+	FLAC_CFLAGS="-I$_prefix/include"
+	FLAC_LIBS="-L$_prefix/lib"
+	;;
       --with-mad-prefix=*)
 	_prefix=`echo $ac_option | cut -d '=' -f 2`
 	MAD_CFLAGS="-I$_prefix/include"
@@ -622,6 +633,25 @@
 fi
 echo "$_vorbis"
 
+echocheck "FLAC"
+if test "$_flac" = auto ; then
+  _flac=no
+  cat > $TMPC << EOF
+#include <FLAC/seekable_stream_decoder.h>
+int main(void) { FLAC__seekable_stream_decoder_init( 0 ); return 0; }
+EOF
+  cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAY_LIBS \
+  -lFLAC -lm && _flac=yes
+fi
+if test "$_flac" = yes ; then
+  _def_flac='#define USE_FLAC'
+  LIBS="$LIBS $FLAC_LIBS -lFLAC"
+  INCLUDES="$INCLUDES $FLAC_CFLAGS"
+else
+  _def_flac='#undef USE_FLAC'
+fi
+echo "$_flac"
+
 #
 # Check for MAD (MP3 library)
 #
@@ -809,6 +839,7 @@
 
 /* Libs */
 $_def_vorbis
+$_def_flac
 $_def_mad
 $_def_alsa
 $_def_zlib





More information about the Scummvm-git-logs mailing list