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

mp3_plugin.c: fix compilation with -pedantic and/or gcc 2.95

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4876 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong
2006-10-06 18:01:12 +00:00
parent e198826606
commit e0a8c17957
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/inputPlugins/mp3_plugin.c
View File

@@ -651,23 +651,27 @@ static int decodeFirstFrame(mp3DecodeData * data, DecoderControl * dc,
/* /*
* Attempt to calulcate the length of the song from filesize * Attempt to calulcate the length of the song from filesize
*/ */
size_t offset = data->inStream->offset; {
mad_timer_t duration = data->frame.header.duration; size_t offset = data->inStream->offset;
float frameTime = ((float)mad_timer_count(duration, MAD_UNITS_MILLISECONDS)) / 1000; mad_timer_t duration = data->frame.header.duration;
float frameTime = ((float)mad_timer_count(duration,
MAD_UNITS_MILLISECONDS)) / 1000;
if (data->stream.this_frame != NULL) if (data->stream.this_frame != NULL)
offset -= data->stream.bufend - data->stream.this_frame; offset -= data->stream.bufend - data->stream.this_frame;
else else
offset -= data->stream.bufend - data->stream.buffer; offset -= data->stream.bufend - data->stream.buffer;
if (data->inStream->size >= offset) { if (data->inStream->size >= offset) {
data->totalTime = ((data->inStream->size - offset) * 8.0) / (data->frame).header.bitrate; data->totalTime = ((data->inStream->size - offset) *
data->maxFrames = data->totalTime / frameTime + FRAMES_CUSHION; 8.0) / (data->frame).header.bitrate;
} else { data->maxFrames = data->totalTime / frameTime +
data->maxFrames = FRAMES_CUSHION; FRAMES_CUSHION;
data->totalTime = 0; } else {
data->maxFrames = FRAMES_CUSHION;
data->totalTime = 0;
}
} }
/* /*
* if an xing tag exists, use that! * if an xing tag exists, use that!
*/ */