[Scummvm-cvs-logs] CVS: residual/mixer audiostream.cpp,1.5,1.6 audiostream.h,1.5,1.6 mixer.cpp,1.7,1.8 mixer.h,1.6,1.7 rate.cpp,1.4,1.5 rate.h,1.4,1.5

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual/mixer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24066/mixer

Modified Files:
	audiostream.cpp audiostream.h mixer.cpp mixer.h rate.cpp 
	rate.h 
Log Message:
cleanup headers

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/audiostream.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- audiostream.cpp	1 Jan 2005 10:23:17 -0000	1.5
+++ audiostream.cpp	1 Jan 2005 12:27:57 -0000	1.6
@@ -15,10 +15,11 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-#include "../stdafx.h"
-#include "../debug.h"
-#include "mixer.h"
-#include "audiostream.h"
+#include "stdafx.h"
+#include "debug.h"
+
+#include "mixer/mixer.h"
+#include "mixer/audiostream.h"
 
 #define READSAMPLE(is16Bit, isUnsigned, ptr) \
 	((is16Bit ? READ_BE_UINT16(ptr) : (*ptr << 8)) ^ (isUnsigned ? 0x8000 : 0))

Index: audiostream.h
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/audiostream.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- audiostream.h	1 Jan 2005 10:23:17 -0000	1.5
+++ audiostream.h	1 Jan 2005 12:27:57 -0000	1.6
@@ -18,8 +18,8 @@
 #ifndef AUDIOSTREAM_H
 #define AUDIOSTREAM_H
 
-#include "../stdafx.h"
-#include "../bits.h"
+#include "stdafx.h"
+#include "bits.h"
 
 
 /**

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/mixer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mixer.cpp	1 Jan 2005 10:23:17 -0000	1.7
+++ mixer.cpp	1 Jan 2005 12:27:57 -0000	1.8
@@ -15,13 +15,13 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-#include "../stdafx.h"
-#include "../bits.h"
-#include "../debug.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
 
-#include "mixer.h"
-#include "rate.h"
-#include "audiostream.h"
+#include "mixer/mixer.h"
+#include "mixer/rate.h"
+#include "mixer/audiostream.h"
 
 SoundMixer *g_mixer = NULL;
 

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/mixer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mixer.h	1 Jan 2005 10:23:17 -0000	1.6
+++ mixer.h	1 Jan 2005 12:27:57 -0000	1.7
@@ -18,8 +18,9 @@
 #ifndef SOUND_MIXER_H
 #define SOUND_MIXER_H
 
-#include "../stdafx.h"
-#include "../bits.h"
+#include "stdafx.h"
+#include "bits.h"
+
 #include <SDL.h>
 
 class AudioStream;

Index: rate.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/rate.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rate.cpp	1 Jan 2005 10:23:17 -0000	1.4
+++ rate.cpp	1 Jan 2005 12:27:57 -0000	1.5
@@ -23,10 +23,11 @@
  * improvments over the original code were made.
  */
 
-#include "../stdafx.h"
-#include "rate.h"
-#include "audiostream.h"
-#include "../debug.h"
+#include "stdafx.h"
+#include "debug.h"
+
+#include "mixer/rate.h"
+#include "mixer/audiostream.h"
 
 /**
  * The precision of the fractional computations used by the rate converter.

Index: rate.h
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/rate.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rate.h	1 Jan 2005 10:23:17 -0000	1.4
+++ rate.h	1 Jan 2005 12:27:57 -0000	1.5
@@ -18,7 +18,7 @@
 #ifndef SOUND_RATE_H
 #define SOUND_RATE_H
 
-#include "../bits.h"
+#include "bits.h"
 
 class AudioStream;