thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deal gracefully with missing music files.

Browse source 
svn-id: r12144
This commit is contained in:
Torbjörn Andersson 2004-01-04 16:19:15 +00:00
parent 1e6512d2d2
commit 92561301ac
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sword1/music.cpp
View file

@ -90,8 +90,10 @@ bool SwordMusicHandle::play(const char *filename, bool loop) {
uint8 wavHeader[WAVEHEADERSIZE]; uint8 wavHeader[WAVEHEADERSIZE];
stop(); stop();
_file.open(filename); _file.open(filename);
if (!_file.isOpen()) if (!_file.isOpen()) {
warning("Music file %s could not be opened", filename);
return false; return false;
}
_file.read(wavHeader, WAVEHEADERSIZE); _file.read(wavHeader, WAVEHEADERSIZE);
_stereo = (READ_LE_UINT16(wavHeader + 0x16) == 2); _stereo = (READ_LE_UINT16(wavHeader + 0x16) == 2);
_rate = READ_LE_UINT16(wavHeader + 0x18); _rate = READ_LE_UINT16(wavHeader + 0x18);
@ -159,9 +161,10 @@ void SwordMusic::startMusic(int32 tuneId, int32 loopFlag) {
} }
char fName[20]; char fName[20];
sprintf(fName, "music/%s.wav", _tuneList[tuneId]); sprintf(fName, "music/%s.wav", _tuneList[tuneId]);
_handles[newStream].play(fName, loopFlag != 0); if (_handles[newStream].play(fName, loopFlag != 0)) {
delete _converter[newStream]; delete _converter[newStream];
_converter[newStream] = makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false); _converter[newStream] = makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false);
}
} else { } else {
if (_handles[0].streaming()) if (_handles[0].streaming())
_handles[0].fadeDown(); _handles[0].fadeDown();