Added support for FLAC encoded music in Broken Sword 1. (The compression tool

knows nothing about this, and since they're being rewritten as part of the SoC,
I'm not going to do anything about that.)

svn-id: r27511
This commit is contained in:
Torbjörn Andersson 2007-06-17 14:50:49 +00:00
parent 9666e69d2a
commit 2a7c76d4e4
2 changed files with 19 additions and 2 deletions

6
NEWS
View File

@ -1,7 +1,11 @@
For a more comprehensive changelog for the latest experimental SVN code, see:
http://scummvm.sourceforge.net/daily/ChangeLog
0.10.0 (????-??-??)
0.11.0 (????-??-??)
Broken Sword 1:
- Added support for FLAC encoded music.
0.10.0 (2007-06-20)
New Games:
- Added Cinematique evo 1 engine. Currently only Future Wars is supported.
- Added Touche: The Adventures of the Fifth Musketeer engine.

View File

@ -31,6 +31,7 @@
#include "sword1/music.h"
#include "sound/aiff.h"
#include "sound/flac.h"
#include "sound/mixer.h"
#include "sound/mp3.h"
#include "sound/vorbis.h"
@ -201,7 +202,19 @@ int AiffAudioStream::readBuffer(int16 *buffer, const int numSamples) {
bool MusicHandle::play(const char *fileBase, bool loop) {
char fileName[30];
stop();
#ifdef USE_FLAC
if (!_audioSource) {
sprintf(fileName, "%s.flac", fileBase);
if (_file.open(fileName))
_audioSource = Audio::makeFlacStream(&_file, false, 0, 0, loop ? 0 : 1);
}
if (!_audioSource) {
sprintf(fileName, "%s.fla", fileBase);
if (_file.open(fileName))
_audioSource = Audio::makeFlacStream(&_file, false, 0, 0, loop ? 0 : 1);
}
#endif
#ifdef USE_VORBIS
if (!_audioSource) {
sprintf(fileName, "%s.ogg", fileBase);