Moved the midi_writer struct into the place where it's actually used, and named the header file appropriately

svn-id: r46413

engines/sci/sfx/seq/gm.cpp

@@ -25,7 +25,7 @@
 
 #include "common/util.h"
 
-#include "sci/sfx/device.h"
+#include "sci/sfx/seq/midiwriter.h"
 #include "sci/sfx/seq/instrument-map.h"
 
 namespace Sci {

engines/sci/sfx/seq/instrument-map.h

@@ -28,7 +28,7 @@
 #ifndef SCI_SFX_SEQ_INSTRUMENT_MAP_H
 #define SCI_SFX_SEQ_INSTRUMENT_MAP_H
 
-#include "sci/sfx/device.h"
+#include "sci/sfx/seq/midiwriter.h"
 
 namespace Sci {
 

engines/sci/sfx/seq/midiwriter.h

@@ -25,8 +25,8 @@
 
 /* song player structure */
 
-#ifndef SCI_SFX_DEVICE_H
-#define SCI_SFX_DEVICE_H
+#ifndef SCI_SFX_SEQ_MIDIWRITER_H
+#define SCI_SFX_SEQ_MIDIWRITER_H
 
 #include "common/scummsys.h"
 #include "common/error.h"
@@ -85,4 +85,4 @@ struct midi_writer_t {
 
 } // End of namespace Sci
 
-#endif // SCI_SFX_DEVICE_H
+#endif // SCI_SFX_SEQ_MIDIWRITER_H