wrote new mixer class,

cleaned up sound header files,
integrated mixer into scummvm & simon

svn-id: r3937

1 files changed, 1 insertions, 2 deletions

diff --git a/x11.cpp b/x11.cpp
index d2e9928bc0..3d249ac2a1 100644
--- a/x11.cpp
+++ b/x11.cpp
@@ -24,7 +24,6 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "gui.h"
-#include "sound.h"
 #include "cdmusic.h"
 #include "mp3_cd.h"
 
@@ -50,7 +49,7 @@
 Scumm scumm;
 ScummDebugger debugger;
 Gui gui;
-SoundEngine sound;
+IMuse sound;
 SOUND_DRIVER_TYPE snd_driv;
 static unsigned char *local_fb;