[Scummvm-cvs-logs] scummvm master -> c71ed522de1bc1e3dcd84ca8cf759d7624571b7c
bluegr
md5 at scummvm.org
Wed Nov 16 11:04:02 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c71ed522de DRASCULA: Further cleanup of the sound playing code
Commit: c71ed522de1bc1e3dcd84ca8cf759d7624571b7c
https://github.com/scummvm/scummvm/commit/c71ed522de1bc1e3dcd84ca8cf759d7624571b7c
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-16T02:03:31-08:00
Commit Message:
DRASCULA: Further cleanup of the sound playing code
Changed paths:
engines/drascula/sound.cpp
diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index 0c3aded..112f6fd 100644
--- a/engines/drascula/sound.cpp
+++ b/engines/drascula/sound.cpp
@@ -166,14 +166,7 @@ void DrasculaEngine::MusicFadeout() {
void DrasculaEngine::playFile(const char *fname) {
Common::SeekableReadStream *stream = _archives.open(fname);
if (stream) {
- // TODO: I don't really see a reason why we have this offset here. The
- // file "S3.ALS" for example does not contain any silence at the start
- // nor end. Thus it looks like this cuts off part of the sound.
- //
- // Would be good if someone could double check this and clarify why
- // the code is working like this if it is fine and otherwise just fix
- // it.
- int startOffset = 32;
+ int startOffset = 0;
int soundSize = stream->size() - startOffset;
if (!strcmp(fname, "3.als") && soundSize == 145166 && _lang != kSpanish) {
@@ -182,12 +175,7 @@ void DrasculaEngine::playFile(const char *fname) {
// and ignore the silence at the end
// Fixes bug #2111815 - "DRASCULA: Voice delayed"
startOffset = 73959;
- // TODO: The old code also subtracted 64 later on when creating
- // the RAW audio stream. It would be good if someone could check
- // whether this has been properly taking into account when
- // calculating the soundSize. If it hasn't been taken into account
- // when it is probably better to remove the minus 64 here.
- soundSize = 117158 - 73959 - 64;
+ soundSize = soundSize - startOffset - 26306;
}
Common::SeekableReadStream *subStream = new Common::SeekableSubReadStream(
@@ -198,8 +186,6 @@ void DrasculaEngine::playFile(const char *fname) {
return;
}
- _subtitlesDisabled = !ConfMan.getBool("subtitles");
-
Audio::AudioStream *sound = Audio::makeRawStream(subStream, 11025,
Audio::FLAG_UNSIGNED);
_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_soundHandle, sound);
More information about the Scummvm-git-logs
mailing list