diff options
author | Max Horn | 2004-01-03 14:10:13 +0000 |
---|---|---|
committer | Max Horn | 2004-01-03 14:10:13 +0000 |
commit | bfea71b0c46ea93b80ee2f6f08ba29ba8768171a (patch) | |
tree | 734b6137e4aaaa043d5db905dc67700bcdc7daa4 /sound/vorbis.cpp | |
parent | 2a6745a9862fc067a7b529feec0943ec56c79c7c (diff) | |
download | scummvm-rg350-bfea71b0c46ea93b80ee2f6f08ba29ba8768171a.tar.gz scummvm-rg350-bfea71b0c46ea93b80ee2f6f08ba29ba8768171a.tar.bz2 scummvm-rg350-bfea71b0c46ea93b80ee2f6f08ba29ba8768171a.zip |
renamed AudioInputStream -> AudioStream
svn-id: r12110
Diffstat (limited to 'sound/vorbis.cpp')
-rw-r--r-- | sound/vorbis.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index bcee8b792b..e0b7bd0b57 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -32,7 +32,7 @@ #include <vorbis/vorbisfile.h> -AudioInputStream *makeVorbisStream(OggVorbis_File *file, int duration); +AudioStream *makeVorbisStream(OggVorbis_File *file, int duration); #pragma mark - @@ -145,7 +145,7 @@ void VorbisTrackInfo::play(SoundMixer *mixer, PlayingSoundHandle *handle, int st ov_time_seek(&_ov_file, startFrame / 75.0); #endif - AudioInputStream *input = makeVorbisStream(&_ov_file, duration * ov_info(&_ov_file, -1)->rate / 75); + AudioStream *input = makeVorbisStream(&_ov_file, duration * ov_info(&_ov_file, -1)->rate / 75); mixer->playInputStream(handle, input, true); } @@ -165,7 +165,7 @@ DigitalTrackInfo *makeVorbisTrackInfo(File *file) { #pragma mark - -class VorbisInputStream : public AudioInputStream { +class VorbisInputStream : public AudioStream { OggVorbis_File *_ov_file; int _end_pos; int _numChannels; @@ -274,11 +274,11 @@ void VorbisInputStream::refill() { _bufferEnd = (int16 *)read_pos; } -AudioInputStream *makeVorbisStream(OggVorbis_File *file, int duration) { +AudioStream *makeVorbisStream(OggVorbis_File *file, int duration) { return new VorbisInputStream(file, duration); } -AudioInputStream *makeVorbisStream(File *file, uint32 size) { +AudioStream *makeVorbisStream(File *file, uint32 size) { OggVorbis_File *ov_file = new OggVorbis_File; file_info *f = new file_info; |