diff -r 4cc327ad39d5 -r 35756db7e577 src/music/dmusic.h
--- a/src/music/dmusic.h	Sat Jun 02 19:59:29 2007 +0000
+++ b/src/music/dmusic.h	Sat Jul 14 19:42:58 2007 +0000
@@ -3,8 +3,29 @@
 #ifndef MUSIC_DMUSIC_H
 #define MUSIC_DMUSIC_H
 
-#include "../hal.h"
+#include "music_driver.hpp"
 
-extern const HalMusicDriver _dmusic_midi_driver;
+class MusicDriver_DMusic: public MusicDriver {
+public:
+	/* virtual */ const char *Start(const char * const *param);
+
+	/* virtual */ void Stop();
+
+	/* virtual */ void PlaySong(const char *filename);
+
+	/* virtual */ void StopSong();
+
+	/* virtual */ bool IsSongPlaying();
+
+	/* virtual */ void SetVolume(byte vol);
+};
+
+class FMusicDriver_DMusic: public MusicDriverFactory<FMusicDriver_DMusic> {
+public:
+	static const int priority = 10;
+	/* virtual */ const char *GetName() { return "dmusic"; }
+	/* virtual */ const char *GetDescription() { return "DirectMusic MIDI Driver"; }
+	/* virtual */ Driver *CreateInstance() { return new MusicDriver_DMusic(); }
+};
 
 #endif /* MUSIC_DMUSIC_H */