diff options
Diffstat (limited to '')
| -rw-r--r-- | src/audio.c | 8 | ||||
| -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 | ||||
| -rw-r--r-- | src/audio_format.h | 4 | ||||
| -rw-r--r-- | src/pcm_utils.c | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/src/audio.c b/src/audio.c index 9022061f4..bda0107ff 100644 --- a/src/audio.c +++ b/src/audio.c @@ -150,7 +150,7 @@ int parseAudioConfig(struct audio_format *audioFormat, char *conf) return -1; } - audioFormat->bits = (int8_t)strtol(test + 1, &test, 10); + audioFormat->bits = (uint8_t)strtoul(test + 1, &test, 10); if (*test != ':') { ERROR("error parsing audio output format: %s\n", conf); @@ -161,12 +161,12 @@ int parseAudioConfig(struct audio_format *audioFormat, char *conf) case 16: break; default: - ERROR("bits %i can not be used for audio output\n", - (int)audioFormat->bits); + ERROR("bits %u can not be used for audio output\n", + audioFormat->bits); return -1; } - audioFormat->channels = (int8_t)strtol(test + 1, &test, 10); + audioFormat->channels = (uint8_t)strtoul(test + 1, &test, 10); if (*test != '\0') { ERROR("error parsing audio output format: %s\n", conf); 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); diff --git a/src/audio_format.h b/src/audio_format.h index 794ebaaff..dd9b3cae8 100644 --- a/src/audio_format.h +++ b/src/audio_format.h @@ -24,8 +24,8 @@ struct audio_format { uint32_t sampleRate; - int8_t bits; - int8_t channels; + uint8_t bits; + uint8_t channels; }; static inline void audio_format_clear(struct audio_format *af) diff --git a/src/pcm_utils.c b/src/pcm_utils.c index d60fcce66..9274c2eb6 100644 --- a/src/pcm_utils.c +++ b/src/pcm_utils.c @@ -113,7 +113,7 @@ void pcm_volumeChange(char *buffer, int bufferSize, break; default: - FATAL("%i bits not supported by pcm_volumeChange!\n", + FATAL("%u bits not supported by pcm_volumeChange!\n", format->bits); } } @@ -188,7 +188,7 @@ static void pcm_add(char *buffer1, const char *buffer2, size_t size, break; default: - FATAL("%i bits not supported by pcm_add!\n", format->bits); + FATAL("%u bits not supported by pcm_add!\n", format->bits); } } @@ -436,7 +436,7 @@ pcm_convert_24_to_16(int16_t *out, const int32_t *in, } } -static const char *pcm_convertTo16bit(int8_t bits, const char *inBuffer, +static const char *pcm_convertTo16bit(uint8_t bits, const char *inBuffer, size_t inSize, size_t *outSize) { static char *buf; |