oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

audio_format: unsigned integers

Browse Source 
"bits" and "channels" cannot be negative.
This commit is contained in:
Max Kellermann
2008-10-10 14:03:33 +02:00
parent 817a033f55
commit 6101dc6c76
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/audioOutputs/audioOutput_alsa.c
View File

@@ -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;

2
src/audioOutputs/audioOutput_mvp.c
View File

@@ -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];

2
src/audioOutputs/audioOutput_shout.c
View File

@@ -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);