[Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.4,1.5 gui.cpp,1.2,1.3 newgui.cpp,1.2,1.3

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory usw-pr-cvs1:/tmp/cvs-serv18651/gui

Modified Files:
	dialog.cpp gui.cpp newgui.cpp 
Log Message:
sound system cleanup

Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dialog.cpp	24 Aug 2002 15:31:36 -0000	1.4
+++ dialog.cpp	29 Aug 2002 23:45:15 -0000	1.5
@@ -24,10 +24,12 @@
 #include "newgui.h"
 #include "dialog.h"
 #include "widget.h"
-#include "scumm.h"
 #include "ListWidget.h"
 #include "config-file.h"
+
+#include "scumm/sound.h"
 #include "sound/mididrv.h"
+#include "scumm/scumm.h"
 #include "scumm/imuse.h"
 
 /*

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/gui.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gui.cpp	24 Aug 2002 15:31:36 -0000	1.2
+++ gui.cpp	29 Aug 2002 23:45:15 -0000	1.3
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "sound/mididrv.h"
+#include "scumm/sound.h"
 #include "scumm/imuse.h"
 #include "gui.h"
 #include "guimaps.h"

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- newgui.cpp	25 Aug 2002 10:50:18 -0000	1.2
+++ newgui.cpp	29 Aug 2002 23:45:15 -0000	1.3
@@ -19,11 +19,12 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
+#include "util.h"
+#include "scumm/scumm.h"
+#include "scumm/sound.h"
 #include "newgui.h"
 #include "guimaps.h"
-#include "gui/dialog.h"
-#include "util.h"
+#include "dialog.h"
 
 /*
  * TODO list