diff options
| author | Filippos Karapetis | 2009-12-18 17:48:45 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-12-18 17:48:45 +0000 |
| commit | 7ca404355fda1992ac78ff3fc530e4d50e15cd28 (patch) | |
| tree | 8de19c157f656539a003ebac72bd2d5504592346 /engines/sci/sfx | |
| parent | 5e7ed05997c6c616e277f610020e235d3ab3f209 (diff) | |
| download | scummvm-rg350-7ca404355fda1992ac78ff3fc530e4d50e15cd28.tar.gz scummvm-rg350-7ca404355fda1992ac78ff3fc530e4d50e15cd28.tar.bz2 scummvm-rg350-7ca404355fda1992ac78ff3fc530e4d50e15cd28.zip | |
Moved the midi_writer struct into the place where it's actually used, and named the header file appropriately
svn-id: r46413
Diffstat (limited to 'engines/sci/sfx')
| -rw-r--r-- | engines/sci/sfx/seq/gm.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sfx/seq/instrument-map.h | 2 | ||||
| -rw-r--r-- | engines/sci/sfx/seq/midiwriter.h (renamed from engines/sci/sfx/device.h) | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sfx/seq/gm.cpp index 5f74b60321..9e2a61db47 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 1e8a63076b..e0c52ca735 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 index ed4441b11f..24e432ffc4 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 |