diff options
| author | Max Horn | 2003-09-05 21:06:32 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-05 21:06:32 +0000 |
| commit | 06b6ff9a44b847423ee611d92dbf8c5fbe583499 (patch) | |
| tree | 63e3fcf63e2edac6f1a5b1694c00ce92733a2a8e /sound | |
| parent | 11193b0746b0ac2962c98255663dd1beef3fc2a1 (diff) | |
| download | scummvm-rg350-06b6ff9a44b847423ee611d92dbf8c5fbe583499.tar.gz scummvm-rg350-06b6ff9a44b847423ee611d92dbf8c5fbe583499.tar.bz2 scummvm-rg350-06b6ff9a44b847423ee611d92dbf8c5fbe583499.zip | |
added default volume/pan values
svn-id: r10019
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 1f5b5b78f5..415c73b9b1 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -90,17 +90,17 @@ public: // start playing a raw sound int playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, - byte volume, int8 pan, int id = -1, uint32 loopStart = 0, uint32 loopEnd = 0); + byte volume = 255, int8 pan = 0, int id = -1, uint32 loopStart = 0, uint32 loopEnd = 0); #ifdef USE_MAD - int playMP3(PlayingSoundHandle *handle, File *file, uint32 size, byte volume, int8 pan); - int playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_timer_t duration, byte volume, int8 pan); + int playMP3(PlayingSoundHandle *handle, File *file, uint32 size, byte volume = 255, int8 pan = 0); + int playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_timer_t duration, byte volume = 255, int8 pan = 0); #endif #ifdef USE_VORBIS - int playVorbis(PlayingSoundHandle *handle, OggVorbis_File *ov_file, int duration, bool is_cd_track, byte volume, int8 pan); + int playVorbis(PlayingSoundHandle *handle, OggVorbis_File *ov_file, int duration, bool is_cd_track, byte volume = 255, int8 pan = 0); #endif /** Start a new stream. */ - int newStream(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, uint32 buffer_size, byte volume, int8 pan); + int newStream(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, uint32 buffer_size, byte volume = 255, int8 pan = 0); /** Append to an existing stream. */ void appendStream(PlayingSoundHandle handle, void *sound, uint32 size); |