X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=13e237484a1367cd21d41b18dd2670c15104b421;hp=6d6cd8d0218c860a3e89032cd91a019b67403953;hb=d4776878609698ca63c99c3db711ae3edf038bba;hpb=b3ee0fa979a74e9d7a1497ec5a3ac8fa7cc7472b

diff --git a/aft.c b/aft.c
index 6d6cd8d0..13e23748 100644
--- 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];