[Scummvm-cvs-logs] CVS: scummvm/sky intro.h,1.9,1.10 sound.cpp,1.51,1.52 sound.h,1.28,1.29

Max Horn fingolfin at users.sourceforge.net
Tue May 10 17:05:43 CEST 2005


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

Modified Files:
	intro.h sound.cpp sound.h 
Log Message:
Moved some more stuff to namespace Audio (enough for tonight)

Index: intro.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- intro.h	10 May 2005 23:48:44 -0000	1.9
+++ intro.h	11 May 2005 00:01:34 -0000	1.10
@@ -56,7 +56,7 @@
 	uint8 *_textBuf, *_saveBuf;
 	uint8 *_bgBuf;
 	uint32 _bgSize;
-	SoundHandle _voice, _bgSfx;
+	Audio::SoundHandle _voice, _bgSfx;
 
 	int32 _relDelay;
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sound.cpp	10 May 2005 23:48:44 -0000	1.51
+++ sound.cpp	11 May 2005 00:01:34 -0000	1.52
@@ -1031,7 +1031,7 @@
 	if (_soundData) free(_soundData);
 }
 
-void Sound::playSound(uint32 id, byte *sound, uint32 size, SoundHandle *handle) {
+void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *handle) {
 
 	byte flags = 0;
 	flags |= Audio::Mixer::FLAG_UNSIGNED|Audio::Mixer::FLAG_AUTOFREE;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- sound.h	10 May 2005 23:48:44 -0000	1.28
+++ sound.h	11 May 2005 00:01:34 -0000	1.29
@@ -50,16 +50,16 @@
 public:
 
 	Audio::Mixer *_mixer;
-	SoundHandle _voiceHandle;
-	SoundHandle _effectHandle;
-	SoundHandle _bgSoundHandle;
-	SoundHandle _ingameSound0, _ingameSound1, _ingameSpeech;
+	Audio::SoundHandle _voiceHandle;
+	Audio::SoundHandle _effectHandle;
+	Audio::SoundHandle _bgSoundHandle;
+	Audio::SoundHandle _ingameSound0, _ingameSound1, _ingameSpeech;
 
 	uint16 _saveSounds[2];
 
 protected:
 
-	void playSound(uint32 id, byte *sound, uint32 size, SoundHandle *handle);
+	void playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *handle);
 
 public:
 	Sound(Audio::Mixer *mixer, Disk *pDisk, uint8 pVolume);





More information about the Scummvm-git-logs mailing list