Kill more duplicate status items.

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index 39859c08ebba613885f424f7c941d79dfa7f2f99..5611579abd552df3b6074a2cf4d65abb1b3abab1 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -112,7 +112,7 @@ static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks
 }
 
 static int ogg_compute_header_len(char *map, size_t numbytes,
-               struct audio_format_info *afi)
+               struct afh_info *afhi)
 {
        int ret;
        size_t len = PARA_MIN(numbytes, CHUNK_SIZE);
@@ -176,11 +176,11 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
        ogg_stream_packetout(stream_in, &packet);
        ogg_stream_packetin(stream_out, &packet);
 
-       afi->header_len = 0;
+       afhi->header_len = 0;
        while (ogg_stream_flush(stream_out, &page))
-               afi->header_len += page.body_len + page.header_len;
-       PARA_DEBUG_LOG("header_len = %d\n", afi->header_len);
-       afi->header_offset = 0;
+               afhi->header_len += page.body_len + page.header_len;
+       PARA_DEBUG_LOG("header_len = %d\n", afhi->header_len);
+       afhi->header_offset = 0;
        ret = 1;
 err2:
        ogg_stream_destroy(stream_in);
@@ -198,7 +198,7 @@ err1:
  * CHUNK_TIME begins. Always successful.
  */
 static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
-       struct audio_format_info *afi, long unsigned time_total)
+       struct afh_info *afhi, long unsigned time_total)
 {
        int i, ret, num;
        ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
@@ -209,8 +209,8 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
        num = time_total / chunk_time + 3;
        PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n",
                chunk_time, num);
-       afi->chunk_table = para_malloc((num + 1) * sizeof(size_t));
-       afi->chunk_table[0] = 0;
+       afhi->chunk_table = para_malloc((num + 1) * sizeof(size_t));
+       afhi->chunk_table[0] = 0;
        max_chunk_len = 0;
        for (i = 1; ret <= num; i++) {
                ogg_int64_t diff;
@@ -221,7 +221,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
                diff = pos - old_pos;
                max_chunk_len = PARA_MAX(max_chunk_len, diff);
                min = (i == 1)? diff : PARA_MIN(min, diff);
-               afi->chunk_table[i] = pos;
+               afhi->chunk_table[i] = pos;
 //             if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
 //                     PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "
 //                             "size: %zd\n", i - 1,
@@ -239,7 +239,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
  * Init oggvorbis file and write some tech data to given pointers.
  */
 static int ogg_get_file_info(char *map, size_t numbytes,
-               struct audio_format_info *afi)
+               struct afh_info *afhi)
 {
        int ret;
        vorbis_info *vi;
@@ -252,7 +252,7 @@ static int ogg_get_file_info(char *map, size_t numbytes,
        };
        struct ogg_datasource ods = {.map = map, .numbytes = numbytes, .fpos = 0};
 
-       ret = ogg_compute_header_len(map, numbytes, afi);
+       ret = ogg_compute_header_len(map, numbytes, afhi);
        if (ret < 0)
                return ret;
        ret = ogg_open_callbacks(&ods, &of, ovc);
@@ -262,21 +262,21 @@ static int ogg_get_file_info(char *map, size_t numbytes,
        vi = ov_info(&of, 0);
        if (!vi)
                goto err;
-       afi->seconds_total = ov_time_total(&of, -1);
-       afi->frequency = vi->rate;
-       afi->bitrate = ov_bitrate(&of, 0) / 1000;
-       afi->channels = vi->channels;
-       afi->chunks_total = ogg_compute_chunk_table(&of, afi, afi->seconds_total);
-       sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ukHz, "
+       afhi->seconds_total = ov_time_total(&of, -1);
+       afhi->frequency = vi->rate;
+       afhi->bitrate = ov_bitrate(&of, 0) / 1000;
+       afhi->channels = vi->channels;
+       afhi->chunks_total = ogg_compute_chunk_table(&of, afhi, afhi->seconds_total);
+       sprintf(afhi->info_string, "audio_file_info1:%lu x %lu, %ukHz, "
                "%d channels, %ukbps\n"
                "audio_file_info2: \n"
                "audio_file_info3: \n",
-               afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
-               afi->frequency / 1000, vi->channels, afi->bitrate
+               afhi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
+               afhi->frequency / 1000, vi->channels, afhi->bitrate
                );
-       afi->chunk_tv.tv_sec = 0;
-       afi->chunk_tv.tv_usec = 250 * 1000;
-       tv_scale(3, &afi->chunk_tv, &afi->eof_tv);
+       afhi->chunk_tv.tv_sec = 0;
+       afhi->chunk_tv.tv_usec = 250 * 1000;
+       tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
        ret = 1;
 err:
        ov_clear(&of); /* keeps the file open */