diff options
| author | Max Kellermann <max@duempel.org> | 2008-10-10 14:03:33 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-10-10 14:03:33 +0200 |
| commit | 6101dc6c768b09dbcdc1840a84b619a5a6a20129 (patch) | |
| tree | af2369299cff4af045fe8717584a29b6234aac51 /src/audioOutputs | |
| parent | 817a033f5591fefb842e355ef211d09e855661ef (diff) | |
| download | mpd-6101dc6c768b09dbcdc1840a84b619a5a6a20129.tar.gz mpd-6101dc6c768b09dbcdc1840a84b619a5a6a20129.tar.xz mpd-6101dc6c768b09dbcdc1840a84b619a5a6a20129.zip | |
audio_format: unsigned integers
"bits" and "channels" cannot be negative.
Diffstat (limited to 'src/audioOutputs')
| -rw-r--r-- | src/audioOutputs/audioOutput_alsa.c | 8 | ||||
| -rw-r--r-- | src/audioOutputs/audioOutput_mvp.c | 2 | ||||
| -rw-r--r-- | src/audioOutputs/audioOutput_shout.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c index d28deb733..83bd9c256 100644 --- a/src/audioOutputs/audioOutput_alsa.c +++ b/src/audioOutputs/audioOutput_alsa.c @@ -153,7 +153,7 @@ static int alsa_openDevice(void *data, struct audio_format *audioFormat) unsigned int buffer_time; if ((bitformat = get_bitformat(audioFormat)) == SND_PCM_FORMAT_UNKNOWN) - ERROR("ALSA device \"%s\" doesn't support %i bit audio\n", + ERROR("ALSA device \"%s\" doesn't support %u bit audio\n", ad->device, audioFormat->bits); err = snd_pcm_open(&ad->pcmHandle, ad->device, @@ -201,7 +201,7 @@ configure_hw: err = snd_pcm_hw_params_set_format(ad->pcmHandle, hwparams, bitformat); if (err < 0) { - ERROR("ALSA device \"%s\" does not support %i bit audio: " + ERROR("ALSA device \"%s\" does not support %u bit audio: " "%s\n", ad->device, audioFormat->bits, snd_strerror(-err)); goto fail; } @@ -290,8 +290,8 @@ configure_hw: ad->sampleSize = audio_format_sample_size(audioFormat) * audioFormat->channels; - DEBUG("ALSA device \"%s\" will be playing %i bit, %i channel audio at " - "%i Hz\n", ad->device, (int)audioFormat->bits, + DEBUG("ALSA device \"%s\" will be playing %i bit, %u channel audio at " + "%i Hz\n", ad->device, audioFormat->bits, channels, sampleRate); return 0; diff --git a/src/audioOutputs/audioOutput_mvp.c b/src/audioOutputs/audioOutput_mvp.c index d22747408..59f43a4fd 100644 --- a/src/audioOutputs/audioOutput_mvp.c +++ b/src/audioOutputs/audioOutput_mvp.c @@ -111,7 +111,7 @@ static void mvp_finishDriver(struct audio_output *audioOutput) } static int mvp_setPcmParams(MvpData * md, unsigned long rate, int channels, - int big_endian, int bits) + int big_endian, unsigned bits) { int iloop; int mix[5]; diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c index b9deef295..34327573c 100644 --- a/src/audioOutputs/audioOutput_shout.c +++ b/src/audioOutputs/audioOutput_shout.c @@ -252,7 +252,7 @@ static void *my_shout_init_driver(struct audio_output *audio_output, char temp[11]; memset(temp, 0, sizeof(temp)); - snprintf(temp, sizeof(temp), "%d", sd->audio_format.channels); + snprintf(temp, sizeof(temp), "%u", sd->audio_format.channels); shout_set_audio_info(sd->shout_conn, SHOUT_AI_CHANNELS, temp); snprintf(temp, sizeof(temp), "%d", sd->audio_format.sampleRate); |