diff options
author | Max Horn | 2005-01-09 15:49:43 +0000 |
---|---|---|
committer | Max Horn | 2005-01-09 15:49:43 +0000 |
commit | 9cea3d393f0c3657f3caef72a13dce5594581bdd (patch) | |
tree | 0845e073ddb06361682bad70c681119fe707ec99 /sound/voc.cpp | |
parent | eeea238ef72083a3e32b157531abae6f4ae66ab0 (diff) | |
download | scummvm-rg350-9cea3d393f0c3657f3caef72a13dce5594581bdd.tar.gz scummvm-rg350-9cea3d393f0c3657f3caef72a13dce5594581bdd.tar.bz2 scummvm-rg350-9cea3d393f0c3657f3caef72a13dce5594581bdd.zip |
Added shared code to load WAV(E) data from arbitrary seekable streams (files or memory)
svn-id: r16502
Diffstat (limited to 'sound/voc.cpp')
-rw-r--r-- | sound/voc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/voc.cpp b/sound/voc.cpp index 84bc80d35a..12c2c520a5 100644 --- a/sound/voc.cpp +++ b/sound/voc.cpp @@ -43,11 +43,6 @@ int getSampleRateFromVOCRate(int vocSR) { } } -byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate) { - int loops, begin_loop, end_loop; - return loadVOCFromStream(stream, size, rate, loops, begin_loop, end_loop); -} - byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate, int &loops, int &begin_loop, int &end_loop) { VocFileHeader fileHeader; @@ -128,6 +123,11 @@ byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate, int &l return ret_sound; } +byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate) { + int loops, begin_loop, end_loop; + return loadVOCFromStream(stream, size, rate, loops, begin_loop, end_loop); +} + AudioStream *makeVOCStream(Common::ReadStream &stream) { int size, rate; byte *data = loadVOCFromStream(stream, size, rate); |