kill the read_chunk handler of struct audio_format handler

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 70cd9f6439286503847709d2a165ca32132d74f1..a18c4d7efb7695584bbf0c7de89e491fdc899419 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -28,6 +28,7 @@
 #include "afh.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
 
 /** must be big enough to hold header */
 #define CHUNK_SIZE 32768
@@ -35,12 +36,11 @@ static double chunk_time = 0.25;
 
 static OggVorbis_File *oggvorbis_file;
 static FILE *infile;
-static int header_len, oggbuf_len, vi_channels;
+static int header_len, inbuf_size, vi_channels;
 static char *header, *inbuf;
-static ssize_t *chunk_table, max_chunk_len;
+static ssize_t *chunk_table, max_chunk_len, num_chunks;
 static struct audio_format_handler *af;
-static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
-       num_chunks;
+static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal;
 
 static int ogg_compute_header_len(void)
 {
@@ -182,7 +182,7 @@ static void ogg_compute_chunk_table(double time_total)
        num_chunks = i - 1;
        chunk_table[i] = pos;
        tunetable();
-       PARA_INFO_LOG("%li chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+       PARA_INFO_LOG("%zu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
                num_chunks, chunk_time, max_chunk_len, min);
        rewind(infile);
 }
@@ -203,7 +203,7 @@ static void ogg_close_audio_file(void)
        num_chunks = 0;
        free(inbuf);
        inbuf = NULL;
-       oggbuf_len = 0;
+       inbuf_size = 0;
 }
 
 static int ogg_save_header(FILE *file, int len)
@@ -222,7 +222,7 @@ static int ogg_save_header(FILE *file, int len)
  * Init oggvorbis file and write some tech data to given pointers.
  */
 static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
-       int *seconds)
+       int *seconds, size_t **vss_chunk_table)
 {
        int ret;
        double time_total;
@@ -259,7 +259,8 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
        vi_channels = vi->channels;
        ogg_compute_chunk_table(time_total);
        *frames = num_chunks;
-       sprintf(info_str, "audio_file_info1:%lu x %lu, %ldkHz, %d channels, %ldkbps\n"
+       *vss_chunk_table = chunk_table;
+       sprintf(info_str, "audio_file_info1:%zu x %lu, %ldkHz, %d channels, %ldkbps\n"
                "audio_file_info2: \n"
                "audio_file_info3: \n",
                num_chunks, (long unsigned) (chunk_time * 1000 * 1000),
@@ -272,73 +273,6 @@ err:
        return ret;
 }
 
-/*
- * Simple stream reposition routine
- */
-static int ogg_reposition_stream(long unsigned request)
-{
-       int ret;
-       long seek;
-
-       seek = chunk_table[request];
-       ret = fseek(infile, seek, SEEK_SET);
-       PARA_DEBUG_LOG("seek to %li returned %d. offset:%li\n", seek,
-               ret, ftell(infile));
-       return ret < 0? -E_OGG_REPOS : 1;
-}
-
-static ogg_int64_t get_chunk_size(long unsigned chunk_num)
-{
-       ogg_int64_t ret;
-       if (chunk_num >= num_chunks)
-               return -1;
-       ret = chunk_table[chunk_num + 1] - chunk_table[chunk_num];
-       if (!ret)
-               return ret;
-#if 0
-       PARA_DEBUG_LOG("chunk %d: %lli-%lli (%lli bytes)\n",
-               chunk_num,
-               chunk_table[chunk_num],
-               chunk_table[chunk_num + 1] - 1,
-               ret);
-#endif
-       return ret;
-}
-
-static char *ogg_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
-       int ret;
-       ogg_int64_t cs = get_chunk_size(current_chunk);
-       if (!cs) { /* nothing to send for this run */
-               *len = 0;
-               return inbuf;
-       }
-       if (cs < 0) { /* eof */
-               *len = 0;
-               return NULL;
-       }
-       *len = cs;
-       if (!inbuf || oggbuf_len < *len) {
-               PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
-                       oggbuf_len, *len);
-               inbuf = para_realloc(inbuf, *len);
-               oggbuf_len = *len;
-       }
-       ret = read(fileno(infile), inbuf, *len);
-       if (!ret) {
-               *len = 0;
-               return NULL;
-       }
-       if (ret < 0) {
-               *len = -E_OGG_READ;
-               return NULL;
-       }
-       if (ret != *len)
-               PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
-       *len = ret;
-       return inbuf;
-}
-
 static char *ogg_get_header_info(int *len)
 {
        *len = header_len;
@@ -355,9 +289,7 @@ static const char* ogg_suffixes[] = {"ogg", NULL};
 void ogg_init(struct audio_format_handler *p)
 {
        af = p;
-       af->reposition_stream = ogg_reposition_stream;
        af->get_file_info = ogg_get_file_info,
-       af->read_chunk = ogg_read_chunk;
        af->close_audio_file = ogg_close_audio_file;
        af->get_header_info = ogg_get_header_info;
        af->chunk_tv.tv_sec = 0;