diff options
| author | Max Horn | 2003-12-23 19:14:57 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-23 19:14:57 +0000 |
| commit | 43875b42fcefae5e0f009acd87407e8d545623c6 (patch) | |
| tree | 99c3fcf2db3bc4f2b6e4c6aebf9c5ede5626f777 /sound/mixer.h | |
| parent | 88d7cd586d49aa9133383d95833e7129f1ae22ee (diff) | |
| download | scummvm-rg350-43875b42fcefae5e0f009acd87407e8d545623c6.tar.gz scummvm-rg350-43875b42fcefae5e0f009acd87407e8d545623c6.tar.bz2 scummvm-rg350-43875b42fcefae5e0f009acd87407e8d545623c6.zip | |
Allow sound ID for MP3/Vorbis sounds, too; cleaned up Vorbis playback code a bit
svn-id: r11879
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 33151b7007..3ed2cd798f 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -99,15 +99,15 @@ public: void playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, int id = -1, byte volume = 255, int8 pan = 0, uint32 loopStart = 0, uint32 loopEnd = 0); #ifdef USE_MAD - void playMP3(PlayingSoundHandle *handle, File *file, uint32 size, byte volume = 255, int8 pan = 0); - void playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_timer_t duration, byte volume = 255, int8 pan = 0); + void playMP3(PlayingSoundHandle *handle, File *file, uint32 size, byte volume = 255, int8 pan = 0, int id = -1); + void playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_timer_t duration, byte volume = 255, int8 pan = 0, int id = -1); #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); + void playVorbis(PlayingSoundHandle *handle, File *file, uint32 size, byte volume = 255, int8 pan = 0, int id = -1); + void playVorbis(PlayingSoundHandle *handle, OggVorbis_File *ov_file, int duration, bool is_cd_track, byte volume = 255, int8 pan = 0, int id = -1); #endif - void playInputStream(PlayingSoundHandle *handle, AudioInputStream *input, bool isMusic, byte volume = 255, int8 pan = 0); + void playInputStream(PlayingSoundHandle *handle, AudioInputStream *input, bool isMusic, byte volume = 255, int8 pan = 0, int id = -1); /** Start a new stream. */ @@ -116,7 +116,12 @@ public: /** Append to an existing stream. */ void appendStream(PlayingSoundHandle handle, void *sound, uint32 size); - /** Mark a stream as finished - it will play all its remaining data, then stop. */ + /** + * Mark a stream as finished. + * Where stopHandle() would stop the sound immediately, when using this + * method, the stream will first finish playing all its data before it + * finally stops. + */ void endStream(PlayingSoundHandle handle); /** stop all currently playing sounds */ |