aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMax Horn2003-12-21 15:47:52 +0000
committerMax Horn2003-12-21 15:47:52 +0000
commite439eb51290082f204c10feaea2d5a72e3747879 (patch)
tree9a1309f9bce0d711f2369039b447d7ba705b1bc3 /sound
parentf19f73eb5069b4f092714535e77efc0d6881c612 (diff)
downloadscummvm-rg350-e439eb51290082f204c10feaea2d5a72e3747879.tar.gz
scummvm-rg350-e439eb51290082f204c10feaea2d5a72e3747879.tar.bz2
scummvm-rg350-e439eb51290082f204c10feaea2d5a72e3747879.zip
added convenience SoundMixer::playVorbis variant which calls through to playSfxSound_Vorbis; made scumm/queen engines use it
svn-id: r11812
Diffstat (limited to 'sound')
-rw-r--r--sound/mixer.cpp3
-rw-r--r--sound/mixer.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 6f43a4c5f9..4c3e9ca277 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -269,6 +269,9 @@ void SoundMixer::playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_time
#endif
#ifdef USE_VORBIS
+void SoundMixer::playVorbis(PlayingSoundHandle *handle, File *file, uint32 size) {
+ playSfxSound_Vorbis(this, file, size, handle);
+}
void SoundMixer::playVorbis(PlayingSoundHandle *handle, OggVorbis_File *ov_file, int duration, bool is_cd_track, byte volume, int8 pan) {
// Create the input stream
AudioInputStream *input = makeVorbisStream(ov_file, duration);
diff --git a/sound/mixer.h b/sound/mixer.h
index 1f70419c81..fa015dadcf 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -104,6 +104,7 @@ public:
void playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_timer_t duration, byte volume = 255, int8 pan = 0);
#endif
#ifdef USE_VORBIS
+ void playVorbis(PlayingSoundHandle *handle, File *file, uint32 size);
void playVorbis(PlayingSoundHandle *handle, OggVorbis_File *ov_file, int duration, bool is_cd_track, byte volume = 255, int8 pan = 0);
#endif