diff options
| author | Max Horn | 2008-09-13 16:51:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-13 16:51:46 +0000 |
| commit | 655ce26b3f09628d9408a4d82efe3a26116999fe (patch) | |
| tree | 779a25dbe25c8f916fb385b3dd2d48e0e379d9ec /sound | |
| parent | b86a047164b54c20366fcbe21b55bf63f2ced5f4 (diff) | |
| download | scummvm-rg350-655ce26b3f09628d9408a4d82efe3a26116999fe.tar.gz scummvm-rg350-655ce26b3f09628d9408a4d82efe3a26116999fe.tar.bz2 scummvm-rg350-655ce26b3f09628d9408a4d82efe3a26116999fe.zip | |
Big patch changing the signature of various Stream methods (some ports may need to be slightly tweaked to fix overloading errors/warnings)
svn-id: r34514
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/adpcm.cpp | 2 | ||||
| -rw-r--r-- | sound/flac.cpp | 2 | ||||
| -rw-r--r-- | sound/mods/infogrames.cpp | 8 | ||||
| -rw-r--r-- | sound/wave.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp index ad072af360..a30cf9c61e 100644 --- a/sound/adpcm.cpp +++ b/sound/adpcm.cpp @@ -38,7 +38,7 @@ class ADPCMInputStream : public AudioStream { private: Common::SeekableReadStream *_stream; bool _disposeAfterUse; - uint32 _endpos; + int32 _endpos; int _channels; typesADPCM _type; uint32 _blockAlign; diff --git a/sound/flac.cpp b/sound/flac.cpp index bb1a6fb4be..7b46f0660f 100644 --- a/sound/flac.cpp +++ b/sound/flac.cpp @@ -656,7 +656,7 @@ inline ::FLAC__StreamDecoderWriteStatus FlacInputStream::callbackWrite(const ::F inline ::FLAC__SeekableStreamDecoderSeekStatus FlacInputStream::callbackSeek(FLAC__uint64 absoluteByteOffset) { _inStream->seek(absoluteByteOffset, SEEK_SET); - const bool result = (absoluteByteOffset == _inStream->pos()); + const bool result = (absoluteByteOffset == (FLAC__uint64)_inStream->pos()); #ifdef LEGACY_FLAC return result ? FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK : FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR; diff --git a/sound/mods/infogrames.cpp b/sound/mods/infogrames.cpp index d5b285576a..a5b3ea1f35 100644 --- a/sound/mods/infogrames.cpp +++ b/sound/mods/infogrames.cpp @@ -61,10 +61,10 @@ bool Infogrames::Instruments::load(const char *ins) { bool Infogrames::Instruments::load(Common::SeekableReadStream &ins) { int i; - uint32 fsize; - uint32 offset[32]; - uint32 offsetRepeat[32]; - uint32 dataOffset; + int32 fsize; + int32 offset[32]; + int32 offsetRepeat[32]; + int32 dataOffset; unload(); diff --git a/sound/wave.cpp b/sound/wave.cpp index 249518aafc..72a3992401 100644 --- a/sound/wave.cpp +++ b/sound/wave.cpp @@ -34,7 +34,7 @@ namespace Audio { bool loadWAVFromStream(Common::SeekableReadStream &stream, int &size, int &rate, byte &flags, uint16 *wavType, int *blockAlign_) { - const uint32 initialPos = stream.pos(); + const int32 initialPos = stream.pos(); byte buf[4+1]; buf[4] = 0; @@ -45,7 +45,7 @@ bool loadWAVFromStream(Common::SeekableReadStream &stream, int &size, int &rate, return false; } - uint32 wavLength = stream.readUint32LE(); + int32 wavLength = stream.readUint32LE(); stream.read(buf, 4); if (memcmp(buf, "WAVE", 4) != 0) { |