diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/audioOutputs/audioOutput_jack.c | 2 | ||||
| -rw-r--r-- | src/inputPlugins/mp3_plugin.c | 8 | ||||
| -rw-r--r-- | src/inputPlugins/mp4_plugin.c | 2 | ||||
| -rw-r--r-- | src/pcm_utils.h | 4 | ||||
| -rw-r--r-- | src/tag.c | 3 |
5 files changed, 9 insertions, 10 deletions
diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c index 253da2159..31f41b712 100644 --- a/src/audioOutputs/audioOutput_jack.c +++ b/src/audioOutputs/audioOutput_jack.c @@ -372,7 +372,7 @@ static int jack_playAudio(AudioOutput * audioOutput, char *buff, int size) { JackData *jd = audioOutput->data; size_t space; - int i; + unsigned int i; short *buffer = (short *) buff; jack_default_audio_sample_t sample; size_t samples = size/4; diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c index f6b45cd2f..875ec1482 100644 --- a/src/inputPlugins/mp3_plugin.c +++ b/src/inputPlugins/mp3_plugin.c @@ -285,7 +285,7 @@ static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag) #endif #ifdef HAVE_ID3TAG -static void mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize, +static void mp3_parseId3Tag(mp3DecodeData * data, size_t tagsize, MpdTag ** mpdTag, ReplayGainInfo ** replayGainInfo) { struct id3_tag *id3Tag = NULL; @@ -309,7 +309,7 @@ static void mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize, mad_stream_skip(&(data->stream), count); while (count < tagsize) { - int len; + size_t len; len = readFromInputStream(data->inStream, allocated + count, (size_t) 1, @@ -383,8 +383,8 @@ static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag, if (tagsize > 0) { if (tag && !(*tag)) { - mp3_parseId3Tag(data, tagsize, tag, - replayGainInfo); + mp3_parseId3Tag(data, (size_t)tagsize, + tag, replayGainInfo); } else { mad_stream_skip(&(data->stream), tagsize); diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c index 0484e9993..c4a04f582 100644 --- a/src/inputPlugins/mp4_plugin.c +++ b/src/inputPlugins/mp4_plugin.c @@ -260,7 +260,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, dc->state = DECODE_STATE_DECODE; } - if (channels * (dur + offset) > frameInfo.samples) { + if (channels * (unsigned long)(dur + offset) > frameInfo.samples) { dur = frameInfo.samples / channels; offset = 0; } diff --git a/src/pcm_utils.h b/src/pcm_utils.h index 752fac3e7..db7846598 100644 --- a/src/pcm_utils.h +++ b/src/pcm_utils.h @@ -35,8 +35,8 @@ typedef struct _ConvState { size_t dataInSize; size_t dataOutSize; mpd_sint8 lastChannels; - mpd_sint32 lastInSampleRate; - mpd_sint32 lastOutSampleRate; + mpd_uint32 lastInSampleRate; + mpd_uint32 lastOutSampleRate; #endif /* Strict C99 doesn't allow empty structs */ int error; @@ -176,8 +176,7 @@ static MpdTag *getID3Info( id3_ucs4_t const *ucs4; id3_utf8_t *utf8; union id3_field const *field; - unsigned int nstrings; - int i; + unsigned int nstrings, i; frame = id3_tag_findframe(tag, id, 0); /* Check frame */ |