mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-25 04:01:03 +00:00
fixed some mixer warnings
This commit is contained in:
parent
0385618f3f
commit
d0b9e7f16d
@ -376,7 +376,7 @@ void SoundMixer::setVolume(int volume) {
|
||||
}
|
||||
|
||||
|
||||
Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, bool isMusic, int id)
|
||||
Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, bool /*isMusic*/, int id)
|
||||
: _mixer(mixer), _handle(handle), _autofreeStream(true),
|
||||
_volume(255), _balance(0), _paused(false), _id(id), _samplesConsumed(0),
|
||||
_samplesDecoded(0), _converter(0), _input(NULL) {
|
||||
@ -384,10 +384,10 @@ Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, bool isMusic, in
|
||||
}
|
||||
|
||||
Channel::Channel(SoundMixer *mixer, PlayingSoundHandle *handle, AudioStream *input,
|
||||
bool autofreeStream, bool isMusic, bool reverseStereo, int id, bool permanent)
|
||||
bool autofreeStream, bool /*isMusic*/, bool reverseStereo, int id, bool permanent)
|
||||
: _mixer(mixer), _handle(handle), _autofreeStream(autofreeStream),
|
||||
_volume(255), _balance(0), _paused(false), _id(id), _samplesConsumed(0),
|
||||
_samplesDecoded(0), _converter(0), _input(input), _permanent(permanent) {
|
||||
_permanent(permanent), _volume(255), _balance(0), _paused(false), _id(id),
|
||||
_samplesConsumed(0), _samplesDecoded(0), _converter(0), _input(input) {
|
||||
assert(mixer);
|
||||
assert(input);
|
||||
|
||||
|
@ -78,7 +78,7 @@ protected:
|
||||
public:
|
||||
LinearRateConverter(st_rate_t inrate, st_rate_t outrate);
|
||||
int flow(AudioStream &input, st_sample_t *obuf, st_size_t osamp, st_volume_t vol_l, st_volume_t vol_r);
|
||||
int drain(st_sample_t *obuf, st_size_t osamp, st_volume_t vol) {
|
||||
int drain(st_sample_t * /*obuf*/, st_size_t /*osamp*/, st_volume_t /*vol*/) {
|
||||
return (ST_SUCCESS);
|
||||
}
|
||||
};
|
||||
@ -235,7 +235,7 @@ public:
|
||||
}
|
||||
return (ST_SUCCESS);
|
||||
}
|
||||
virtual int drain(st_sample_t *obuf, st_size_t osamp, st_volume_t vol) {
|
||||
virtual int drain(st_sample_t * /*obuf*/, st_size_t /*osamp*/, st_volume_t /*vol*/) {
|
||||
return (ST_SUCCESS);
|
||||
}
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user