diff options
author | Max Horn | 2010-01-22 14:11:33 +0000 |
---|---|---|
committer | Max Horn | 2010-01-22 14:11:33 +0000 |
commit | 7ab85cd0353cd8cd1bd41e1a34853c1a2d8012d9 (patch) | |
tree | 830acd1bc4364746c5adc49cfd26b000cbc26fbd /engines/scumm/imuse_digi/dimuse_track.cpp | |
parent | 6bbca6ee24438e65004dc41df0d0bbbd5b93e69c (diff) | |
download | scummvm-rg350-7ab85cd0353cd8cd1bd41e1a34853c1a2d8012d9.tar.gz scummvm-rg350-7ab85cd0353cd8cd1bd41e1a34853c1a2d8012d9.tar.bz2 scummvm-rg350-7ab85cd0353cd8cd1bd41e1a34853c1a2d8012d9.zip |
SCUMM: Get rid of some redundant enum vals in iMuse digitial
svn-id: r47436
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse_track.cpp')
-rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index dd68181cc9..e56864548e 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -113,7 +113,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, if (track->souStreamUsed) { _mixer->playInputStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0); + DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); } else { strcpy(track->soundName, soundName); track->soundDesc = _sound->openSound(soundId, soundName, soundType, volGroupId, -1); @@ -151,7 +151,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->feedSize = freq * channels; if (channels == 2) - track->mixerFlags = kFlagStereo | kFlagReverseStereo; + track->mixerFlags = kFlagStereo; if ((bits == 12) || (bits == 16)) { track->mixerFlags |= kFlag16Bits; @@ -161,11 +161,6 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, } else error("IMuseDigital::startSound(): Can't handle %d bit samples", bits); -#ifdef SCUMM_LITTLE_ENDIAN - if (track->sndDataExtComp) - track->mixerFlags |= kFlagLittleEndian; -#endif - if (otherTrack && otherTrack->used && !otherTrack->toBeRemoved) { track->curRegion = otherTrack->curRegion; track->dataOffset = otherTrack->dataOffset; @@ -175,7 +170,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo); _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0); + DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); } track->used = true; @@ -376,7 +371,7 @@ Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDelay) { // Create an appendable output buffer fadeTrack->stream = Audio::makeQueuingAudioStream(_sound->getFreq(fadeTrack->soundDesc), track->mixerFlags & kFlagStereo); _mixer->playInputStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0); + DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); fadeTrack->used = true; debug(5, "cloneToFadeOutTrack() - end of func, soundId %d, fade soundId %d", track->soundId, fadeTrack->soundId); |