From 7ca404355fda1992ac78ff3fc530e4d50e15cd28 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 18 Dec 2009 17:48:45 +0000 Subject: [PATCH] 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 | 2 +- engines/sci/sfx/seq/instrument-map.h | 2 +- engines/sci/sfx/{device.h => seq/midiwriter.h} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename engines/sci/sfx/{device.h => seq/midiwriter.h} (96%) diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sfx/seq/gm.cpp index 5f74b603216..9e2a61db471 100644 --- a/engines/sci/sfx/seq/gm.cpp +++ b/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 { diff --git a/engines/sci/sfx/seq/instrument-map.h b/engines/sci/sfx/seq/instrument-map.h index 1e8a63076b7..e0c52ca735d 100644 --- a/engines/sci/sfx/seq/instrument-map.h +++ b/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 { diff --git a/engines/sci/sfx/device.h b/engines/sci/sfx/seq/midiwriter.h similarity index 96% rename from engines/sci/sfx/device.h rename to engines/sci/sfx/seq/midiwriter.h index ed4441b11fa..24e432ffc45 100644 --- a/engines/sci/sfx/device.h +++ b/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