[Scummvm-cvs-logs] CVS: scummvm/sound mixer.h,1.49,1.50
Max Horn
fingolfin at users.sourceforge.net
Fri Sep 5 14:07:04 CEST 2003
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv2778/sound
Modified Files:
mixer.h
Log Message:
added default volume/pan values
Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- mixer.h 5 Sep 2003 20:48:32 -0000 1.49
+++ mixer.h 5 Sep 2003 21:06:31 -0000 1.50
@@ -90,17 +90,17 @@
// 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);
More information about the Scummvm-git-logs
mailing list