[Scummvm-cvs-logs] CVS: residual/imuse imuse.cpp,1.9,1.10 imuse.h,1.6,1.7 imuse_mcmp_mgr.cpp,1.11,1.12 imuse_mcmp_mgr.h,1.4,1.5 imuse_music.cpp,1.5,1.6 imuse_script.cpp,1.6,1.7 imuse_sndmgr.cpp,1.8,1.9 imuse_sndmgr.h,1.5,1.6 imuse_tables.cpp,1.8,1.9 imuse_track.cpp,1.7,1.8

[Pawel Kolodziejski]

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

Modified Files:
	imuse.cpp imuse.h imuse_mcmp_mgr.cpp imuse_mcmp_mgr.h 
	imuse_music.cpp imuse_script.cpp imuse_sndmgr.cpp 
	imuse_sndmgr.h imuse_tables.cpp imuse_track.cpp 
Log Message:
cleanup headers

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- imuse.cpp	1 Jan 2005 10:23:16 -0000	1.9
+++ imuse.cpp	1 Jan 2005 12:27:57 -0000	1.10
@@ -15,17 +15,17 @@
 //  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 "../timer.h"
-#include "../engine.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
+#include "timer.h"
+#include "engine.h"
 
-#include "../mixer/mixer.h"
-#include "../mixer/audiostream.h"
+#include "mixer/mixer.h"
+#include "mixer/audiostream.h"
 
-#include "imuse.h"
-#include "imuse_sndmgr.h"
+#include "imuse/imuse.h"
+#include "imuse/imuse_sndmgr.h"
 
 Imuse *g_imuse = NULL;
 

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imuse.h	1 Jan 2005 10:23:16 -0000	1.6
+++ imuse.h	1 Jan 2005 12:27:57 -0000	1.7
@@ -18,15 +18,15 @@
 #ifndef IMUSE_H
 #define IMUSE_H
 
-#include "../stdafx.h"
-#include "../bits.h"
-#include "../debug.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
 
-#include "../mixer/mixer.h"
-#include "../mixer/audiostream.h"
+#include "mixer/mixer.h"
+#include "mixer/audiostream.h"
 
-#include "imuse_sndmgr.h"
-#include "imuse_mcmp_mgr.h"
+#include "imuse/imuse_sndmgr.h"
+#include "imuse/imuse_mcmp_mgr.h"
 
 #define MAX_IMUSE_TRACKS 8
 #define MAX_IMUSE_FADETRACKS 8

Index: imuse_mcmp_mgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_mcmp_mgr.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imuse_mcmp_mgr.cpp	1 Jan 2005 10:23:16 -0000	1.11
+++ imuse_mcmp_mgr.cpp	1 Jan 2005 12:27:57 -0000	1.12
@@ -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 "../resource.h"
-#include "../engine.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
+#include "resource.h"
+#include "engine.h"
 
-#include "imuse_mcmp_mgr.h"
+#include "imuse/imuse_mcmp_mgr.h"
 
 uint16 imuseDestTable[5786];
 

Index: imuse_mcmp_mgr.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_mcmp_mgr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imuse_mcmp_mgr.h	1 Jan 2005 10:23:16 -0000	1.4
+++ imuse_mcmp_mgr.h	1 Jan 2005 12:27:57 -0000	1.5
@@ -18,15 +18,15 @@
 #ifndef MCMP_MGR_H
 #define MCMP_MGR_H
 
-#include "../stdafx.h"
-#include "../bits.h"
-#include "../debug.h"
-#include "../timer.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
+#include "timer.h"
 
-#include "../mixer/mixer.h"
-#include "../mixer/audiostream.h"
+#include "mixer/mixer.h"
+#include "mixer/audiostream.h"
 
