diff options
Diffstat (limited to 'sky/music')
-rw-r--r-- | sky/music/adlibchannel.cpp | 9 | ||||
-rw-r--r-- | sky/music/adlibchannel.h | 3 | ||||
-rw-r--r-- | sky/music/adlibmusic.cpp | 8 | ||||
-rw-r--r-- | sky/music/adlibmusic.h | 9 | ||||
-rw-r--r-- | sky/music/gmchannel.cpp | 1 | ||||
-rw-r--r-- | sky/music/gmchannel.h | 4 | ||||
-rw-r--r-- | sky/music/gmmusic.cpp | 7 | ||||
-rw-r--r-- | sky/music/gmmusic.h | 8 | ||||
-rw-r--r-- | sky/music/mt32music.cpp | 2 | ||||
-rw-r--r-- | sky/music/mt32music.h | 7 | ||||
-rw-r--r-- | sky/music/musicbase.cpp | 3 | ||||
-rw-r--r-- | sky/music/musicbase.h | 5 |
12 files changed, 35 insertions, 31 deletions
diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp index a5215ca2b5..4e68c4458f 100644 --- a/sky/music/adlibchannel.cpp +++ b/sky/music/adlibchannel.cpp @@ -19,8 +19,9 @@ * */ -#include "adlibchannel.h" -#include "sound/fmopl.h" +#include "common/util.h" +#include "sky/music/adlibchannel.h" +#include "sky/sky.h" SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfData) { @@ -42,7 +43,7 @@ SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfD uint16 instrumentDataLoc; - if (SkyState::_systemVars.gameVersion == 109) { + if (SkyEngine::_systemVars.gameVersion == 109) { //instrumentDataLoc = (_musicData[0x11D0] << 8) | _musicData[0x11CF]; //_frequenceTable = (uint16*)(_musicData + 0x835); //_registerTable = _musicData + 0xE35; @@ -54,7 +55,7 @@ SkyAdlibChannel::SkyAdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfD _registerTable = _musicData + 0xE68; _opOutputTable = _musicData + 0xE7A; _adlibRegMirror = _musicData + 0xF7D; - } else if (SkyState::_systemVars.gameVersion == 267) { + } else if (SkyEngine::_systemVars.gameVersion == 267) { instrumentDataLoc = READ_LE_UINT16(_musicData + 0x11FB); _frequenceTable = (uint16*)(_musicData + 0x7F4); _registerTable = _musicData + 0xDF4; diff --git a/sky/music/adlibchannel.h b/sky/music/adlibchannel.h index f13fb78e96..e7f9d27e13 100644 --- a/sky/music/adlibchannel.h +++ b/sky/music/adlibchannel.h @@ -22,9 +22,6 @@ #ifndef ADLIBCHANNEL_H #define ADLIBCHANNEL_H -#include "stdafx.h" -#include "base/engine.h" -#include "sky/sky.h" #include "sky/music/musicbase.h" #include "sound/fmopl.h" diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp index d3916269bd..d8f80d772a 100644 --- a/sky/music/adlibmusic.cpp +++ b/sky/music/adlibmusic.cpp @@ -20,7 +20,9 @@ */ #include "sky/music/adlibmusic.h" -#include "sound/fmopl.h" +#include "sky/music/adlibchannel.h" +#include "sound/mixer.h" +#include "sky/sky.h" void SkyAdlibMusic::passMixerFunc(void *param, int16 *buf, uint len) { @@ -91,14 +93,14 @@ void SkyAdlibMusic::premixerCall(int16 *data, uint len) { void SkyAdlibMusic::setupPointers(void) { - if (SkyState::_systemVars.gameVersion == 109) { + if (SkyEngine::_systemVars.gameVersion == 109) { // disk demo uses a different adlib driver version, some offsets have changed //_musicDataLoc = (_musicData[0x11CC] << 8) | _musicData[0x11CB]; //_initSequence = _musicData + 0xEC8; _musicDataLoc = READ_LE_UINT16(_musicData + 0x1200); _initSequence = _musicData + 0xEFB; - } else if (SkyState::_systemVars.gameVersion == 267) { + } else if (SkyEngine::_systemVars.gameVersion == 267) { _musicDataLoc = READ_LE_UINT16(_musicData + 0x11F7); _initSequence = _musicData + 0xE87; } else { diff --git a/sky/music/adlibmusic.h b/sky/music/adlibmusic.h index b1b366c402..09782f5512 100644 --- a/sky/music/adlibmusic.h +++ b/sky/music/adlibmusic.h @@ -22,14 +22,11 @@ #ifndef ADLIBMUSIC_H #define ADLIBMUSIC_H -#include "stdafx.h" -#include "sky/sky.h" -#include "sound/mixer.h" -#include "base/engine.h" -#include "adlibchannel.h" -#include "musicbase.h" +#include "sky/music/musicbase.h" #include "sound/fmopl.h" +class SoundMixer; + class SkyAdlibMusic : public SkyMusicBase { public: SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, OSystem *system); diff --git a/sky/music/gmchannel.cpp b/sky/music/gmchannel.cpp index 16e493db52..5635f9a20d 100644 --- a/sky/music/gmchannel.cpp +++ b/sky/music/gmchannel.cpp @@ -21,6 +21,7 @@ #include "gmchannel.h" #include "common/util.h" +#include "sound/mididrv.h" SkyGmChannel::SkyGmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, byte *pInstMap, uint8 *veloTab) { diff --git a/sky/music/gmchannel.h b/sky/music/gmchannel.h index 8105141890..7214168586 100644 --- a/sky/music/gmchannel.h +++ b/sky/music/gmchannel.h @@ -22,10 +22,10 @@ #ifndef SKYGMCHANNEL_H #define SKYGMCHANNEL_H -#include "stdafx.h" -#include "sound/mididrv.h" #include "sky/music/musicbase.h" +class MidiDriver; + typedef struct { uint16 eventDataPtr; int32 nextEventTime; diff --git a/sky/music/gmmusic.cpp b/sky/music/gmmusic.cpp index 581ebd841e..4bdef54e46 100644 --- a/sky/music/gmmusic.cpp +++ b/sky/music/gmmusic.cpp @@ -20,7 +20,10 @@ */ #include "sky/music/gmmusic.h" +#include "sky/music/gmchannel.h" #include "sky/sky.h" +#include "common/util.h" +#include "sound/mididrv.h" void SkyGmMusic::passTimerFunc(void *param) { @@ -34,7 +37,7 @@ SkyGmMusic::SkyGmMusic(MidiDriver *pMidiDrv, SkyDisk *pSkyDisk, OSystem *system) _midiDrv = pMidiDrv; int midiRes = _midiDrv->open(); if (midiRes != 0) { - error("Can't open midi device. Errorcode: %d",midiRes); + error("Can't open midi device. Errorcode: %d", midiRes); } _midiDrv->setTimerCallback(this, passTimerFunc); _ignoreNextPoll = false; @@ -73,7 +76,7 @@ void SkyGmMusic::timerCall(void) { void SkyGmMusic::setupPointers(void) { - if (SkyState::_systemVars.gameVersion == 109) { + if (SkyEngine::_systemVars.gameVersion == 109) { _musicDataLoc = (_musicData[0x79C] << 8) | _musicData[0x79B]; _sysExSequence = _musicData + 0x1EF2; } else { diff --git a/sky/music/gmmusic.h b/sky/music/gmmusic.h index 78aaea4d7f..85bb43d033 100644 --- a/sky/music/gmmusic.h +++ b/sky/music/gmmusic.h @@ -22,11 +22,9 @@ #ifndef GMMUSIC_H #define GMMUSIC_H -#include "stdafx.h" -#include "base/engine.h" -#include "musicbase.h" -#include "sound/mididrv.h" -#include "gmchannel.h" +#include "sky/music/musicbase.h" + +class MidiDriver; class SkyGmMusic : public SkyMusicBase { public: diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp index 9e062546f4..d5bf335422 100644 --- a/sky/music/mt32music.cpp +++ b/sky/music/mt32music.cpp @@ -20,7 +20,9 @@ */ #include "sky/music/mt32music.h" +#include "sky/music/gmchannel.h" #include "common/util.h" +#include "sound/mididrv.h" void SkyMT32Music::passTimerFunc(void *param) { diff --git a/sky/music/mt32music.h b/sky/music/mt32music.h index d9624229b3..78cc439ac9 100644 --- a/sky/music/mt32music.h +++ b/sky/music/mt32music.h @@ -22,10 +22,9 @@ #ifndef MT32MUSIC_H #define MT32MUSIC_H -#include "stdafx.h" -#include "musicbase.h" -#include "sound/mididrv.h" -#include "gmchannel.h" +#include "sky/music/musicbase.h" + +class MidiDriver; class SkyMT32Music : public SkyMusicBase { public: diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp index fecfff6dae..368a9c308d 100644 --- a/sky/music/musicbase.cpp +++ b/sky/music/musicbase.cpp @@ -19,7 +19,8 @@ * */ -#include "musicbase.h" +#include "sky/music/musicbase.h" +#include "sky/disk.h" #include "common/util.h" SkyMusicBase::SkyMusicBase(SkyDisk *pSkyDisk, OSystem *system) { diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h index 1fa34be2bf..d5d17986c8 100644 --- a/sky/music/musicbase.h +++ b/sky/music/musicbase.h @@ -23,9 +23,12 @@ #define MUSICBASE_H #include "stdafx.h" -#include "sky/disk.h" +#include "common/scummsys.h" #include "common/system.h" +class SkyDisk; +class OSystem; + #define FILES_PER_SECTION 4 typedef struct { |