changed structure of musicdriver, added General Midi music support.

mapping table mt32->gm needs a lot of changes.

svn-id: r7273

1 files changed, 6 insertions, 2 deletions

diff --git a/sky/sky.h b/sky/sky.h
index 799a2f5e8a..79cc44157e 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -31,8 +31,10 @@
 #include "sky/text.h"
 #include "sky/disk.h"
 #include "sky/struc.h"
-#include "sky/skymusic.h"
 #include "sky/grid.h"
+#include "sky/musicbase.h"
+#include "sky/adlibmusic.h"
+#include "sky/gmmusic.h"
 
 class SkyLogic;
 class SkyGrid;
@@ -87,7 +89,9 @@ protected:
 	SkyText *_skyText;
 	SkyGrid *_skyGrid;
 	SkyLogic *_skyLogic;
-	SkyMusic *_skyMusic;
+
+	SkyMusicBase *_skyMusic;
+	GameDetector *_detector; // necessary for music
 	
 	byte *_workScreen;
 	byte *_backScreen;