-#include "imuse_sndmgr.h"
+#include "imuse/imuse_sndmgr.h"
 
 class McmpMgr {
 private:

Index: imuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_music.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imuse_music.cpp	1 Jan 2005 10:23:16 -0000	1.5
+++ imuse_music.cpp	1 Jan 2005 12:27:57 -0000	1.6
@@ -15,11 +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 "../bits.h"
-#include "../debug.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
 
-#include "imuse.h"
+#include "imuse/imuse.h"
 
 void Imuse::setMusicState(int stateId) {
 	int l, num = -1;

Index: imuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_script.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imuse_script.cpp	1 Jan 2005 10:23:16 -0000	1.6
+++ imuse_script.cpp	1 Jan 2005 12:27:57 -0000	1.7
@@ -15,16 +15,16 @@
 //  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 "../timer.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
+#include "timer.h"
 
-#include "../mixer/mixer.h"
-#include "../mixer/audiostream.h"
+#include "mixer/mixer.h"
+#include "mixer/audiostream.h"
 
-#include "imuse.h"
-#include "imuse_sndmgr.h"
+#include "imuse/imuse.h"
+#include "imuse/imuse_sndmgr.h"
 
 void Imuse::flushTracks() {
 	for (int l = 0; l < MAX_IMUSE_TRACKS + MAX_IMUSE_FADETRACKS; l++) {

Index: imuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_sndmgr.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imuse_sndmgr.cpp	1 Jan 2005 11:18:34 -0000	1.8
+++ imuse_sndmgr.cpp	1 Jan 2005 12:27:57 -0000	1.9
@@ -15,17 +15,17 @@
 //  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 "../timer.h"
-#include "../resource.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
+#include "timer.h"
+#include "resource.h"
 
-#include "../mixer/mixer.h"
-#include "../mixer/audiostream.h"
+#include "mixer/mixer.h"
+#include "mixer/audiostream.h"
 
-#include "imuse_sndmgr.h"
-#include "imuse_mcmp_mgr.h"
+#include "imuse/imuse_sndmgr.h"
+#include "imuse/imuse_mcmp_mgr.h"
 
 ImuseSndMgr::ImuseSndMgr() {
 	for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {

Index: imuse_sndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_sndmgr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imuse_sndmgr.h	1 Jan 2005 10:23:16 -0000	1.5
+++ imuse_sndmgr.h	1 Jan 2005 12:27:57 -0000	1.6
@@ -18,13 +18,13 @@
 #ifndef IMUSE_SNDMGR_H
 #define IMUSE_SNDMGR_H
 
-#include "../stdafx.h"
-#include "../bits.h"
-#include "../debug.h"
-#include "../timer.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
+#include "timer.h"
 
-#include "../mixer/mixer.h"
-#include "../mixer/audiostream.h"
+#include "mixer/mixer.h"
+#include "mixer/audiostream.h"
 
 class McmpMgr;
 

Index: imuse_tables.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_tables.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imuse_tables.cpp	1 Jan 2005 10:23:16 -0000	1.8
+++ imuse_tables.cpp	1 Jan 2005 12:27:57 -0000	1.9
@@ -15,11 +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 "../bits.h"
-#include "../debug.h"
+#include "stdafx.h"
+#include "bits.h"
+#include "debug.h"
 
-#include "imuse.h"
+#include "imuse/imuse.h"
 
 ImuseTable grimStateMusicTable[] = {
 	{0, 1000,   0, 0, 60, 127,   0, ""},

Index: imuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_track.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- imuse_track.cpp	1 Jan 2005 10:23:16 -0000	1.7
+++ imuse_track.cpp	1 Jan 2005 12:27:57 -0000	1.8
@@ -15,15 +15,15 @@
 //  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/mixer.h"
-#include "../mixer/audiostream.h"
+#include "mixer/mixer.h"
+#include "mixer/audiostream.h"
 
-#include "imuse.h"
-#include "imuse_sndmgr.h"
+#include "imuse/imuse.h"
+#include "imuse/imuse_sndmgr.h"
 
 int Imuse::allocSlot(int priority) {
 	int l, lowest_priority = 127;