diff options
Diffstat (limited to 'audio/mods')
-rw-r--r-- | audio/mods/infogrames.cpp | 1 | ||||
-rw-r--r-- | audio/mods/infogrames.h | 5 | ||||
-rw-r--r-- | audio/mods/maxtrax.cpp | 2 | ||||
-rw-r--r-- | audio/mods/module.cpp | 4 | ||||
-rw-r--r-- | audio/mods/module.h | 6 | ||||
-rw-r--r-- | audio/mods/protracker.cpp | 2 | ||||
-rw-r--r-- | audio/mods/protracker.h | 4 | ||||
-rw-r--r-- | audio/mods/rjp1.cpp | 8 | ||||
-rw-r--r-- | audio/mods/rjp1.h | 4 | ||||
-rw-r--r-- | audio/mods/soundfx.cpp | 3 | ||||
-rw-r--r-- | audio/mods/soundfx.h | 4 | ||||
-rw-r--r-- | audio/mods/tfmx.cpp | 2 |
12 files changed, 33 insertions, 12 deletions
diff --git a/audio/mods/infogrames.cpp b/audio/mods/infogrames.cpp index 27e42c637b..8bfffeacb6 100644 --- a/audio/mods/infogrames.cpp +++ b/audio/mods/infogrames.cpp @@ -27,6 +27,7 @@ #include "common/endian.h" #include "common/file.h" #include "common/memstream.h" +#include "common/textconsole.h" namespace Audio { diff --git a/audio/mods/infogrames.h b/audio/mods/infogrames.h index c7abebf24e..9787210e82 100644 --- a/audio/mods/infogrames.h +++ b/audio/mods/infogrames.h @@ -33,7 +33,10 @@ #define SOUND_MODS_INFOGRAMES_H #include "audio/mods/paula.h" -#include "common/stream.h" + +namespace Common { +class SeekableReadStream; +} namespace Audio { diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp index a577c72eed..0738966dab 100644 --- a/audio/mods/maxtrax.cpp +++ b/audio/mods/maxtrax.cpp @@ -24,10 +24,10 @@ */ #include "common/scummsys.h" -#include "common/endian.h" #include "common/stream.h" #include "common/util.h" #include "common/debug.h" +#include "common/textconsole.h" #include "audio/mods/maxtrax.h" diff --git a/audio/mods/module.cpp b/audio/mods/module.cpp index 0da6923b5d..987b17bc8d 100644 --- a/audio/mods/module.cpp +++ b/audio/mods/module.cpp @@ -27,6 +27,8 @@ #include "common/util.h" #include "common/endian.h" +#include "common/stream.h" +#include "common/textconsole.h" namespace Modules { @@ -113,7 +115,7 @@ const int16 Module::periods[16][60] = { 108 , 101 , 96 , 90 , 85 , 80 , 76 , 72 , 68 , 64 , 60 , 57 }}; const uint32 Module::signatures[] = { - MKID_BE('M.K.'), MKID_BE('M!K!'), MKID_BE('FLT4') + MKTAG('M','.','K','.'), MKTAG('M','!','K','!'), MKTAG('F','L','T','4') }; bool Module::load(Common::SeekableReadStream &st, int offs) { diff --git a/audio/mods/module.h b/audio/mods/module.h index 550b63617e..c9b72bd2d6 100644 --- a/audio/mods/module.h +++ b/audio/mods/module.h @@ -26,7 +26,11 @@ #ifndef SOUND_MODS_MODULE_H #define SOUND_MODS_MODULE_H -#include "common/stream.h" +#include "common/scummsys.h" + +namespace Common { +class SeekableReadStream; +} namespace Modules { diff --git a/audio/mods/protracker.cpp b/audio/mods/protracker.cpp index 6051338900..f781920505 100644 --- a/audio/mods/protracker.cpp +++ b/audio/mods/protracker.cpp @@ -29,6 +29,8 @@ #include "audio/audiostream.h" +#include "common/textconsole.h" + namespace Modules { class ProtrackerStream : public ::Audio::Paula { diff --git a/audio/mods/protracker.h b/audio/mods/protracker.h index af722637c7..fa9895b81f 100644 --- a/audio/mods/protracker.h +++ b/audio/mods/protracker.h @@ -33,7 +33,9 @@ #ifndef SOUND_MODS_PROTRACKER_H #define SOUND_MODS_PROTRACKER_H -#include "common/stream.h" +namespace Common { +class SeekableReadStream; +} namespace Audio { diff --git a/audio/mods/rjp1.cpp b/audio/mods/rjp1.cpp index 7423abb668..eaa99e6928 100644 --- a/audio/mods/rjp1.cpp +++ b/audio/mods/rjp1.cpp @@ -25,10 +25,12 @@ #include "common/debug.h" #include "common/endian.h" +#include "common/stream.h" +#include "common/textconsole.h" +#include "common/util.h" #include "audio/mods/paula.h" #include "audio/mods/rjp1.h" -#include "audio/audiostream.h" namespace Audio { @@ -138,7 +140,7 @@ Rjp1::~Rjp1() { } bool Rjp1::load(Common::SeekableReadStream *songData, Common::SeekableReadStream *instrumentsData) { - if (songData->readUint32BE() == MKID_BE('RJP1') && songData->readUint32BE() == MKID_BE('SMOD')) { + if (songData->readUint32BE() == MKTAG('R','J','P','1') && songData->readUint32BE() == MKTAG('S','M','O','D')) { for (int i = 0; i < 7; ++i) { uint32 size = songData->readUint32BE(); _vars.songData[i] = (uint8 *)malloc(size); @@ -167,7 +169,7 @@ bool Rjp1::load(Common::SeekableReadStream *songData, Common::SeekableReadStream } } - if (instrumentsData->readUint32BE() == MKID_BE('RJP1')) { + if (instrumentsData->readUint32BE() == MKTAG('R','J','P','1')) { uint32 size = instrumentsData->size() - 4; _vars.instData = (int8 *)malloc(size); if (!_vars.instData) diff --git a/audio/mods/rjp1.h b/audio/mods/rjp1.h index e1960921b2..e3cb0b853d 100644 --- a/audio/mods/rjp1.h +++ b/audio/mods/rjp1.h @@ -32,7 +32,9 @@ #ifndef SOUND_MODS_RJP1_H #define SOUND_MODS_RJP1_H -#include "common/stream.h" +namespace Common { +class SeekableReadStream; +} namespace Audio { diff --git a/audio/mods/soundfx.cpp b/audio/mods/soundfx.cpp index 06a1e29514..44fdd65986 100644 --- a/audio/mods/soundfx.cpp +++ b/audio/mods/soundfx.cpp @@ -24,10 +24,11 @@ */ #include "common/endian.h" +#include "common/stream.h" +#include "common/textconsole.h" #include "audio/mods/paula.h" #include "audio/mods/soundfx.h" -#include "audio/audiostream.h" namespace Audio { diff --git a/audio/mods/soundfx.h b/audio/mods/soundfx.h index 089c19d292..9dd5240160 100644 --- a/audio/mods/soundfx.h +++ b/audio/mods/soundfx.h @@ -32,7 +32,9 @@ #ifndef SOUND_MODS_SOUNDFX_H #define SOUND_MODS_SOUNDFX_H -#include "common/stream.h" +namespace Common { +class SeekableReadStream; +} namespace Audio { diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp index 8c69a75ebd..f7cfc50c10 100644 --- a/audio/mods/tfmx.cpp +++ b/audio/mods/tfmx.cpp @@ -26,8 +26,8 @@ #include "common/scummsys.h" #include "common/endian.h" #include "common/stream.h" -#include "common/util.h" #include "common/debug.h" +#include "common/textconsole.h" #include "audio/mods/tfmx.h" |