[Scummvm-cvs-logs] SF.net SVN: scummvm:[47472] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jan 23 14:34:29 CET 2010
Revision: 47472
http://scummvm.svn.sourceforge.net/scummvm/?rev=47472&view=rev
Author: fingolfin
Date: 2010-01-23 13:34:29 +0000 (Sat, 23 Jan 2010)
Log Message:
-----------
Get rid of deprecated makeRawDiskStream variants; rename deprecated makeRawMemoryStream variant to makeRawMemoryStream_OLD; adapt some code to this change
Modified Paths:
--------------
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/mohawk/video/qt_player.cpp
scummvm/trunk/engines/parallaction/sound_br.cpp
scummvm/trunk/engines/parallaction/sound_ns.cpp
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
scummvm/trunk/sound/voc.cpp
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -3926,7 +3926,7 @@
uint32 outputRate = uint32(11025 * calculatePhaseStep(note, sfxRootNoteOffs, sfxRate, 11025, 0x2000));
_currentSFX = Audio::makeRawMemoryStream(sfxPlaybackBuffer, playbackBufferSize, DisposeAfterUse::YES,
- outputRate, Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN, 0, 0);
+ outputRate, Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _currentSFX);
}
@@ -4298,7 +4298,7 @@
uint32 outputRate = uint32(11025 * SoundTowns::calculatePhaseStep(0x3c, 0x3c, sfxRate, 11025, 0x2000));
_currentSFX = Audio::makeRawMemoryStream(sfx, outsize, DisposeAfterUse::YES, outputRate,
- Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN, 0, 0);
+ Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundChannels[h], _currentSFX);
if (handle)
*handle = _soundChannels[h];
Modified: scummvm/trunk/engines/mohawk/video/qt_player.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video/qt_player.cpp 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/engines/mohawk/video/qt_player.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -1170,7 +1170,7 @@
byte *data = (byte *)malloc(dataSize);
stream->read(data, dataSize);
delete stream;
- return Audio::makeRawMemoryStream(data, dataSize, DisposeAfterUse::YES, _streams[_audioStreamIndex]->sample_rate, flags, 0, 0);
+ return Audio::makeRawMemoryStream(data, dataSize, DisposeAfterUse::YES, _streams[_audioStreamIndex]->sample_rate, flags);
} else if (_streams[_audioStreamIndex]->codec_tag == MKID_BE('ima4')) {
// Riven uses this codec (as do some Myst ME videos)
return Audio::makeADPCMStream(stream, true, stream->size(), Audio::kADPCMApple, _streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels, 34);
Modified: scummvm/trunk/engines/parallaction/sound_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_br.cpp 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/engines/parallaction/sound_br.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -477,7 +477,7 @@
// TODO: Confirm sound rate
int rate = 11025;
- input = Audio::makeRawMemoryStream((byte *)data, dataSize, DisposeAfterUse::YES, rate, 0, 0, 0);
+ input = Audio::makeRawMemoryStream((byte *)data, dataSize, DisposeAfterUse::YES, rate, 0);
} else {
input = Audio::make8SVXStream(*stream, looping);
}
Modified: scummvm/trunk/engines/parallaction/sound_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_ns.cpp 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/engines/parallaction/sound_ns.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -377,7 +377,7 @@
if (!scumm_stricmp("beep", filename)) {
int rate = 11934;
ch->volume = 160;
- input = Audio::makeRawMemoryStream((byte *)beepSoundBuffer, beepSoundBufferSize, DisposeAfterUse::NO, rate, 0, 0, 0);
+ input = Audio::makeRawMemoryStream((byte *)beepSoundBuffer, beepSoundBufferSize, DisposeAfterUse::NO, rate, 0);
} else {
Common::SeekableReadStream *stream = _vm->_disk->loadSound(filename);
input = Audio::make8SVXStream(*stream, looping);
Modified: scummvm/trunk/engines/scumm/player_mod.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_mod.cpp 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/engines/scumm/player_mod.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -95,7 +95,7 @@
_channels[i].pan = pan;
_channels[i].freq = rate;
_channels[i].ctr = 0;
- _channels[i].input = Audio::makeRawMemoryStream((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, (loopStart != loopEnd ? Audio::FLAG_LOOP : 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:33:45 UTC (rev 47471)
+++ scummvm/trunk/engines/scumm/sound.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -353,7 +353,7 @@
if (loopEnd > 0)
flags |= Audio::FLAG_LOOP;
- stream = Audio::makeRawMemoryStream(sound, waveSize, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
+ stream = Audio::makeRawMemoryStream_OLD(sound, waveSize, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0);
}
break;
@@ -446,7 +446,7 @@
}
memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size);
- stream = Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
+ stream = Audio::makeRawMemoryStream_OLD(sound, size, DisposeAfterUse::YES, rate, flags, 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:33:45 UTC (rev 47471)
+++ scummvm/trunk/engines/sky/sound.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -1121,7 +1121,7 @@
}
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(_soundData + dataOfs, dataSize, DisposeAfterUse::NO, sampleRate, flags, 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);
Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/sound/audiostream.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -253,7 +253,7 @@
void QueuingAudioStream::queueBuffer(byte *data, uint32 size, DisposeAfterUse::Flag disposeAfterUse, byte flags) {
- AudioStream *stream = makeRawMemoryStream(data, size, disposeAfterUse, getRate(), flags, 0, 0);
+ AudioStream *stream = makeRawMemoryStream_OLD(data, size, disposeAfterUse, getRate(), flags, 0, 0);
queueAudioStream(stream, DisposeAfterUse::YES);
}
Modified: scummvm/trunk/sound/raw.cpp
===================================================================
--- scummvm/trunk/sound/raw.cpp 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/sound/raw.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -359,7 +359,7 @@
}
-AudioStream *makeRawMemoryStream(const byte *ptr, uint32 len,
+AudioStream *makeRawMemoryStream_OLD(const byte *ptr, uint32 len,
DisposeAfterUse::Flag autoFree,
int rate, byte flags,
uint loopStart, uint loopEnd) {
@@ -422,34 +422,4 @@
}
}
-AudioStream *makeRawDiskStream(Common::SeekableReadStream *stream, RawDiskStreamAudioBlock *block,
- int numBlocks, int rate, byte flags, DisposeAfterUse::Flag disposeStream, uint loopStart, uint loopEnd) {
- SeekableAudioStream *s = makeRawDiskStream(stream, block, numBlocks, rate, flags, disposeStream);
-
- if ((flags & Audio::FLAG_LOOP) != 0) {
- const bool isStereo = (flags & Audio::FLAG_STEREO) != 0;
- const bool is16Bit = (flags & Audio::FLAG_16BITS) != 0;
-
- const uint len = s->getLength().totalNumberOfFrames() / (is16Bit ? 2 : 1) / (isStereo ? 2 : 1);
-
- if (loopEnd == 0)
- loopEnd = len;
- assert(loopStart <= loopEnd);
- assert(loopEnd <= len);
-
- // Verify the buffer sizes are sane
- if (is16Bit && isStereo)
- assert((loopStart & 3) == 0 && (loopEnd & 3) == 0);
- else if (is16Bit || isStereo)
- assert((loopStart & 1) == 0 && (loopEnd & 1) == 0);
-
- const uint32 extRate = s->getRate() * (is16Bit ? 2 : 1) * (isStereo ? 2 : 1);
-
- return new SubLoopingAudioStream(s, 0, Timestamp(0, loopStart, extRate), Timestamp(0, loopEnd, extRate));
- } else {
- return s;
- }
-}
-
-
} // End of namespace Audio
Modified: scummvm/trunk/sound/raw.h
===================================================================
--- scummvm/trunk/sound/raw.h 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/sound/raw.h 2010-01-23 13:34:29 UTC (rev 47472)
@@ -95,7 +95,7 @@
* signed native endian). Optionally supports (infinite) looping of a portion
* of the data.
*/
-AudioStream *makeRawMemoryStream(const byte *ptr, uint32 len,
+AudioStream *makeRawMemoryStream_OLD(const byte *ptr, uint32 len,
DisposeAfterUse::Flag autofreeBuffer,
int rate, byte flags,
uint loopStart, uint loopEnd);
@@ -128,22 +128,7 @@
int rate, byte flags,
DisposeAfterUse::Flag disposeStream);
-/**
- * NOTE:
- * This API is considered deprecated.
- *
- * Factory function for a Raw Disk Stream. This can stream raw PCM
- * audio data from disk. The function takes an pointer to an array of
- * RawDiskStreamAudioBlock which defines the start position and length of
- * each block of uncompressed audio in the stream.
- */
-AudioStream *makeRawDiskStream(Common::SeekableReadStream *stream,
- RawDiskStreamAudioBlock *block, int numBlocks,
- int rate, byte flags,
- DisposeAfterUse::Flag disposeStream,
- uint loopStart, uint loopEnd);
-
} // End of namespace Audio
#endif
Modified: scummvm/trunk/sound/voc.cpp
===================================================================
--- scummvm/trunk/sound/voc.cpp 2010-01-23 13:33:45 UTC (rev 47471)
+++ scummvm/trunk/sound/voc.cpp 2010-01-23 13:34:29 UTC (rev 47472)
@@ -353,7 +353,7 @@
if (!data)
return 0;
- return makeRawMemoryStream(data, size, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
+ return makeRawMemoryStream_OLD(data, size, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
#endif
}
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