X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=6850cbd83b8f8bee770aafb43a4ee984af5d7956;hp=ca487efc40abfde3a2778ae3b9b63ecfd36c8613;hb=c0067c4d103b41d1f80b83170719d4afa999be54;hpb=075a9c88085a4925bcb44857de3d025aa3cdd398 diff --git a/mp3_afh.c b/mp3_afh.c index ca487efc..6850cbd8 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -461,11 +461,6 @@ static int mp3_get_file_info(FILE *audio_file, char *info_str, return 1; } -static int mp3_reposition_stream(__a_unused long unsigned new_frame) -{ - return 1; -} - static char *mp3_read_chunk(long unsigned current_chunk, ssize_t *len) { int ret; @@ -474,8 +469,10 @@ static char *mp3_read_chunk(long unsigned current_chunk, ssize_t *len) *len = 0; if (current_chunk >= num_chunks) return NULL; - pos = chunk_table[current_chunk]; *len = chunk_table[current_chunk + 1] - chunk_table[current_chunk]; + if (!*len) /* nothing to send for this run */ + return inbuf; + pos = chunk_table[current_chunk]; if (inbuf_size < *len) { PARA_INFO_LOG("increasing inbuf for chunk #%lu/%zu to %zd bytes\n", current_chunk, num_chunks, *len); @@ -516,7 +513,6 @@ void mp3_init(struct audio_format_handler *p) { af = p; af->get_file_info = mp3_get_file_info; - af->reposition_stream = mp3_reposition_stream; af->read_chunk = mp3_read_chunk; af->close_audio_file = mp3_close_audio_file; af->get_header_info = NULL;