[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.h,1.11,1.12 smush_player.h,1.39,1.40

Max Horn fingolfin at users.sourceforge.net
Sat Jan 8 19:17:05 CET 2005


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

Modified Files:
	smush_mixer.h smush_player.h 
Log Message:
Moving AppendableAudioStream into SCUMM engine, as it is only used there

Index: smush_mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- smush_mixer.h	1 Jan 2005 16:09:19 -0000	1.11
+++ smush_mixer.h	9 Jan 2005 03:15:59 -0000	1.12
@@ -23,8 +23,7 @@
 #define SMUSH_MIXER_H
 
 #include "stdafx.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "scumm/sound.h"
 
 namespace Scumm {
 

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- smush_player.h	1 Jan 2005 16:09:19 -0000	1.39
+++ smush_player.h	9 Jan 2005 03:15:59 -0000	1.40
@@ -26,8 +26,7 @@
 #include "scumm/smush/chunk.h"
 #include "scumm/smush/codec37.h"
 #include "scumm/smush/codec47.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "scumm/sound.h"
 
 namespace Scumm {
 





More information about the Scummvm-git-logs mailing list