X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=2f972972fbfe432a777e0fc7d3e9dd1238eacbaf;hb=bb1996d4ef04bf33e735f2ce49e9edeeb5a66e80;hp=4433730647f1e95452fdfbd1853b563abf5e43fe;hpb=767a4a54c967bc4b80bd14d02e89fe91acd848dd;p=paraslash.git

diff --git a/aft.c b/aft.c
index 44337306..2f972972 100644
--- a/aft.c
+++ b/aft.c
@@ -22,9 +22,30 @@
 #include "sideband.h"
 #include "command.h"
 
-static struct osl_table *audio_file_table;
+/* Data about one audio file. Needed for ls and stat output. */
+struct ls_data {
+	/* Usual audio format handler information. */
+	struct afh_info afhi;
+	/* Audio file selector information. */
+	struct afs_info afsi;
+	/* The full path of the audio file. */
+	char *path;
+	/* The score value (if -a was given). */
+	long score;
+	/* The hash value of the audio file data. */
+	unsigned char *hash;
+};
+
+/*
+ * The internal state of the audio file table is described by the following
+ * variables which are private to aft.c.
+ */
+static struct osl_table *audio_file_table; /* NULL if table not open */
+static struct osl_row *current_aft_row; /* NULL if no audio file open */
+
 static char *status_items;
 static char *parser_friendly_status_items;
+static struct ls_data status_item_ls_data;
 
 /** The different sorting methods of the ls command. */
 enum ls_sorting_method {
@@ -70,20 +91,6 @@ enum ls_listing_mode {
 	LS_MODE_PARSER,
 };
 
-/* Data about one audio file. Needed for ls and stat output. */
-struct ls_data {
-	/* Usual audio format handler information. */
-	struct afh_info afhi;
-	/* Audio file selector information. */
-	struct afs_info afsi;
-	/* The full path of the audio file. */
-	char *path;
-	/* The score value (if -a was given). */
-	long score;
-	/* The hash value of the audio file data. */
-	unsigned char *hash;
-};
-
 /**
  * The size of the individual output fields of the ls command.
  *
@@ -954,9 +961,6 @@ out:
 	return ret;
 }
 
-static struct ls_data status_item_ls_data;
-static struct osl_row *current_aft_row;
-
 static void make_inode_status_items(struct para_buffer *pb)
 {
 	struct stat statbuf = {.st_size = 0};
@@ -1590,7 +1594,7 @@ ACTION:	Table modifications to be done by the callback.
 +----+----+---+------+---------------------------------------------------+
 | N  |  N | Y |  Y   | (new file) create new entry (force has no effect)
 +----+----+---+------+---------------------------------------------------+
-|  N |  N | N |  Y   | (new file) create new entry
+| N  |  N | N |  Y   | (new file) create new entry
 +----+----+---+------+---------------------------------------------------+
 
 Notes:
@@ -2559,6 +2563,16 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 		status_item_ls_data.afsi.last_played = old_last_played;
 		make_status_items();
 		return 1;
+	} case AUDIO_FILE_RENAME: {
+		char *path;
+		if (data != current_aft_row)
+			return 0;
+		ret = get_audio_file_path_of_row(current_aft_row, &path);
+		if (ret < 0)
+			return ret;
+		status_item_ls_data.path = path;
+		make_status_items();
+		return 1;
 	} case AFHI_CHANGE: {
 		if (data != current_aft_row)
 			return 0;
@@ -2577,6 +2591,7 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 		 * every time.
 		 */
 		make_status_items();
+		return 0;
 	} default:
 		return 0;
 	}