[Scummvm-cvs-logs] SF.net SVN: scummvm:[47473] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jan 23 14:34:59 CET 2010
Revision: 47473
http://scummvm.svn.sourceforge.net/scummvm/?rev=47473&view=rev
Author: fingolfin
Date: 2010-01-23 13:34:59 +0000 (Sat, 23 Jan 2010)
Log Message:
-----------
Get rid of FLAG_LOOP
Modified Paths:
--------------
scummvm/trunk/engines/scumm/player_mod.cpp
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/engines/sky/sound.cpp
scummvm/trunk/sound/audiostream.cpp
scummvm/trunk/sound/raw.cpp
scummvm/trunk/sound/raw.h
Modified: scummvm/trunk/engines/scumm/player_mod.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_mod.cpp 2010-01-23 13:34:29 UTC (rev 47472)
+++ scummvm/trunk/engines/scumm/player_mod.cpp 2010-01-23 13:34:59 UTC (rev 47473)
@@ -95,7 +95,7 @@
_channels[i].pan = pan;
_channels[i].freq = rate;
_channels[i].ctr = 0;
- _channels[i].input = Audio::makeRawMemoryStream_OLD((const byte*)data, size, DisposeAfterUse::YES, rate, (loopStart != loopEnd ? Audio::FLAG_LOOP : 0), loopStart, loopEnd);
+ _channels[i].input = Audio::makeRawMemoryStream_OLD((const byte*)data, size, DisposeAfterUse::YES, rate, 0, loopStart, loopEnd);
// read the first sample
_channels[i].input->readBuffer(&_channels[i].pos, 1);
}
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp 2010-01-23 13:34:29 UTC (rev 47472)
+++ scummvm/trunk/engines/scumm/sound.cpp 2010-01-23 13:34:59 UTC (rev 47473)
@@ -164,7 +164,6 @@
Audio::AudioStream *stream;
int size = -1;
int rate;
- byte flags = Audio::FLAG_UNSIGNED;
if (_vm->_game.id == GID_LOOM && _vm->_game.platform == Common::kPlatformPCEngine) {
if (soundID >= 13 && soundID <= 32) {
@@ -204,7 +203,7 @@
sound = (byte *)malloc(size);
memcpy(sound, ptr, size);
- stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, flags);
+ stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
}
// WORKAROUND bug # 1311447
@@ -227,7 +226,7 @@
// Allocate a sound buffer, copy the data into it, and play
sound = (byte *)malloc(size);
memcpy(sound, ptr, size);
- stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, flags);
+ stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
}
// Support for sampled sound effects in Monkey Island 1 and 2
@@ -299,7 +298,7 @@
// Allocate a sound buffer, copy the data into it, and play
sound = (byte *)malloc(size);
memcpy(sound, ptr + 6, size);
- stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, flags);
+ stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
}
else if ((_vm->_game.platform == Common::kPlatformFMTowns && _vm->_game.version == 3) || READ_BE_UINT32(ptr) == MKID_BE('SOUN') || READ_BE_UINT32(ptr) == MKID_BE('TOWS')) {
@@ -350,10 +349,7 @@
}
size -= waveSize;
- if (loopEnd > 0)
- flags |= Audio::FLAG_LOOP;
-
- stream = Audio::makeRawMemoryStream_OLD(sound, waveSize, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
+ stream = Audio::makeRawMemoryStream_OLD(sound, waveSize, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED, loopStart, loopEnd);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0);
}
break;
@@ -426,7 +422,6 @@
// offset 26: ? if != 0: stop current sound?
// offset 27: ? loopcount? 0xff == -1 for infinite?
- flags = 0;
size = READ_BE_UINT16(ptr + 12);
assert(size);
@@ -442,11 +437,10 @@
// so maybe this is not really a problem.
loopStart = READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8);
loopEnd = READ_BE_UINT16(ptr + 14);
- flags |= Audio::FLAG_LOOP;
}
memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size);
- stream = Audio::makeRawMemoryStream_OLD(sound, size, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
+ stream = Audio::makeRawMemoryStream_OLD(sound, size, DisposeAfterUse::YES, rate, 0, loopStart, loopEnd);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, vol, 0);
}
else {
Modified: scummvm/trunk/engines/sky/sound.cpp
===================================================================
--- scummvm/trunk/engines/sky/sound.cpp 2010-01-23 13:34:29 UTC (rev 47472)
+++ scummvm/trunk/engines/sky/sound.cpp 2010-01-23 13:34:59 UTC (rev 47473)
@@ -1111,18 +1111,14 @@
uint32 dataLoop = READ_BE_UINT16(_sfxInfo + (sound << 3) + 6);
dataOfs += _sfxBaseOfs;
- byte flags = Audio::FLAG_UNSIGNED;
-
uint32 loopSta = 0, loopEnd = 0;
if (dataLoop) {
loopSta = dataSize - dataLoop;
loopEnd = dataSize;
- flags |= Audio::FLAG_LOOP;
}
+ Audio::AudioStream *stream = Audio::makeRawMemoryStream_OLD(_soundData + dataOfs, dataSize, DisposeAfterUse::NO, sampleRate, Audio::FLAG_UNSIGNED, loopSta, loopEnd);
- Audio::AudioStream *stream = Audio::makeRawMemoryStream_OLD(_soundData + dataOfs, dataSize, DisposeAfterUse::NO, sampleRate, flags, loopSta, loopEnd);
-
if (channel == 0)
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound0, stream, SOUND_CH0, volume, 0);
else
Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp 2010-01-23 13:34:29 UTC (rev 47472)
+++ scummvm/trunk/sound/audiostream.cpp 2010-01-23 13:34:59 UTC (rev 47473)
@@ -253,7 +253,7 @@
void QueuingAudioStream::queueBuffer(byte *data, uint32 size, DisposeAfterUse::Flag disposeAfterUse, byte flags) {
- AudioStream *stream = makeRawMemoryStream_OLD(data, size, disposeAfterUse, getRate(), flags, 0, 0);
+ AudioStream *stream = makeRawMemoryStream(data, size, disposeAfterUse, getRate(), flags);
queueAudioStream(stream, DisposeAfterUse::YES);
}
Modified: scummvm/trunk/sound/raw.cpp
===================================================================
--- scummvm/trunk/sound/raw.cpp 2010-01-23 13:34:29 UTC (rev 47472)
+++ scummvm/trunk/sound/raw.cpp 2010-01-23 13:34:59 UTC (rev 47473)
@@ -365,7 +365,7 @@
uint loopStart, uint loopEnd) {
SeekableAudioStream *s = makeRawMemoryStream(ptr, len, autoFree, rate, flags);
- if ((flags & Audio::FLAG_LOOP) != 0) {
+ if (loopStart != loopEnd) {
const bool isStereo = (flags & Audio::FLAG_STEREO) != 0;
const bool is16Bit = (flags & Audio::FLAG_16BITS) != 0;
Modified: scummvm/trunk/sound/raw.h
===================================================================
--- scummvm/trunk/sound/raw.h 2010-01-23 13:34:29 UTC (rev 47472)
+++ scummvm/trunk/sound/raw.h 2010-01-23 13:34:59 UTC (rev 47473)
@@ -58,10 +58,7 @@
FLAG_LITTLE_ENDIAN = 1 << 2,
/** sound is in stereo (default: mono) */
- FLAG_STEREO = 1 << 3,
-
- /** loop the audio (deprecated) */
- FLAG_LOOP = 1 << 6
+ FLAG_STEREO = 1 << 3
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list