libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed unused function, simplified handlePattern

Browse Source 
svn-id: r29139
This commit is contained in:
Gregory Montoir 2007-09-30 11:16:25 +00:00
parent b767eb771b
commit 28c1f3fbb3
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
sound/mods/soundfx.cpp
View File

@ -62,7 +62,6 @@ protected:
void updateEffects(int ch);
void handleTick();
void enablePaulaChannel(uint8 channel);
void disablePaulaChannel(uint8 channel);
void setupPaulaChannel(uint8 channel, const int8 *data, uint16 len, uint16 repeatPos, uint16 repeatLen);
@ -176,38 +175,39 @@ void SoundFx::play() {
void SoundFx::handlePattern(int ch, uint32 pat) {
uint16 note1 = pat >> 16;
uint16 note2 = pat & 0xFFFF;
if (note1 != 0xFFFD) {
int ins = (note2 & 0xF000) >> 12;
if (ins != 0) {
SoundFxInstrument *i = &_instruments[ins - 1];
setupPaulaChannel(ch, i->data, i->len, i->repeatPos, i->repeatLen);
int effect = (note2 & 0xF00) >> 8;
int volume = i->volume;
switch (effect) {
case 5: // volume up
volume += (note2 & 0xFF);
if (volume > 63) {
volume = 63;
}
break;
case 6: // volume down
volume -= (note2 & 0xFF);
if (volume < 0) {
volume = 0;
}
break;
}
setChannelVolume(ch, volume);
}
}
_effects[ch] = note2;
if (note1 == 0xFFFD) { // PIC
_effects[ch] = 0;
} else if (note1 == 0xFFFE) { // STP
return;
}
_effects[ch] = note2;
if (note1 == 0xFFFE) { // STP
disablePaulaChannel(ch);
} else if (note1 != 0) {
return;
}
int ins = (note2 & 0xF000) >> 12;
if (ins != 0) {
SoundFxInstrument *i = &_instruments[ins - 1];
setupPaulaChannel(ch, i->data, i->len, i->repeatPos, i->repeatLen);
int effect = (note2 & 0xF00) >> 8;
int volume = i->volume;
switch (effect) {
case 5: // volume up
volume += (note2 & 0xFF);
if (volume > 63) {
volume = 63;
}
break;
case 6: // volume down
volume -= (note2 & 0xFF);
if (volume < 0) {
volume = 0;
}
break;
}
setChannelVolume(ch, volume);
}
if (note1 != 0) {
setChannelPeriod(ch, note1);
enablePaulaChannel(ch);
}
}
@ -251,10 +251,6 @@ void SoundFx::handleTick() {
}
}
void SoundFx::enablePaulaChannel(uint8 channel) {
// FIXME: Is this empty on purpose?!?
}
void SoundFx::disablePaulaChannel(uint8 channel) {
setChannelPeriod(channel, 0);
}