COMMON: move Miles Audio AdLib+MT32 to common

- remove Miles Audio from Sherlock engine
- put Miles Audio into common audio (namespace Audio)
- Miles Audio is used at least by the engines
TINSEL, GROOVIE, TOLTECS, SAGA and KYRA
This way it can be used by the other engines

1 files changed, 5 insertions, 4 deletions

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index 948794a5a6..f72eaf71c3 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -25,7 +25,8 @@
 #include "sherlock/sherlock.h"
 #include "sherlock/music.h"
 #include "sherlock/scalpel/drivers/mididriver.h"
-#include "sherlock/tattoo/drivers/tattoo_mididriver.h"
+// for Miles Audio (Sherlock Holmes 2)
+#include "audio/miles.h"
 // for 3DO digital music
 #include "audio/decoders/aiff.h"
 
@@ -269,14 +270,14 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 			// SAMPLE.AD  -> regular AdLib instrument data
 			// SAMPLE.OPL -> OPL-3 instrument data
 			// although in case of Rose Tattoo both files are exactly the same
-			_midiDriver = MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL");
+			_midiDriver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL");
 			break;
 		case MT_MT32:
-			_midiDriver = MidiDriver_Miles_MT32_create("SAMPLE.MT");
+			_midiDriver = Audio::MidiDriver_Miles_MT32_create("SAMPLE.MT");
 			break;
 		case MT_GM:
 			if (ConfMan.getBool("native_mt32")) {
-				_midiDriver = MidiDriver_Miles_MT32_create("SAMPLE.MT");
+				_midiDriver = Audio::MidiDriver_Miles_MT32_create("SAMPLE.MT");
 				_musicType = MT_MT32;
 			}
 			break;