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

yet more unsigned integers

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@7287 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann 2008-04-12 04:15:10 +00:00 committed by Eric Wong
parent 4e0891337a
commit a5aa5a0258
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audioOutputs/audioOutput_jack.c
View File

@ -372,7 +372,7 @@ static int jack_playAudio(AudioOutput * audioOutput, char *buff, int size)
{ {
JackData *jd = audioOutput->data; JackData *jd = audioOutput->data;
size_t space; size_t space;
int i; unsigned int i;
short *buffer = (short *) buff; short *buffer = (short *) buff;
jack_default_audio_sample_t sample; jack_default_audio_sample_t sample;
size_t samples = size/4; size_t samples = size/4;

8
src/inputPlugins/mp3_plugin.c
View File

@ -285,7 +285,7 @@ static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag)
#endif #endif
#ifdef HAVE_ID3TAG #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) MpdTag ** mpdTag, ReplayGainInfo ** replayGainInfo)
{ {
struct id3_tag *id3Tag = NULL; struct id3_tag *id3Tag = NULL;
@ -309,7 +309,7 @@ static void mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize,
mad_stream_skip(&(data->stream), count); mad_stream_skip(&(data->stream), count);
while (count < tagsize) { while (count < tagsize) {
int len; size_t len;
len = readFromInputStream(data->inStream, len = readFromInputStream(data->inStream,
allocated + count, (size_t) 1, allocated + count, (size_t) 1,
@ -383,8 +383,8 @@ static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag,
if (tagsize > 0) { if (tagsize > 0) {
if (tag && !(*tag)) { if (tag && !(*tag)) {
mp3_parseId3Tag(data, tagsize, tag, mp3_parseId3Tag(data, (size_t)tagsize,
replayGainInfo); tag, replayGainInfo);
} else { } else {
mad_stream_skip(&(data->stream), mad_stream_skip(&(data->stream),
tagsize); tagsize);

2
src/inputPlugins/mp4_plugin.c
View File

@ -260,7 +260,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc,
dc->state = DECODE_STATE_DECODE; dc->state = DECODE_STATE_DECODE;
} }
if (channels * (dur + offset) > frameInfo.samples) { if (channels * (unsigned long)(dur + offset) > frameInfo.samples) {
dur = frameInfo.samples / channels; dur = frameInfo.samples / channels;
offset = 0; offset = 0;
} }

4
src/pcm_utils.h
View File

@ -35,8 +35,8 @@ typedef struct _ConvState {
size_t dataInSize; size_t dataInSize;
size_t dataOutSize; size_t dataOutSize;
mpd_sint8 lastChannels; mpd_sint8 lastChannels;
mpd_sint32 lastInSampleRate; mpd_uint32 lastInSampleRate;
mpd_sint32 lastOutSampleRate; mpd_uint32 lastOutSampleRate;
#endif #endif
/* Strict C99 doesn't allow empty structs */ /* Strict C99 doesn't allow empty structs */
int error; int error;

3
src/tag.c
View File

@ -176,8 +176,7 @@ static MpdTag *getID3Info(
id3_ucs4_t const *ucs4; id3_ucs4_t const *ucs4;
id3_utf8_t *utf8; id3_utf8_t *utf8;
union id3_field const *field; union id3_field const *field;
unsigned int nstrings; unsigned int nstrings, i;
int i;
frame = id3_tag_findframe(tag, id, 0); frame = id3_tag_findframe(tag, id, 0);
/* Check frame */ /* Check frame */