X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=0009a54f3c5b1f169381ff631f20b141da71f75b;hb=77e4a76adad60c83811baf1c69fd413a6153528f;hp=f690e81951b4c7911c2f726b36fee9a673badce7;hpb=81bc7110ff6a4c2d002618b94fcf5aa60cd4cad2;p=paraslash.git

diff --git a/aft.c b/aft.c
index f690e819..0009a54f 100644
--- a/aft.c
+++ b/aft.c
@@ -1375,7 +1375,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));
@@ -1761,7 +1761,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 +1979,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 +2038,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 +2047,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 +2090,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 +2326,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 +2648,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,
+};