diff options
| author | Max Horn | 2010-01-23 13:34:59 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-23 13:34:59 +0000 |
| commit | f189cc39fce6a17892b52aa10ede02bb11679f67 (patch) | |
| tree | 2e22bb3cfda7dd2215072d9c88ba8b64d081ad87 /sound | |
| parent | b036392a7b1c49a3a9d1ac0d0dd035feb7063058 (diff) | |
| download | scummvm-rg350-f189cc39fce6a17892b52aa10ede02bb11679f67.tar.gz scummvm-rg350-f189cc39fce6a17892b52aa10ede02bb11679f67.tar.bz2 scummvm-rg350-f189cc39fce6a17892b52aa10ede02bb11679f67.zip | |
Get rid of FLAG_LOOP
svn-id: r47473
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/audiostream.cpp | 2 | ||||
| -rw-r--r-- | sound/raw.cpp | 2 | ||||
| -rw-r--r-- | sound/raw.h | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index a2156b698d..d685de1afe 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -253,7 +253,7 @@ bool SubSeekableAudioStream::seek(const Timestamp &where) { 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); } diff --git a/sound/raw.cpp b/sound/raw.cpp index 7899c8af87..dae38daeb1 100644 --- a/sound/raw.cpp +++ b/sound/raw.cpp @@ -365,7 +365,7 @@ AudioStream *makeRawMemoryStream_OLD(const byte *ptr, uint32 len, 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; diff --git a/sound/raw.h b/sound/raw.h index d187c325e1..bd54f55676 100644 --- a/sound/raw.h +++ b/sound/raw.h @@ -58,10 +58,7 @@ enum RawFlags { 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 }; |