Commit 60a15562 authored by Max Kellermann's avatar Max Kellermann

mp3: unsigned integers

parent f667da1b
...@@ -158,13 +158,13 @@ typedef struct _mp3DecodeData { ...@@ -158,13 +158,13 @@ typedef struct _mp3DecodeData {
int muteFrame; int muteFrame;
long *frameOffset; long *frameOffset;
mad_timer_t *times; mad_timer_t *times;
long highestFrame; unsigned long highestFrame;
long maxFrames; unsigned long maxFrames;
long currentFrame; unsigned long currentFrame;
int dropFramesAtStart; unsigned int dropFramesAtStart;
int dropFramesAtEnd; unsigned int dropFramesAtEnd;
int dropSamplesAtStart; unsigned int dropSamplesAtStart;
int dropSamplesAtEnd; unsigned int dropSamplesAtEnd;
int foundXing; int foundXing;
int foundFirstFrame; int foundFirstFrame;
int decodedFirstFrame; int decodedFirstFrame;
...@@ -839,9 +839,9 @@ static int openMp3FromInputStream(InputStream * inStream, mp3DecodeData * data, ...@@ -839,9 +839,9 @@ static int openMp3FromInputStream(InputStream * inStream, mp3DecodeData * data,
static int mp3Read(mp3DecodeData * data, struct decoder *decoder, static int mp3Read(mp3DecodeData * data, struct decoder *decoder,
ReplayGainInfo ** replayGainInfo) ReplayGainInfo ** replayGainInfo)
{ {
int samplesPerFrame; unsigned int samplesPerFrame;
int samplesLeft; unsigned int samplesLeft;
int i; unsigned int i;
int ret; int ret;
int skip; int skip;
...@@ -971,7 +971,7 @@ static int mp3Read(mp3DecodeData * data, struct decoder *decoder, ...@@ -971,7 +971,7 @@ static int mp3Read(mp3DecodeData * data, struct decoder *decoder,
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK && if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK &&
data->inStream->seekable) { data->inStream->seekable) {
long j = 0; unsigned long j = 0;
data->muteFrame = MUTEFRAME_SEEK; data->muteFrame = MUTEFRAME_SEEK;
while (j < data->highestFrame && while (j < data->highestFrame &&
decoder_seek_where(decoder) > decoder_seek_where(decoder) >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment