aboutsummaryrefslogtreecommitdiff
path: root/sky/music
diff options
context:
space:
mode:
Diffstat (limited to 'sky/music')
-rw-r--r--sky/music/adlibchannel.cpp6
-rw-r--r--sky/music/adlibmusic.cpp6
-rw-r--r--sky/music/gmchannel.cpp6
-rw-r--r--sky/music/musicbase.cpp14
-rw-r--r--sky/music/musicbase.h4
5 files changed, 18 insertions, 18 deletions
diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp
index c0a54bd49c..b57b0cfe37 100644
--- a/sky/music/adlibchannel.cpp
+++ b/sky/music/adlibchannel.cpp
@@ -108,7 +108,7 @@ void AdlibChannel::stopNote(void) {
}
int32 AdlibChannel::getNextEventTime(void) {
- int32 retV = 0;
+ int32 retV = 0;
uint8 cnt, lVal = 0;
for (cnt = 0; cnt < 4; cnt++) {
lVal = _musicData[_channelData.eventDataPtr];
@@ -127,7 +127,7 @@ uint8 AdlibChannel::process(uint16 aktTime) {
if (!_channelData.channelActive) {
return 0;
}
-
+
uint8 returnVal = 0;
_channelData.nextEventTime -= aktTime;
@@ -143,7 +143,7 @@ uint8 AdlibChannel::process(uint16 aktTime) {
case 0: com90_caseNoteOff(); break;
case 1: com90_stopChannel(); break;
case 2: com90_setupInstrument(); break;
- case 3:
+ case 3:
returnVal = com90_updateTempo();
break;
case 5: com90_getFreqOffset(); break;
diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp
index 57f507ff46..68718ef082 100644
--- a/sky/music/adlibmusic.cpp
+++ b/sky/music/adlibmusic.cpp
@@ -28,11 +28,11 @@ namespace Sky {
AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk)
: MusicBase(pDisk) {
-
+
_driverFileBase = 60202;
_mixer = pMixer;
_sampleRate = pMixer->getOutputRate();
-
+
_opl = makeAdlibOPL(_sampleRate);
_mixer->setupPremix(this);
@@ -91,7 +91,7 @@ void AdlibMusic::setupPointers(void) {
// 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 (SkyEngine::_systemVars.gameVersion == 267) {
diff --git a/sky/music/gmchannel.cpp b/sky/music/gmchannel.cpp
index ec50a160e3..7c79c0578a 100644
--- a/sky/music/gmchannel.cpp
+++ b/sky/music/gmchannel.cpp
@@ -67,7 +67,7 @@ void GmChannel::stopNote(void) {
int32 GmChannel::getNextEventTime(void) {
- int32 retV = 0;
+ int32 retV = 0;
uint8 cnt, lVal = 0;
for (cnt = 0; cnt < 4; cnt++) {
lVal = _musicData[_channelData.eventDataPtr];
@@ -85,7 +85,7 @@ uint8 GmChannel::process(uint16 aktTime) {
if (!_channelData.channelActive)
return 0;
-
+
uint8 returnVal = 0;
_channelData.nextEventTime -= aktTime;
@@ -102,7 +102,7 @@ uint8 GmChannel::process(uint16 aktTime) {
case 0: com90_caseNoteOff(); break;
case 1: com90_stopChannel(); break;
case 2: com90_setupInstrument(); break;
- case 3:
+ case 3:
returnVal = com90_updateTempo();
break;
case 5: com90_getPitch(); break;
diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp
index 29c2b73c19..ed296c4e47 100644
--- a/sky/music/musicbase.cpp
+++ b/sky/music/musicbase.cpp
@@ -82,19 +82,19 @@ void MusicBase::musicCommand(uint16 command) {
return ;
}
switch(command >> 8) {
- case 0:
+ case 0:
debug(1,"Music: got call to startAdlibDriver(). Not necessary in this implementation.");
break;
- case 1:
+ case 1:
debug(1,"Music: got call to stopDriver(). Not necessary in this implementation.");
break;
case 2:
debug(1,"Music: got call to SetTempo(). Tempo is fixed in this implementation.");
break;
- case 3:
+ case 3:
debug(1,"Music: ignored direct call to driverPoll().");
break;
- case 4:
+ case 4:
startMusic(command & 0xFF);
break;
case 6:
@@ -103,10 +103,10 @@ void MusicBase::musicCommand(uint16 command) {
case 7:
stopMusic();
break;
- case 13:
- setFMVolume(command & 0xFF);
+ case 13:
+ setFMVolume(command & 0xFF);
break;
- default:
+ default:
debug(1,"musicCommand %d ignored.",command >> 8);
}
}
diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h
index ea438d2bb5..0fda141d2f 100644
--- a/sky/music/musicbase.h
+++ b/sky/music/musicbase.h
@@ -59,7 +59,7 @@ public:
virtual void setVolume(uint8 volume) = 0;
uint8 giveVolume(void) { return (uint8)_musicVolume; };
uint8 giveCurrentMusic(void) { return _currentMusic; };
-
+
protected:
Disk *_skyDisk;
@@ -77,7 +77,7 @@ protected:
Actions _onNextPoll;
ChannelBase *_channels[10];
Common::Mutex _mutex;
-
+
virtual void setupPointers(void) = 0;
virtual void setupChannels(uint8 *channelData) = 0;