diff options
| author | Max Horn | 2003-12-21 00:44:31 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-21 00:44:31 +0000 |
| commit | ec0ebf5380d0f77715e40586243226676480deeb (patch) | |
| tree | b124eff41a4645c2dc3c32fa78e6837ee9571cdc /sound/vorbis.cpp | |
| parent | 676bf4d68326751eb3f1b487eb1d0265684c840d (diff) | |
| download | scummvm-rg350-ec0ebf5380d0f77715e40586243226676480deeb.tar.gz scummvm-rg350-ec0ebf5380d0f77715e40586243226676480deeb.tar.bz2 scummvm-rg350-ec0ebf5380d0f77715e40586243226676480deeb.zip | |
o Make use of the new LinearMemoryStream feature which allows auto-disposing the sound data
o This allows us to get rid of the ChannelRaw class
o Removed the sound index return value from several methods
o Removed all methods dealing with sound indices (i.e. stopChannel and pauseChannel)
svn-id: r11801
Diffstat (limited to 'sound/vorbis.cpp')
| -rw-r--r-- | sound/vorbis.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index 5633ba4d75..b5c8e033fc 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -111,13 +111,13 @@ VorbisTrackInfo::VorbisTrackInfo(File *file) { #define VORBIS_TREMOR #endif -int VorbisTrackInfo::play(SoundMixer *mixer, PlayingSoundHandle *handle, int startFrame, int duration) { +void VorbisTrackInfo::play(SoundMixer *mixer, PlayingSoundHandle *handle, int startFrame, int duration) { #ifdef VORBIS_TREMOR ov_time_seek(&_ov_file, (ogg_int64_t)(startFrame / 75.0 * 1000)); #else ov_time_seek(&_ov_file, startFrame / 75.0); #endif - return mixer->playVorbis(handle, &_ov_file, + mixer->playVorbis(handle, &_ov_file, duration * ov_info(&_ov_file, -1)->rate / 75, true); } |