[Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.47,1.48 alsa.cpp,1.12,1.13 morphos.cpp,1.7,1.8 quicktime.cpp,1.7,1.8 seq.cpp,1.8,1.9 windows.cpp,1.11,1.12 ypa1.cpp,1.5,1.6

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv13976

Modified Files:
	adlib.cpp alsa.cpp morphos.cpp quicktime.cpp seq.cpp 
	windows.cpp ypa1.cpp 
Log Message:
moved declaration of error/warning/debug from engine.h to util.h

Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- adlib.cpp	17 Aug 2003 19:31:10 -0000	1.47
+++ adlib.cpp	10 Sep 2003 12:23:42 -0000	1.48
@@ -22,7 +22,7 @@
 #include "sound/mididrv.h"
 #include "sound/fmopl.h"
 #include "sound/mixer.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/engine.h"	// for g_system
 #include "common/util.h"
 
 #define BASE_FREQ 250

Index: alsa.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/alsa.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- alsa.cpp	6 Jul 2003 20:19:54 -0000	1.12
+++ alsa.cpp	10 Sep 2003 12:23:42 -0000	1.13
@@ -28,7 +28,7 @@
 #include "sound/mpu401.h"
 
 #include "stdafx.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/util.h"
 #include <alsa/asoundlib.h>
 
 /*

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/morphos.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- morphos.cpp	23 Aug 2003 18:03:17 -0000	1.7
+++ morphos.cpp	10 Sep 2003 12:23:42 -0000	1.8
@@ -31,7 +31,8 @@
 
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "common/engine.h" // For warning/error/debug
+#include "common/engine.h"	// for g_system
+#include "common/util.h"
 #include "morphos.h"
 #include "morphos_sound.h"
 

Index: quicktime.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/quicktime.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- quicktime.cpp	24 Jun 2003 11:56:43 -0000	1.7
+++ quicktime.cpp	10 Sep 2003 12:23:42 -0000	1.8
@@ -22,7 +22,7 @@
 
 
 #include "sound/mpu401.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/util.h"
 
 #if defined(MACOSX)
 #include <QuickTime/QuickTimeComponents.h>

Index: seq.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/seq.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- seq.cpp	11 Jun 2003 05:54:46 -0000	1.8
+++ seq.cpp	10 Sep 2003 12:23:42 -0000	1.9
@@ -29,7 +29,7 @@
 
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/util.h"
 
 ////////////////////////////////////////
 //

Index: windows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/windows.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- windows.cpp	11 Jun 2003 05:54:46 -0000	1.11
+++ windows.cpp	10 Sep 2003 12:23:42 -0000	1.12
@@ -22,7 +22,7 @@
 
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "common/engine.h" // For warning/error/debug
+#include "common/util.h"
 
 ////////////////////////////////////////
 //

Index: ypa1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/ypa1.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ypa1.cpp	7 Jul 2003 08:53:05 -0000	1.5
+++ ypa1.cpp	10 Sep 2003 12:23:42 -0000	1.6
@@ -1,6 +1,27 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001-2003 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ */
+
 #include "stdafx.h"
 #include "sound/mpu401.h"
-#include "common/engine.h"	// for warning/error/debug
+#include "common/engine.h"	// for g_system
+#include "common/util.h"
 
 #include "Pa1Lib.h"