Rename struct audio_format_info to afh_info.

diff --git a/aac_afh.c b/aac_afh.c
index 76b2849d8be26fa7db071c11655e62249c06f0bd..f679af29de6e54efe0d1fd6dbef94eab61314a30 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -42,7 +42,7 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
        return -E_STSZ;
 }
 
-static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
+static ssize_t aac_compute_chunk_table(struct afh_info *afi,
                unsigned char *map, size_t numbytes)
 {
        int ret, i;
@@ -67,7 +67,7 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
        return skip;
 }
 
-static int aac_set_chunk_tv(struct audio_format_info *afi,
+static int aac_set_chunk_tv(struct afh_info *afi,
                mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
 {
        float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
@@ -93,7 +93,7 @@ static int aac_set_chunk_tv(struct audio_format_info *afi,
  * Init m4a file and write some tech data to given pointers.
  */
 static int aac_get_file_info(char *map, size_t numbytes,
-               struct audio_format_info *afi)
+               struct afh_info *afi)
 {
        int i;
        size_t skip;

diff --git a/afh.h b/afh.h
index 9ad078582e156be166b7c06dc35100549a26f337..52d50a9103c8093a840c9b8e09003ad764f69c1f 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -30,7 +30,7 @@
  * Audio format dependent information. Details vary between each audio format
  * handler.
  */
-struct audio_format_info {
+struct afh_info {
        /** The number of chunks this audio file contains. */
        long unsigned chunks_total;
        /** The length of the audio file in seconds. */
@@ -93,16 +93,16 @@ struct audio_format_handler {
         * valid for this audio format. A negative return value indicates that
         * this audio format handler is unable to decode the given file. On
         * success, the function must return a positive value and fill in the
-        * given struct audio_format_info.
+        * given struct afh_info.
         *
-        * \sa struct audio_format_info
+        * \sa struct afh_info
         */
        int (*get_file_info)(char *map, size_t numbytes,
-               struct audio_format_info *afi);
+               struct afh_info *afi);
 };
 
 void afh_init(void);
 int guess_audio_format(const char *name);
 int compute_afhi(const char *path, char *data, size_t size,
-       struct audio_format_info *afhi);
+       struct afh_info *afhi);
 const char *audio_format_name(int);

diff --git a/afh_common.c b/afh_common.c
index 311e0c13046de441f3b01bc470e355fa2670ea5a..a1ea3c72ef49c2d5e538fe2a59a47670b164b238 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -138,7 +138,7 @@ int guess_audio_format(const char *name)
  * one is found that can handle the file.
  */
 int compute_afhi(const char *path, char *data, size_t size,
-               struct audio_format_info *afhi)
+               struct afh_info *afhi)
 {
        int ret, i, format = guess_audio_format(path);
 

diff --git a/afs.h b/afs.h
index aecf627da420211703e33558aa8f137b413e7a00..bebe3ea3c9ea67dacab10173f36d2312b370ba8a 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -102,7 +102,7 @@ struct audio_file_data {
        int fd;
        long score;
        struct afs_info afsi;
-       struct audio_format_info afhi;
+       struct afh_info afhi;
 };
 
 enum afs_server_code {
@@ -185,7 +185,7 @@ int load_afd(int shmid, struct audio_file_data *afd);
 int load_afsi(struct afs_info *afsi, struct osl_object *obj);
 void save_afsi(struct afs_info *afsi, struct osl_object *obj);
 int get_afsi_of_row(const struct osl_row *row, struct afs_info *afsi);
-int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi);
+int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi);
 int get_afsi_of_path(const char *path, struct afs_info *afsi);
 int get_audio_file_path_of_row(const struct osl_row *row, char **path);
 int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj);

diff --git a/aft.c b/aft.c
index 6d6cd8d0218c860a3e89032cd91a019b67403953..13e237484a1367cd21d41b18dd2670c15104b421 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -99,7 +99,7 @@ struct ls_widths {
 /** Data passed to the different compare functions (called by qsort()). */
 struct ls_data {
        /** Usual audio format handler information. */
-       struct audio_format_info afhi;
+       struct afh_info afhi;
        /** Audio file selector information. */
        struct afs_info afsi;
        /** The full path of the audio file. */
@@ -320,14 +320,14 @@ enum afhi_offsets {
        MIN_AFHI_SIZE = 14
 };
 
-static unsigned sizeof_afhi_buf(const struct audio_format_info *afhi)
+static unsigned sizeof_afhi_buf(const struct afh_info *afhi)
 {
        if (!afhi)
                return 0;
        return strlen(afhi->info_string) + MIN_AFHI_SIZE;
 }
 
-static void save_afhi(struct audio_format_info *afhi, char *buf)
+static void save_afhi(struct afh_info *afhi, char *buf)
 {
        if (!afhi)
                return;
@@ -340,7 +340,7 @@ static void save_afhi(struct audio_format_info *afhi, char *buf)
        PARA_DEBUG_LOG("last byte written: %p\n", buf + AFHI_INFO_STRING_OFFSET + strlen(afhi->info_string));
 }
 
-static void load_afhi(const char *buf, struct audio_format_info *afhi)
+static void load_afhi(const char *buf, struct afh_info *afhi)
 {
        afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
        afhi->bitrate = read_u32(buf + AFHI_BITRATE_OFFSET);
@@ -351,7 +351,7 @@ static void load_afhi(const char *buf, struct audio_format_info *afhi)
 
 //#define SIZEOF_CHUNK_TABLE(afhi) (((afhi)->chunks_total + 1) * sizeof(uint32_t))
 
-static unsigned sizeof_chunk_info_buf(struct audio_format_info *afhi)
+static unsigned sizeof_chunk_info_buf(struct afh_info *afhi)
 {
        if (!afhi)
                return 0;
@@ -375,7 +375,7 @@ enum chunk_info_offsets{
        CHUNK_TABLE_OFFSET = 20,
 };
 
-static void save_chunk_table(struct audio_format_info *afhi, char *buf)
+static void save_chunk_table(struct afh_info *afhi, char *buf)
 {
        int i;
 
@@ -384,7 +384,7 @@ static void save_chunk_table(struct audio_format_info *afhi, char *buf)
                write_u32(buf + 4 * i, afhi->chunk_table[i]);
 }
 
-static void load_chunk_table(struct audio_format_info *afhi, char *buf)
+static void load_chunk_table(struct afh_info *afhi, char *buf)
 {
        int i;
        for (i = 0; i <= afhi->chunks_total; i++)
@@ -392,7 +392,7 @@ static void load_chunk_table(struct audio_format_info *afhi, char *buf)
 }
 
 /* TODO: audio format handlers could just produce this */
-static void save_chunk_info(struct audio_format_info *afhi, char *buf)
+static void save_chunk_info(struct afh_info *afhi, char *buf)
 {
        if (!afhi)
                return;
@@ -404,7 +404,7 @@ static void save_chunk_info(struct audio_format_info *afhi, char *buf)
        save_chunk_table(afhi, buf + CHUNK_TABLE_OFFSET);
 }
 
-static int load_chunk_info(struct osl_object *obj, struct audio_format_info *afhi)
+static int load_chunk_info(struct osl_object *obj, struct afh_info *afhi)
 {
        char *buf = obj->data;
 
@@ -587,7 +587,7 @@ static int get_hash_of_row(const struct osl_row *row, HASH_TYPE **hash)
  *
  * \sa get_chunk_table_of_row().
  */
-int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
+int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
 {
        struct osl_object obj;
        int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI,
@@ -821,7 +821,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
        char duration_buf[30]; /* nobody has an audio file long enough to overflow this */
        char score_buf[30] = "";
        struct afs_info *afsi = &d->afsi;
-       struct audio_format_info *afhi = &d->afhi;
+       struct afh_info *afhi = &d->afhi;
        struct ls_widths *w = &opts->widths;
        int have_score = opts->flags & LS_FLAG_ADMISSIBLE_ONLY;
        char asc_hash[2 * HASH_SIZE + 1];
@@ -1362,7 +1362,7 @@ enum aft_row_offsets {
 /* never save the afsi, as the server knows it too. Note that afhi might be NULL.
  * In this case, afhi won't be stored in the buffer  */
 static void save_audio_file_info(HASH_TYPE *hash, const char *path,
-               struct audio_format_info *afhi, uint32_t flags,
+               struct afh_info *afhi, uint32_t flags,
                uint8_t audio_format_num, struct osl_object *obj)
 {
        size_t path_len = strlen(path) + 1;
@@ -1610,7 +1610,7 @@ static int add_one_audio_file(const char *path, const void *private_data)
        int ret, ret2;
        uint8_t format_num = -1;
        const struct private_add_data *pad = private_data;
-       struct audio_format_info afhi, *afhi_ptr = NULL;
+       struct afh_info afhi, *afhi_ptr = NULL;
        struct osl_row *pb = NULL, *hs = NULL; /* path brother/hash sister */
        struct osl_object map, obj = {.data = NULL}, query, result = {.data = NULL};
        HASH_TYPE hash[HASH_SIZE];

diff --git a/mood.c b/mood.c
index ce5c1c7e87fbd76d2ca3599309ce0eb3e0dbd691..77b4a7361554fa05ca36f7685114c2bd1b7ba68c 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -47,7 +47,7 @@ struct afs_statistics statistics;
  * \sa struct mood_method, mood_parser.
  */
 typedef int mood_score_function(const char *path, const struct afs_info *afsi,
-               const struct audio_format_info *afhi, const void *data);
+               const struct afh_info *afhi, const void *data);
 
 /**
  * Pre-process a mood line.
@@ -172,7 +172,7 @@ static int mm_no_attributes_set_parser(const char *arg, __a_unused void **ignore
 
 static int mm_no_attributes_set_score_function(__a_unused const char *path,
                const struct afs_info *afsi,
-               __a_unused const struct audio_format_info *afhi,
+               __a_unused const struct afh_info *afhi,
                __a_unused const void *data)
 {
        if (!afsi->attributes)
@@ -182,7 +182,7 @@ static int mm_no_attributes_set_score_function(__a_unused const char *path,
 
 static int mm_played_rarely_score_function(__a_unused const char *path,
                const struct afs_info *afsi,
-               __a_unused const struct audio_format_info *afhi,
+               __a_unused const struct afh_info *afhi,
                __a_unused const void *data)
 {
        unsigned num;
@@ -205,7 +205,7 @@ static int mm_played_rarely_parser(const char *arg, __a_unused void **ignored)
 
 static int mm_name_like_score_function(const char *path,
                __a_unused const struct afs_info *afsi,
-               __a_unused const struct audio_format_info *afhi,
+               __a_unused const struct afh_info *afhi,
                const void *data)
 {
        if (fnmatch(data, path, 0))
@@ -238,7 +238,7 @@ static int mm_is_set_parser(const char *arg, void **bitnum)
 
 static int mm_is_set_score_function(__a_unused const char *path,
                __a_unused const struct afs_info *afsi,
-               __a_unused const struct audio_format_info *afhi,
+               __a_unused const struct afh_info *afhi,
                const void *data)
 {
        const unsigned char *bn = data;
@@ -252,7 +252,7 @@ static int add_item_score(const struct osl_row *row, struct mood_item *item, lon
                long *score_arg_sum)
 {
        struct afs_info afsi;
-       struct audio_format_info afhi;
+       struct afh_info afhi;
        char *path;
        int ret;
 

diff --git a/mp3_afh.c b/mp3_afh.c
index e36cdef934f238534eb50346869bfa20e9d1e38e..df7b85ee790905e2446f05feac534040e83fdf45 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -134,7 +134,7 @@ static int frame_length(struct mp3header *header)
                + header->padding;
 }
 
-static void write_info_str(struct audio_format_info *afi)
+static void write_info_str(struct afh_info *afi)
 {
        int v = mp3.id3_isvalid;
 
@@ -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 audio_format_info *afi)
+               struct afh_info *afi)
 {
        long fl_avg = 0, freq_avg = 0, br_avg = 0;
        int ret, len = 0, old_br = -1;
@@ -403,7 +403,7 @@ err_out:
  * Read mp3 information from audio file
  */
 int mp3_get_file_info(char *map, size_t numbytes,
-               struct audio_format_info *afi)
+               struct afh_info *afi)
 {
        int ret;
 

diff --git a/ogg_afh.c b/ogg_afh.c
index 39859c08ebba613885f424f7c941d79dfa7f2f99..f4f375cbea76480de87838612569eaf47cd9f658 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 *afi)
 {
        int ret;
        size_t len = PARA_MIN(numbytes, CHUNK_SIZE);
@@ -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 *afi, long unsigned time_total)
 {
        int i, ret, num;
        ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
@@ -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 *afi)
 {
        int ret;
        vorbis_info *vi;

diff --git a/server.c b/server.c
index d8fc48eeb0f7b220e49832ccb9e1e5706c63fde0..f86fb8b26b6111d2acacaeccceb108424441f616 100644 (file)
--- a/server.c
+++ b/server.c
@@ -32,7 +32,7 @@
  *     - dccp: \ref dccp_recv.c, \ref dccp_send.c,
  *     - Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c,
  *     - Afs structures: \ref afs_table, \ref audio_file_data,
- *       \ref afs_info \ref audio_format_info,
+ *       \ref afs_info \ref afh_info,
  *     - Afs tables: \ref aft.c, \ref mood.c, \ref playlist.c,
  *       \ref attribute.c, \ref score.c,
  *     - The virtual streaming system: \ref vss.c, \ref chunk_queue.c.

diff --git a/vss.c b/vss.c
index 963d311b05bacf18660742d3d2dbfd4290fa54d4..3b364a5b9f6c84265a41576867a7f58a08fff2f8 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -316,7 +316,7 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
                return tv;
        if (!map && vss_playing() &&
                        !(mmd->new_vss_status_flags & VSS_NOMORE)) {
-               PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n");
+               PARA_DEBUG_LOG("ready and playing, but no audio file\n");
                if (afsss == AFS_SOCKET_READY) {
                        para_fd_set(afs_socket, wfds, max_fileno);
                        afsss = AFS_SOCKET_CHECK_FOR_WRITE;