[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.75,1.76 sound.h,1.19,1.20 vga.cpp,1.121,1.122

Max Horn fingolfin at users.sourceforge.net
Sat Mar 12 10:57:26 CET 2005


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9326/simon

Modified Files:
	sound.cpp sound.h vga.cpp 
Log Message:
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- sound.cpp	9 Mar 2005 18:12:47 -0000	1.75
+++ sound.cpp	12 Mar 2005 18:55:46 -0000	1.76
@@ -45,25 +45,25 @@
 	BaseSound(SoundMixer *mixer, File *file, uint32 base = 0, bool bigendian = false);
 	BaseSound(SoundMixer *mixer, File *file, uint32 *offsets, bool bigendian = false);
 	virtual ~BaseSound();
-	virtual void playSound(uint sound, PlayingSoundHandle *handle, byte flags) = 0;
+	virtual void playSound(uint sound, SoundHandle *handle, byte flags) = 0;
 };
 
 class WavSound : public BaseSound {
 public:
 	WavSound(SoundMixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
 	WavSound(SoundMixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {};
-	void playSound(uint sound, PlayingSoundHandle *handle, byte flags);
+	void playSound(uint sound, SoundHandle *handle, byte flags);
 };
 
 class VocSound : public BaseSound {
 public:
 	VocSound(SoundMixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
-	void playSound(uint sound, PlayingSoundHandle *handle, byte flags);
+	void playSound(uint sound, SoundHandle *handle, byte flags);
 };
 class RawSound : public BaseSound {
 public:
 	RawSound(SoundMixer *mixer, File *file, uint32 base = 0, bool bigendian = false) : BaseSound(mixer, file, base, bigendian) {};
-	void playSound(uint sound, PlayingSoundHandle *handle, byte flags);
+	void playSound(uint sound, SoundHandle *handle, byte flags);
 };
 
 BaseSound::BaseSound(SoundMixer *mixer, File *file, uint32 base, bool bigendian) {
@@ -117,7 +117,7 @@
 	delete _file;
 }
 	
-void WavSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
+void WavSound::playSound(uint sound, SoundHandle *handle, byte flags) {
 	if (_offsets == NULL)
 		return;
 
@@ -132,7 +132,7 @@
 	_mixer->playInputStream(SoundMixer::kSFXSoundType, handle, stream);
 }
 
-void VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
+void VocSound::playSound(uint sound, SoundHandle *handle, byte flags) {
 	if (_offsets == NULL)
 		return;
 
@@ -144,7 +144,7 @@
 	_mixer->playRaw(handle, buffer, size, samples_per_sec, flags | SoundMixer::FLAG_AUTOFREE);
 }
 
-void RawSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
+void RawSound::playSound(uint sound, SoundHandle *handle, byte flags) {
 	if (_offsets == NULL)
 		return;
 
@@ -161,10 +161,10 @@
 class MP3Sound : public BaseSound {
 public:
 	MP3Sound(SoundMixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
-	void playSound(uint sound, PlayingSoundHandle *handle, byte flags);
+	void playSound(uint sound, SoundHandle *handle, byte flags);
 };
 
-void MP3Sound::playSound(uint sound, PlayingSoundHandle *handle, byte flags)
+void MP3Sound::playSound(uint sound, SoundHandle *handle, byte flags)
 {
 	if (_offsets == NULL)
 		return;
@@ -185,10 +185,10 @@
 class VorbisSound : public BaseSound {
 public:
 	VorbisSound(SoundMixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
-	void playSound(uint sound, PlayingSoundHandle *handle, byte flags);
+	void playSound(uint sound, SoundHandle *handle, byte flags);
 };
 
-void VorbisSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags)
+void VorbisSound::playSound(uint sound, SoundHandle *handle, byte flags)
 {
 	if (_offsets == NULL)
 		return;
@@ -209,10 +209,10 @@
 class FlacSound : public BaseSound {
 public:
 	FlacSound(SoundMixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
-	void playSound(uint sound, PlayingSoundHandle *handle, byte flags);
+	void playSound(uint sound, SoundHandle *handle, byte flags);
 };
 
-void FlacSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags)
+void FlacSound::playSound(uint sound, SoundHandle *handle, byte flags)
 {
 	if (_offsets == NULL)
 		return;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sound.h	1 Jan 2005 16:09:20 -0000	1.19
+++ sound.h	12 Mar 2005 18:55:47 -0000	1.20
@@ -45,9 +45,9 @@
 	uint16 _last_voice_file;
 
 public:
-	PlayingSoundHandle _voice_handle;
-	PlayingSoundHandle _effects_handle;
-	PlayingSoundHandle _ambient_handle;
+	SoundHandle _voice_handle;
+	SoundHandle _effects_handle;
+	SoundHandle _ambient_handle;
 
 	bool _voice_file;
 	uint _ambient_playing;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- vga.cpp	10 Jan 2005 22:06:15 -0000	1.121
+++ vga.cpp	12 Mar 2005 18:56:04 -0000	1.122
@@ -1606,7 +1606,7 @@
 			vc_kill_sprite(file, start);
 		} while (++start != end);
 	} else {
-		if (!_sound->_voice_handle.isActive())
+		if (!_mixer->isSoundHandleActive(_sound->_voice_handle))
 			vc_skip_next_instruction();
 	}
 }
@@ -1789,7 +1789,7 @@
 
 void SimonEngine::vc_64_skip_if_no_speech() {
 	// Simon2
-	if (!_sound->_voice_handle.isActive() || (_subtitles && _language != 20))
+	if (!_mixer->isSoundHandleActive(_sound->_voice_handle) || (_subtitles && _language != 20))
 		vc_skip_next_instruction();
 }
 





More information about the Scummvm-git-logs mailing list