diff options
| -rw-r--r-- | src/audioOutputs/audioOutput_alsa.c | 5 | ||||
| -rw-r--r-- | src/audioOutputs/audioOutput_oss.c | 5 | ||||
| -rw-r--r-- | src/outputBuffer.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c index 200b65de..61c7670a 100644 --- a/src/audioOutputs/audioOutput_alsa.c +++ b/src/audioOutputs/audioOutput_alsa.c @@ -259,8 +259,9 @@ static int alsa_openDevice(AudioOutput * audioOutput) audioOutput->open = 1; - DEBUG("alsa device \"%s\" will be playing %i channel audio at %i Hz\n", - ad->device, channels, sampleRate); + DEBUG("alsa device \"%s\" will be playing %i bit, %i channel audio at " + "%i Hz\n", ad->device, (int)audioFormat->bits, + channels, sampleRate); return 0; diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c index fc703bd9..8fd2e3c9 100644 --- a/src/audioOutputs/audioOutput_oss.c +++ b/src/audioOutputs/audioOutput_oss.c @@ -482,8 +482,9 @@ static int oss_openDevice(AudioOutput * audioOutput) audioFormat->sampleRate = od->sampleRate; audioFormat->bits = od->bits; - DEBUG("oss device \"%s\" will be playing %i channel audio at %i Hz\n", - od->device, od->channels, od->sampleRate); + DEBUG("oss device \"%s\" will be playing %i bit %i channel audio at " + "%i Hz\n", od->device, od->bits, + od->channels, od->sampleRate); return ret; } diff --git a/src/outputBuffer.c b/src/outputBuffer.c index 463eeef7..e52c6e1a 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -92,7 +92,9 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream, &(cb->audioFormat),data); } - doReplayGain(replayGainInfo, data, datalen, &cb->audioFormat); + if(replayGainInfo) { + doReplayGain(replayGainInfo, data, datalen, &cb->audioFormat); + } while(datalen) { if(currentChunk != cb->end) { |