[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.h,1.15,1.16 smush_player.h,1.47,1.48

Max Horn fingolfin at users.sourceforge.net
Tue May 10 17:04:31 CEST 2005


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

Modified Files:
	smush_mixer.h smush_player.h 
Log Message:
Moved some more stuff to namespace Audio (enough for tonight)

Index: smush_mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- smush_mixer.h	10 May 2005 23:48:42 -0000	1.15
+++ smush_mixer.h	11 May 2005 00:01:31 -0000	1.16
@@ -39,7 +39,7 @@
 	struct channels {
 		int id;
 		SmushChannel *chan;
-		SoundHandle handle;
+		Audio::SoundHandle handle;
 		AppendableAudioStream *stream;
 	} _channels[NUM_CHANNELS];
 

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- smush_player.h	10 May 2005 22:56:15 -0000	1.47
+++ smush_player.h	11 May 2005 00:01:32 -0000	1.48
@@ -56,10 +56,10 @@
 	bool _skips[37];
 	int32 _frame;
 
-	SoundHandle _IACTchannel;
+	Audio::SoundHandle _IACTchannel;
 	AppendableAudioStream *_IACTstream;
 
-	SoundHandle _compressedFileSoundHandle;
+	Audio::SoundHandle _compressedFileSoundHandle;
 	bool _compressedFileMode;
 	Common::File _compressedFile;
 	byte _IACToutput[4096];





More information about the Scummvm-git-logs mailing list