Moved the interface class for the the custom SCI MIDI drivers together with the actual driver implementation code

svn-id: r46414

9 files changed, 11 insertions, 11 deletions

diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index b3bd7bac2a..8da2c7cda5 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -28,7 +28,7 @@
 #include "sci/sci.h"
 #include "sci/sfx/core.h"
 #include "sci/sfx/iterator.h"
-#include "sci/sfx/sci_midi.h"
+#include "sci/sfx/softseq/mididriver.h"
 
 #include "sci/sfx/softseq/pcjr.h"
 
diff --git a/engines/sci/sfx/iterator.h b/engines/sci/sfx/iterator.h
index 74a6b5ab84..f4e87d5b7f 100644
--- a/engines/sci/sfx/iterator.h
+++ b/engines/sci/sfx/iterator.h
@@ -28,7 +28,7 @@
 #ifndef SCI_SFX_SFX_ITERATOR_H
 #define SCI_SFX_SFX_ITERATOR_H
 
-#include "sci/sfx/sci_midi.h"
+#include "sci/sfx/softseq/mididriver.h"
 
 namespace Audio {
 	class AudioStream;
diff --git a/engines/sci/sfx/iterator_internal.h b/engines/sci/sfx/iterator_internal.h
index 7c9c1c71a4..1b5d856d33 100644
--- a/engines/sci/sfx/iterator_internal.h
+++ b/engines/sci/sfx/iterator_internal.h
@@ -27,7 +27,7 @@
 #define SCI_SFX_SFX_ITERATOR_INTERNAL
 
 #include "sci/sfx/iterator.h"
-#include "sci/sfx/sci_midi.h"
+#include "sci/sfx/softseq/mididriver.h"
 
 #include "common/array.h"
 #include "common/list.h"
diff --git a/engines/sci/sfx/seq/instrument-map.cpp b/engines/sci/sfx/seq/instrument-map.cpp
index 2246d517db..3c16780c9a 100644
--- a/engines/sci/sfx/seq/instrument-map.cpp
+++ b/engines/sci/sfx/seq/instrument-map.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "common/scummsys.h"
-#include "sci/sfx/sci_midi.h"
+#include "sci/sfx/softseq/mididriver.h"
 #include "sci/sfx/seq/instrument-map.h"
 #include "sci/sfx/core.h"
 
diff --git a/engines/sci/sfx/softseq/adlib.cpp b/engines/sci/sfx/softseq/adlib.cpp
index a361d33104..efc5c4b823 100644
--- a/engines/sci/sfx/softseq/adlib.cpp
+++ b/engines/sci/sfx/softseq/adlib.cpp
@@ -30,7 +30,7 @@
 #include "sound/softsynth/emumidi.h"
 
 #include "sci/resource.h"
-#include "sci/sfx/sci_midi.h"
+#include "sci/sfx/softseq/mididriver.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/softseq/amiga.cpp b/engines/sci/sfx/softseq/amiga.cpp
index 5a960ad1e0..b1cdedaa7a 100644
--- a/engines/sci/sfx/softseq/amiga.cpp
+++ b/engines/sci/sfx/softseq/amiga.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sound/softsynth/emumidi.h"
-#include "sci/sfx/sci_midi.h"
+#include "sci/sfx/softseq/mididriver.h"
 
 #include "common/file.h"
 #include "common/frac.h"
diff --git a/engines/sci/sfx/sci_midi.h b/engines/sci/sfx/softseq/mididriver.h
index b2a48b5437..01ed3f6573 100644
--- a/engines/sci/sfx/sci_midi.h
+++ b/engines/sci/sfx/softseq/mididriver.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_SFX_MIDI_H
-#define SCI_SFX_MIDI_H
+#ifndef SCI_SFX_SOFTSEQ_MIDIDRIVER_H
+#define SCI_SFX_SOFTSEQ_MIDIDRIVER_H
 
 #include "sound/mididrv.h"
 #include "sound/softsynth/emumidi.h"
@@ -103,4 +103,4 @@ extern MidiPlayer *MidiPlayer_Amiga_create();
 
 } // End of namespace Sci
 
-#endif // SCI_SFX_MIDI_H
+#endif // SCI_SFX_SOFTSEQ_MIDIDRIVER_H
diff --git a/engines/sci/sfx/softseq/pcjr.cpp b/engines/sci/sfx/softseq/pcjr.cpp
index acfb3c7c45..1d007874fb 100644
--- a/engines/sci/sfx/softseq/pcjr.cpp
+++ b/engines/sci/sfx/softseq/pcjr.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/sfx/sci_midi.h"
+#include "sci/sfx/softseq/mididriver.h"
 #include "sci/sfx/softseq/pcjr.h"
 
 namespace Sci {
diff --git a/engines/sci/sfx/softseq/pcjr.h b/engines/sci/sfx/softseq/pcjr.h
index d7d3469db9..e95c690cc5 100644
--- a/engines/sci/sfx/softseq/pcjr.h
+++ b/engines/sci/sfx/softseq/pcjr.h
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/sfx/sci_midi.h"
+#include "sci/sfx/softseq/mididriver.h"
 
 namespace Sci {