[Scummvm-cvs-logs] CVS: scummvm/sound mixer.h,1.63,1.64 mixer.cpp,1.141,1.142

Max Horn fingolfin at users.sourceforge.net
Sun Dec 21 07:48:01 CET 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv18221/sound

Modified Files:
	mixer.h mixer.cpp 
Log Message:
added convenience SoundMixer::playVorbis variant which calls through to playSfxSound_Vorbis; made scumm/queen engines use it

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- mixer.h	21 Dec 2003 01:17:03 -0000	1.63
+++ mixer.h	21 Dec 2003 15:47:52 -0000	1.64
@@ -104,6 +104,7 @@
 	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
 

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- mixer.cpp	21 Dec 2003 01:17:03 -0000	1.141
+++ mixer.cpp	21 Dec 2003 15:47:52 -0000	1.142
@@ -269,6 +269,9 @@
 #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);





More information about the Scummvm-git-logs mailing list