make get_file_info() return the chunk table

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index ca487efc40abfde3a2778ae3b9b63ecfd36c8613..398a334e0f51668e2a8acfc11b5f68e7051352bb 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -441,7 +441,7 @@ err_out:
  * Read mp3 information from audio file
  */
 static int mp3_get_file_info(FILE *audio_file, char *info_str,
-       long unsigned *frames, int *seconds)
+       long unsigned *frames, int *seconds, size_t **vss_chunk_table)
 {
        int ret;
 
@@ -456,16 +456,12 @@ static int mp3_get_file_info(FILE *audio_file, char *info_str,
        write_info_str(info_str);
        *frames = num_chunks;
        *seconds = mp3.seconds;
+       *vss_chunk_table = chunk_table;
        if (*seconds < 2 || !*frames)
                return -E_MP3_INFO;
        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 +470,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 +514,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;