aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2005-03-19 14:30:07 +0000
committerWarren Dukes <warren.dukes@gmail.com>2005-03-19 14:30:07 +0000
commit9297ae7fce821eff7cddf60d027146dc5f9ba41d (patch)
tree4ef7f7ad7753291c6793f9fc3efea63ecf97d8af
parent7ecd93e73ec77db3169fb83d1a1ca72a51ca61c7 (diff)
downloadmpd-9297ae7fce821eff7cddf60d027146dc5f9ba41d.tar.gz
mpd-9297ae7fce821eff7cddf60d027146dc5f9ba41d.tar.xz
mpd-9297ae7fce821eff7cddf60d027146dc5f9ba41d.zip
print out bits in debug message output for OSS and ALSA
git-svn-id: https://svn.musicpd.org/mpd/trunk@3104 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/audioOutputs/audioOutput_alsa.c5
-rw-r--r--src/audioOutputs/audioOutput_oss.c5
-rw-r--r--src/outputBuffer.c4
3 files changed, 9 insertions, 5 deletions
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c
index 200b65def..61c7670a2 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 fc703bd90..8fd2e3c9f 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 463eeef79..e52c6e1a4 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) {