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

mp3: moved code to mp3_this_frame_offset()

Browse Source 
Break the large function mp3_read() into smaller pieces.
This commit is contained in:
Max Kellermann 2008-10-29 16:13:01 +01:00
parent a6f8776c94
commit 0d079ee515
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/decoder/mp3_plugin.c
View File

@ -657,7 +657,7 @@ mp3_frame_duration(const struct mad_frame *frame)
} }
static off_t static off_t
mp3_rest_including_this_frame(const struct mp3_data *data) mp3_this_frame_offset(const struct mp3_data *data)
{ {
off_t offset = data->input_stream->offset; off_t offset = data->input_stream->offset;
@ -666,7 +666,13 @@ mp3_rest_including_this_frame(const struct mp3_data *data)
else else
offset -= data->stream.bufend - data->stream.buffer; offset -= data->stream.bufend - data->stream.buffer;
return data->input_stream->size - offset; return offset;
}
static off_t
mp3_rest_including_this_frame(const struct mp3_data *data)
{
return data->input_stream->size - mp3_this_frame_offset(data);
} }
/** /**
@ -853,14 +859,8 @@ mp3_read(struct mp3_data *data, ReplayGainInfo **replay_gain_info_r)
} else { } else {
data->highest_frame++; data->highest_frame++;
} }
data->frame_offsets[data->current_frame] = data->input_stream->offset; data->frame_offsets[data->current_frame] =
if (data->stream.this_frame != NULL) { mp3_this_frame_offset(data);
data->frame_offsets[data->current_frame] -=
data->stream.bufend - data->stream.this_frame;
} else {
data->frame_offsets[data->current_frame] -=
data->stream.bufend - data->stream.buffer;
}
data->times[data->current_frame] = data->timer; data->times[data->current_frame] = data->timer;
} else { } else {
data->timer = data->times[data->current_frame]; data->timer = data->times[data->current_frame];