README: Kill "obligatory" and "optional" tags.

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index df7b85ee790905e2446f05feac534040e83fdf45..ed55d7c02e7a7c50f1b7bc8ca4af950d2eed09b2 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -134,19 +134,19 @@ static int frame_length(struct mp3header *header)
                + header->padding;
 }
 
-static void write_info_str(struct afh_info *afi)
+static void write_info_str(struct afh_info *afhi)
 {
        int v = mp3.id3_isvalid;
 
-       snprintf(afi->info_string, MMD_INFO_SIZE,
+       snprintf(afhi->info_string, MMD_INFO_SIZE,
                "audio_file_info1:%lu x %lums, %u kbit/s (%cbr) %i KHz %s\n"
                "audio_file_info2:%s, by %s\n"
                "audio_file_info3:A: %s, Y: %s, C: %s\n",
-               afi->chunks_total,
-               tv2ms(&afi->chunk_tv),
-               afi->bitrate,
+               afhi->chunks_total,
+               tv2ms(&afhi->chunk_tv),
+               afhi->bitrate,
                mp3.vbr? 'v' : 'c',
-               afi->frequency / 1000,
+               afhi->frequency / 1000,
                header_mode(&mp3.header),
                v && *mp3.id3.title? mp3.id3.title : "(title tag not set)",
                v && *mp3.id3.artist? mp3.id3.artist : "(artist tag not set)",
@@ -317,7 +317,7 @@ static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos)
 }
 
 static int mp3_read_info(unsigned char *map, size_t numbytes,
-               struct afh_info *afi)
+               struct afh_info *afhi)
 {
        long fl_avg = 0, freq_avg = 0, br_avg = 0;
        int ret, len = 0, old_br = -1;
@@ -325,8 +325,8 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
        unsigned chunk_table_size = 1000; /* gets increased on demand */
        off_t fpos = 0;
 
-       afi->chunks_total = 0;
-       afi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
+       afhi->chunks_total = 0;
+       afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
        mp3_get_id3(map, numbytes, &fpos);
        fpos = 0;
        mp3.vbr = 0;
@@ -355,47 +355,47 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
                tv_add(&cct, &total_time, &tmp);
                total_time = tmp;
                //PARA_DEBUG_LOG("%s: br: %d, freq: %d, fl: %d, cct: %lu\n", __func__, br, freq, fl, cct.tv_usec);
-               if (afi->chunks_total >= chunk_table_size) {
+               if (afhi->chunks_total >= chunk_table_size) {
                        chunk_table_size *= 2;
-                       afi->chunk_table = para_realloc(afi->chunk_table,
+                       afhi->chunk_table = para_realloc(afhi->chunk_table,
                                chunk_table_size * sizeof(size_t));
                }
-               afi->chunk_table[afi->chunks_total] = fpos;
-//             if (afi->chunks_total < 10 || !(afi->chunks_total % 1000))
-//                     PARA_INFO_LOG("chunk #%lu: %zd\n", afi->chunks_total,
-//                             afi->chunk_table[afi->chunks_total]);
-               afi->chunks_total++;
-               if (afi->chunks_total == 1) {
+               afhi->chunk_table[afhi->chunks_total] = fpos;
+//             if (afhi->chunks_total < 10 || !(afhi->chunks_total % 1000))
+//                     PARA_INFO_LOG("chunk #%lu: %zd\n", afhi->chunks_total,
+//                             afhi->chunk_table[afhi->chunks_total]);
+               afhi->chunks_total++;
+               if (afhi->chunks_total == 1) {
                        freq_avg = freq;
                        br_avg = br;
                        old_br = br;
                        fl_avg = fl;
                        continue;
                }
-               freq_avg += ((long)freq - freq_avg) / ((long)afi->chunks_total + 1);
-               fl_avg += ((long)fl - fl_avg) / ((long)afi->chunks_total + 1);
-               br_avg += ((long)br - br_avg) / ((long)afi->chunks_total + 1);
+               freq_avg += ((long)freq - freq_avg) / ((long)afhi->chunks_total + 1);
+               fl_avg += ((long)fl - fl_avg) / ((long)afhi->chunks_total + 1);
+               br_avg += ((long)br - br_avg) / ((long)afhi->chunks_total + 1);
                if (old_br != br)
                        mp3.vbr = 1;
                old_br = br;
        }
        ret = -E_MP3_INFO;
-       if (!afi->chunks_total || !freq_avg || !br_avg)
+       if (!afhi->chunks_total || !freq_avg || !br_avg)
                goto err_out;
-       afi->chunk_table[afi->chunks_total] = numbytes - 1;
-       afi->bitrate = br_avg;
-       afi->frequency = freq_avg;
-       afi->channels = header_channels(&mp3.header);
-       afi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
-       tv_divide(afi->chunks_total, &total_time, &afi->chunk_tv);
-       PARA_DEBUG_LOG("%lu chunks, each %lums\n", afi->chunks_total,
-               tv2ms(&afi->chunk_tv));
-       tv_scale(3, &afi->chunk_tv, &afi->eof_tv);
-       PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afi->eof_tv));
+       afhi->chunk_table[afhi->chunks_total] = numbytes - 1;
+       afhi->bitrate = br_avg;
+       afhi->frequency = freq_avg;
+       afhi->channels = header_channels(&mp3.header);
+       afhi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
+       tv_divide(afhi->chunks_total, &total_time, &afhi->chunk_tv);
+       PARA_DEBUG_LOG("%lu chunks, each %lums\n", afhi->chunks_total,
+               tv2ms(&afhi->chunk_tv));
+       tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
+       PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv));
        return 1;
 err_out:
        PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-       free(afi->chunk_table);
+       free(afhi->chunk_table);
        return ret;
 }
 
@@ -403,15 +403,15 @@ err_out:
  * Read mp3 information from audio file
  */
 int mp3_get_file_info(char *map, size_t numbytes,
-               struct afh_info *afi)
+               struct afh_info *afhi)
 {
        int ret;
 
-       ret = mp3_read_info((unsigned char *)map, numbytes, afi);
+       ret = mp3_read_info((unsigned char *)map, numbytes, afhi);
        if (ret < 0)
                return ret;
-       write_info_str(afi);
-       if (afi->seconds_total < 2 || !afi->chunks_total)
+       write_info_str(afhi);
+       if (afhi->seconds_total < 2 || !afhi->chunks_total)
                return -E_MP3_INFO;
        return 1;
 }