[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.h,1.11,1.12 fmopl.h,1.9,1.10 mididrv.h,1.22,1.23 mixer.h,1.36,1.37 rate.h,1.9,1.10

[Max Horn]

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

Modified Files:
	audiostream.h fmopl.h mididrv.h mixer.h rate.h 
Log Message:
#include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)

Index: audiostream.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- audiostream.h	31 Jul 2003 01:21:38 -0000	1.11
+++ audiostream.h	1 Aug 2003 12:19:52 -0000	1.12
@@ -22,8 +22,8 @@
 #ifndef AUDIOSTREAM_H
 #define AUDIOSTREAM_H
 
-#include "scummsys.h"
-#include <assert.h>
+#include "stdafx.h"
+#include "common/scummsys.h"
 #ifdef USE_MAD
 #include <mad.h>
 #endif

Index: fmopl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/fmopl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fmopl.h	31 Jul 2003 12:33:33 -0000	1.9
+++ fmopl.h	1 Aug 2003 12:19:52 -0000	1.10
@@ -26,7 +26,7 @@
 #ifndef FMOPL_H_
 #define FMOPL_H_
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 enum {
 	FMOPL_ENV_BITS_HQ = 16,

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mididrv.h	23 May 2003 04:18:26 -0000	1.22
+++ mididrv.h	1 Aug 2003 12:19:52 -0000	1.23
@@ -23,7 +23,7 @@
 #ifndef SOUND_MIDIDRV_H
 #define SOUND_MIDIDRV_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 class MidiChannel;
 

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mixer.h	31 Jul 2003 20:24:10 -0000	1.36
+++ mixer.h	1 Aug 2003 12:19:53 -0000	1.37
@@ -23,6 +23,7 @@
 #ifndef MIXER_H
 #define MIXER_H
 
+#include "stdafx.h"
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
 #endif
@@ -32,7 +33,6 @@
 #ifdef USE_VORBIS
 #include <vorbis/vorbisfile.h>
 #endif
-#include "stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 

Index: rate.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/rate.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rate.h	29 Jul 2003 01:37:03 -0000	1.9
+++ rate.h	1 Aug 2003 12:19:53 -0000	1.10
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/engine.h"
 #include "common/util.h"