X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=b4d8c2dd359bbfbe143c8be75a89b016b0bfe505;hb=f7b521c8ef0ae9af918476f41c67c5b839c865b5;hp=991cb777e0a3bf9846d4d9aea389e03b7f6ed6a2;hpb=f484411f1a48386975f55d1273750ca3c926aa9a;p=paraslash.git

diff --git a/aft.c b/aft.c
index 991cb777..b4d8c2dd 100644
--- a/aft.c
+++ b/aft.c
@@ -799,6 +799,12 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b)
 	int ret, i;
 	char *buf;
 
+	para_printf(b, "%s\nchunk_time: %lu:%lu\n", d->path,
+		(long unsigned) d->afhi.chunk_tv.tv_sec,
+		(long unsigned) d->afhi.chunk_tv.tv_usec
+	);
+	if (afh_supports_dynamic_chunks(d->afsi.audio_format_id))
+		return 0;
 	ret = aft_get_row_of_hash(d->hash, &aft_row);
 	if (ret < 0)
 		return ret;
@@ -806,12 +812,7 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b)
 		AFTCOL_CHUNKS, &chunk_table_obj));
 	if (ret < 0)
 		return ret;
-	para_printf(b, "%s\n"
-		"chunk_time: %lu:%lu\nchunk_offsets: ",
-		d->path,
-		(long unsigned) d->afhi.chunk_tv.tv_sec,
-		(long unsigned) d->afhi.chunk_tv.tv_usec
-	);
+	para_printf(b, "chunk_offsets: ");
 	buf = chunk_table_obj.data;
 	for (
 		i = 0;
@@ -912,7 +913,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		goto out;
 	write_image_items(b, afsi);
 	write_lyrics_items(b, afsi);
-	hash_to_asc(d->hash, asc_hash);
+	hash2_to_asc(d->hash, asc_hash);
 	WRITE_STATUS_ITEM(b, SI_hash, "%s\n", asc_hash);
 	WRITE_STATUS_ITEM(b, SI_bitrate, "%dkbit/s\n", afhi->bitrate);
 	WRITE_STATUS_ITEM(b, SI_format, "%s\n",
@@ -1066,8 +1067,8 @@ again:
 	if (ret < 0)
 		return ret;
 	if (!d->hash)
-		d->hash = alloc(HASH_SIZE);
-	memcpy(d->hash, tmp_hash, HASH_SIZE);
+		d->hash = alloc(HASH2_SIZE);
+	memcpy(d->hash, tmp_hash, HASH2_SIZE);
 	free(d->path);
 	ret = get_audio_file_path_of_row(current_aft_row, &d->path);
 	if (ret < 0)
@@ -1101,7 +1102,7 @@ again:
 	if (ret < 0)
 		goto out;
 	hash2_function(map.data, map.size, file_hash);
-	ret = hash_compare(file_hash, d->hash);
+	ret = hash2_compare(file_hash, d->hash);
 	para_munmap(map.data, map.size);
 	if (ret) {
 		ret = -E_HASH_MISMATCH;
@@ -1224,7 +1225,7 @@ static int sort_matching_paths(struct ls_options *options)
 	int (*compar)(const void *, const void *);
 	int i;
 
-	options->data_ptr = alloc(nmemb * sizeof(*options->data_ptr));
+	options->data_ptr = arr_alloc(nmemb, sizeof(*options->data_ptr));
 	for (i = 0; i < nmemb; i++)
 		options->data_ptr[i] = options->data + i;
 
@@ -1375,7 +1376,7 @@ static int com_ls_callback(struct afs_callback_arg *aca)
 
 	aca->pbout.flags = (opts->mode == LS_MODE_PARSER)? PBF_SIZE_PREFIX : 0;
 	if (admissible_only(opts))
-		ret = admissible_file_loop(opts, prepare_ls_row);
+		ret = score_loop(prepare_ls_row, opts);
 	else
 		ret = osl(osl_rbtree_loop(audio_file_table, AFTCOL_PATH, opts,
 			prepare_ls_row));
@@ -1443,7 +1444,7 @@ static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 		else if (!strcmp(val, "m") || !strcmp(val, "mbox"))
 			opts->mode = LS_MODE_MBOX;
 		else if (!strcmp(val, "c") || !strcmp(val, "chunk-table"))
-			opts->mode = LS_MODE_MBOX;
+			opts->mode = LS_MODE_CHUNKS;
 		else if (!strcmp(val, "p") || !strcmp(val, "parser-friendly"))
 			opts->mode = LS_MODE_PARSER;
 		else {
@@ -1637,7 +1638,8 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	char asc[2 * HASH2_SIZE + 1];
 	int ret;
 	char afsi_buf[AFSI_SIZE];
-	char *slpr = buf + read_u32(buf + CAB_LPR_OFFSET);
+	uint32_t slpr_offset = read_u32(buf + CAB_LPR_OFFSET);
+	char *slpr = buf + slpr_offset;
 	struct afs_info default_afsi = {.last_played = 0};
 	uint16_t afhi_offset, chunks_offset;
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(ADD);
@@ -1649,7 +1651,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	r_v = SERVER_CMD_OPT_RESULT(ADD, VERBOSE, aca->lpr);
 
 	hash = (unsigned char *)buf + CAB_HASH_OFFSET;
-	hash_to_asc(hash, asc);
+	hash2_to_asc(hash, asc);
 	objs[AFTCOL_HASH].data = buf + CAB_HASH_OFFSET;
 	objs[AFTCOL_HASH].size = HASH2_SIZE;
 
@@ -1705,6 +1707,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	/* no hs or force mode, child must have sent afhi */
 	afhi_offset = read_u32(buf + CAB_AFHI_OFFSET_POS);
 	chunks_offset = read_u32(buf + CAB_CHUNKS_OFFSET_POS);
+	assert(chunks_offset <= slpr_offset);
 
 	objs[AFTCOL_AFHI].data = buf + afhi_offset;
 	objs[AFTCOL_AFHI].size = chunks_offset - afhi_offset;
@@ -1712,14 +1715,14 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	if (!objs[AFTCOL_AFHI].size) /* "impossible" */
 		goto out;
 	objs[AFTCOL_CHUNKS].data = buf + chunks_offset;
-	objs[AFTCOL_CHUNKS].size = aca->query.size - chunks_offset;
+	objs[AFTCOL_CHUNKS].size = slpr_offset - chunks_offset;
 	if (pb && !hs) { /* update pb's hash */
 		char old_asc[2 * HASH2_SIZE + 1];
 		unsigned char *old_hash;
 		ret = get_hash_of_row(pb, &old_hash);
 		if (ret < 0)
 			goto out;
-		hash_to_asc(old_hash, old_asc);
+		hash2_to_asc(old_hash, old_asc);
 		if (lls_opt_given(r_v))
 			para_printf(&aca->pbout, "file change: %s -> %s\n",
 				old_asc, asc);
@@ -1761,7 +1764,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 	ret = afs_event(AUDIO_FILE_ADD, &aca->pbout, aft_row);
 out:
 	if (ret < 0)
-		para_printf(&aca->pbout, "could not add %s\n", path);
+		afs_error(aca, "could not add %s\n", path);
 	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
 }
@@ -1979,12 +1982,12 @@ static int touch_audio_file(__a_unused struct osl_table *table,
 
 	ret = get_afsi_object_of_row(row, &obj);
 	if (ret < 0) {
-		para_printf(&aca->pbout, "cannot touch %s\n", name);
+		afs_error(aca, "cannot touch %s\n", name);
 		return ret;
 	}
 	ret = load_afsi(&old_afsi, &obj);
 	if (ret < 0) {
-		para_printf(&aca->pbout, "cannot touch %s\n", name);
+		afs_error(aca, "cannot touch %s\n", name);
 		return ret;
 	}
 	new_afsi = old_afsi;
@@ -2038,7 +2041,7 @@ static int com_touch_callback(struct afs_callback_arg *aca)
 		uint32_t id = lls_uint32_val(0, r_i);
 		ret = img_get_name_by_id(id, NULL);
 		if (ret < 0) {
-			para_printf(&aca->pbout, "invalid image ID: %u\n", id);
+			afs_error(aca, "invalid image ID: %u\n", id);
 			return ret;
 		}
 	}
@@ -2047,7 +2050,7 @@ static int com_touch_callback(struct afs_callback_arg *aca)
 		uint32_t id = lls_uint32_val(0, r_y);
 		ret = lyr_get_name_by_id(id, NULL);
 		if (ret < 0) {
-			para_printf(&aca->pbout, "invalid lyrics ID: %u\n", id);
+			afs_error(aca, "invalid lyrics ID: %u\n", id);
 			return ret;
 		}
 	}
@@ -2090,7 +2093,7 @@ static int remove_audio_file(__a_unused struct osl_table *table,
 		return ret;
 	ret = osl(osl_del_row(audio_file_table, row));
 	if (ret < 0)
-		para_printf(&aca->pbout, "cannot remove %s\n", name);
+		afs_error(aca, "cannot remove %s\n", name);
 	return ret;
 }
 
@@ -2326,7 +2329,7 @@ static int com_setatt_callback(struct afs_callback_arg *aca)
 		ret = get_attribute_bitnum_by_name(p, &bitnum);
 		free(p);
 		if (ret < 0) {
-			para_printf(&aca->pbout, "invalid argument: %s\n", arg);
+			afs_error(aca, "invalid argument: %s\n", arg);
 			goto out;
 		}
 		if (c == '+')
@@ -2648,15 +2651,10 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 	}
 }
 
-/**
- * Initialize the audio file table.
- *
- * \param t Pointer to the structure to be initialized.
- */
-void aft_init(struct afs_table *t)
-{
-	t->open = aft_open;
-	t->close = aft_close;
-	t->create = aft_create;
-	t->event_handler = aft_event_handler;
-}
+/** The audio file table contains information about known audio files. */
+const struct afs_table_operations aft_ops = {
+	.open = aft_open,
+	.close = aft_close,
+	.create = aft_create,
+	.event_handler = aft_event_handler,
+};