libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix -Wshadow warnings

Browse Source 
svn-id: r5270
This commit is contained in:
Max Horn 2002-10-23 00:24:43 +00:00
parent df2bf812c3
commit ab13e67b09
4 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scumm/imuse.cpp
View File

@ -5635,7 +5635,7 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i
byte param = a >> 8;
int32 sample = b, r;
byte sub_cmd = c >> 8;
int8 channel = -1, l;
int8 chan = -1, l;
int8 tmp;
if (!(cmd || param))
@ -5652,18 +5652,18 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i
debug(2, "IMuseDigital::doCommand setting volume sample(%d), volume(%d)", sample, d);
for (l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
if ((_channel[l]._idSound == sample) && (_channel[l]._used == true)) {
channel = l;
chan = l;
break;
}
}
if (channel == -1) {
if (chan == -1) {
warning("IMuseDigital::doCommand 12,6 sample(%d) not exist in channels", sample);
return 1;
}
_channel[channel]._volume = d;
_channel[channel]._volumeRight = d;
if (_channel[channel]._volumeFade != -1) {
tmp = ((_channel[channel]._volumeFade - _channel[channel]._volume) * 2) / _channel[channel]._volumeFadeParam;
_channel[chan]._volume = d;
_channel[chan]._volumeRight = d;
if (_channel[chan]._volumeFade != -1) {
tmp = ((_channel[chan]._volumeFade - _channel[chan]._volume) * 2) / _channel[chan]._volumeFadeParam;
if ((tmp < 0) && (tmp > -2)) {
tmp = -1;
} else if ((tmp > 0) && (tmp < 2)) {
@ -5671,22 +5671,22 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i
} else {
tmp /= 2;
}
_channel[channel]._volumeFadeStep = tmp;
_channel[chan]._volumeFadeStep = tmp;
}
return 0;
case 7: // right volume control (0-127)
debug(2, "IMuseDigital::doCommand setting right volume sample(%d),volume(%d)", sample, d);
for (l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
if ((_channel[l]._idSound == sample) && (_channel[l]._used == true)) {
channel = l;
chan = l;
break;
}
}
if (channel == -1) {
if (chan == -1) {
warning("IMuseDigital::doCommand 12,7 sample(%d) not exist in channels", sample);
return 1;
}
_channel[channel]._volumeRight = d;
_channel[chan]._volumeRight = d;
return 0;
default:
warning("IMuseDigital::doCommand 12 DEFAULT sub command %d", sub_cmd);
@ -5698,17 +5698,17 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i
debug(2, "IMuseDigital::doCommand fading volume sample(%d),fade(%d, %d)", sample, d, e);
for (l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
if ((_channel[l]._idSound == sample) && (_channel[l]._used == true)) {
channel = l;
chan = l;
break;
}
}
if (channel == -1) {
if (chan == -1) {
warning("IMuseDigital::doCommand 14,6 sample %d not exist in channels", sample);
return 1;
}
_channel[channel]._volumeFade = d;
_channel[channel]._volumeFadeParam = e;
tmp = ((_channel[channel]._volumeFade - _channel[channel]._volume) * 2) / _channel[channel]._volumeFadeParam;
_channel[chan]._volumeFade = d;
_channel[chan]._volumeFadeParam = e;
tmp = ((_channel[chan]._volumeFade - _channel[chan]._volume) * 2) / _channel[chan]._volumeFadeParam;
if ((tmp < 0) && (tmp > -2)) {
tmp = -1;
} else if ((tmp > 0) && (tmp < 2)) {
@ -5716,7 +5716,7 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i
} else {
tmp /= 2;
}
_channel[channel]._volumeFadeStep = tmp;
_channel[chan]._volumeFadeStep = tmp;
return 0;
default:
warning("IMuseDigital::doCommand 14 DEFAULT sub command %d", sub_cmd);

26
scumm/sound.cpp
View File

@ -133,7 +133,7 @@ byte * Sound::readCreativeVocFile(byte * ptr, uint32 & size, uint32 & rate, uint
while(!quit) {
int len = READ_LE_UINT32(ptr + offset);
offset += 4;
int code = len & 0xFF;
code = len & 0xFF;
len >>= 8;
switch(code) {
case 0: quit = 1; break;
@ -172,18 +172,19 @@ byte * Sound::readCreativeVocFile(byte * ptr, uint32 & size, uint32 & rate, uint
return ret_sound;
}
void Sound::playSound(int sound) {
void Sound::playSound(int soundID) {
byte *ptr;
char *sound;
int size;
int rate;
debug(3,"playSound #%d (room %d)",
sound, _scumm->getResourceRoomNr(rtSound, sound));
ptr = _scumm->getResourceAddress(rtSound, sound);
soundID, _scumm->getResourceRoomNr(rtSound, soundID));
ptr = _scumm->getResourceAddress(rtSound, soundID);
if (ptr) {
if (READ_UINT32_UNALIGNED(ptr) == MKID('iMUS')){
if (_scumm->_imuseDigital)
_scumm->_imuseDigital->startSound(sound);
_scumm->_imuseDigital->startSound(soundID);
return;
}
else if (READ_UINT32_UNALIGNED(ptr) == MKID('SOUN')) {
@ -192,7 +193,7 @@ void Sound::playSound(int sound) {
playCDTrack(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
(ptr[18] * 60 + ptr[19]) * 75 + ptr[20], 0);
_scumm->current_cd_sound = sound;
_scumm->current_cd_sound = soundID;
return;
}
// Support for SFX in Monkey Island 1, Mac version
@ -208,7 +209,7 @@ void Sound::playSound(int sound) {
ptr += 0x72;
// Allocate a sound buffer, copy the data into it, and play
char *sound = (char*)malloc(size);
sound = (char*)malloc(size);
memcpy(sound, ptr, size);
_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
return;
@ -225,13 +226,13 @@ void Sound::playSound(int sound) {
rate = 8000; // FIXME - what value here ?!? 8000 is just a guess
// Allocate a sound buffer, copy the data into it, and play
char *sound = (char*)malloc(size);
sound = (char*)malloc(size);
memcpy(sound, ptr + 8, size);
_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
return;
}
else if (READ_UINT32_UNALIGNED(ptr) == MKID('Crea')) {
_scumm->_imuseDigital->startSound(sound);
_scumm->_imuseDigital->startSound(soundID);
return;
}
else if (READ_UINT32_UNALIGNED(ptr) == MKID('ADL ')) {
@ -285,12 +286,11 @@ void Sound::playSound(int sound) {
size = READ_BE_UINT32_UNALIGNED(ptr + 4) - 27;
// Allocate a sound buffer, copy the data into it, and play
char *sound = (char*)malloc(size);
sound = (char*)malloc(size);
memcpy(sound, ptr + 33, size);
_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
return;
} else if (_scumm->_features & GF_OLD256) {
char *sound;
size = READ_LE_UINT32(ptr);
#if 0
@ -394,8 +394,8 @@ void Sound::playSound(int sound) {
IMuse *se = _scumm->_imuse;
if (se) {
_scumm->getResourceAddress(rtSound, sound);
se->start_sound(sound);
_scumm->getResourceAddress(rtSound, soundID);
se->start_sound(soundID);
}
}

26
sound/mididrv.cpp
View File

@ -43,7 +43,7 @@ public:
int open(int mode);
void close();
void send(uint32 b);
void pause(bool pause);
void pause(bool p);
void set_stream_callback(void *param, StreamCallback *sc);
void setPitchBendRange (byte channel, uint range) { }
@ -247,10 +247,10 @@ void MidiDriver_WIN::send(uint32 b)
check_error(midiOutShortMsg(_mo, u.dwData));
}
void MidiDriver_WIN::pause(bool pause)
void MidiDriver_WIN::pause(bool p)
{
if (_mode == MO_STREAMING) {
if (pause)
if (p)
check_error(midiStreamPause(_ms));
else
check_error(midiStreamRestart(_ms));
@ -303,7 +303,7 @@ public:
int open(int mode);
void close();
void send(uint32 b);
void pause(bool pause);
void pause(bool p);
void set_stream_callback(void *param, StreamCallback *sc);
void setPitchBendRange (byte channel, uint range) { }
@ -473,10 +473,10 @@ void MidiDriver_ETUDE::fill_all()
}
}
void MidiDriver_ETUDE::pause(bool pause)
void MidiDriver_ETUDE::pause(bool p)
{
if (_mode == MO_STREAMING && ScummMidiRequest) {
if (pause)
if (p)
PauseMidiStream(ScummMidiRequest);
else
RestartMidiStream(ScummMidiRequest);
@ -515,7 +515,7 @@ public:
int open(int mode);
void close();
void send(uint32 b);
void pause(bool pause);
void pause(bool p);
void set_stream_callback(void *param, StreamCallback *sc);
void setPitchBendRange (byte channel, uint range) { }
@ -613,7 +613,7 @@ void MidiDriver_SEQ::send(uint32 b)
write(device, buf, position);
}
void MidiDriver_SEQ::pause(bool pause)
void MidiDriver_SEQ::pause(bool p)
{
if (_mode == MO_STREAMING) {
}
@ -653,7 +653,7 @@ public:
int open(int mode);
void close();
void send(uint32 b);
void pause(bool pause) { }
void pause(bool p) { }
void set_stream_callback(void *param, StreamCallback *sc);
void setPitchBendRange (byte channel, uint range);
@ -862,7 +862,7 @@ public:
} int open(int mode);
void close();
void send(uint32 b);
void pause(bool pause);
void pause(bool p);
void set_stream_callback(void *param, StreamCallback *sc);
void setPitchBendRange (byte channel, uint range) { }
@ -985,7 +985,7 @@ public:
int open(int mode);
void close() { }
void send(uint32 b) { }
void pause(bool pause) { }
void pause(bool p) { }
void set_stream_callback(void *param, StreamCallback *sc) { }
void setPitchBendRange (byte channel, uint range) { }
private:
@ -1058,7 +1058,7 @@ public:
int open(int mode);
void close();
void send(uint32 b);
void pause(bool pause);
void pause(bool p);
void set_stream_callback(void *param, StreamCallback *sc);
void setPitchBendRange (byte channel, uint range) { }
@ -1228,7 +1228,7 @@ void MidiDriver_ALSA::send(uint32 b)
}
}
void MidiDriver_ALSA::pause(bool pause)
void MidiDriver_ALSA::pause(bool p)
{
if (_mode == MO_STREAMING) {
/* Err... and what? */

2
sound/mixer.cpp
View File

@ -293,7 +293,7 @@ protected:
int a, b, c, d;
public:
CubicInterpolator(int a, int b, int c) : x0(2 * a - b), x1(a), x2(b), x3(c)
CubicInterpolator(int a0, int b0, int c0) : x0(2 * a0 - b0), x1(a0), x2(b0), x3(c0)
{
// We use a simple linear interpolation for x0
updateCoefficients();