diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/decode.c | 4 | ||||
| -rw-r--r-- | src/outputBuffer.c | 4 | ||||
| -rw-r--r-- | src/outputBuffer.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/decode.c b/src/decode.c index 0dae5a1de..77488483a 100644 --- a/src/decode.c +++ b/src/decode.c @@ -518,7 +518,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * if (do_pause) player_sleep(); - else if (!outputBufferEmpty(cb) && cb->begin != next) { + else if (!outputBufferEmpty(cb) && (int)cb->begin != next) { OutputBufferChunk *beginChunk = outputBufferGetChunk(cb, cb->begin); unsigned int fadePosition; @@ -564,7 +564,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * break; outputBufferShift(cb); player_wakeup_decoder_nb(); - } else if (!outputBufferEmpty(cb) && cb->begin == next) { + } else if (!outputBufferEmpty(cb) && (int)cb->begin == next) { /* at the beginning of a new song */ if (doCrossFade == 1 && nextChunk >= 0) { diff --git a/src/outputBuffer.c b/src/outputBuffer.c index 4995fa9a5..8e2780eb2 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -53,7 +53,7 @@ static inline unsigned successor(const OutputBuffer * cb, unsigned i) void flushOutputBuffer(OutputBuffer * cb) { - if (cb->currentChunk == cb->end) { + if (cb->currentChunk == (int)cb->end) { cb->end = successor(cb, cb->end); cb->currentChunk = -1; } @@ -125,7 +125,7 @@ static int tailChunk(OutputBuffer * cb, InputStream * inStream, unsigned int next; OutputBufferChunk *chunk; - if (cb->currentChunk == cb->end) + if (cb->currentChunk == (int)cb->end) return cb->currentChunk; next = successor(cb, cb->end); diff --git a/src/outputBuffer.h b/src/outputBuffer.h index 28bb743b3..6ca073836 100644 --- a/src/outputBuffer.h +++ b/src/outputBuffer.h @@ -49,12 +49,12 @@ typedef struct _OutputBuffer { unsigned int size; /** the index of the first decoded chunk */ - mpd_uint16 volatile begin; + unsigned int volatile begin; /** the index after the last decoded chunk */ - mpd_uint16 volatile end; + unsigned int volatile end; - mpd_sint16 currentChunk; + int currentChunk; AudioFormat audioFormat; ConvState convState; |