X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=2d40c235df8cf51fab7c2134e6bce1499769c9bf;hp=e29c15a0d48afe17fa39f6c349f9fa1e8f7e7216;hb=5cf4c974286ded864ccfad07ee0f4c44fced1163;hpb=cb1265c87fdb0e817923bf09c47162a7f894aafc

diff --git a/aft.c b/aft.c
index e29c15a0..2d40c235 100644
--- a/aft.c
+++ b/aft.c
@@ -1031,6 +1031,10 @@ void make_empty_status_items(char *buf)
 		"%s: \n" /* seconds total */
 		"%s: \n" /* num played */
 		"%s: \n" /* last played */
+		"%s: \n" /* audio file info */
+		"%s: \n" /* taginfo1 */
+		"%s: \n" /* taginfo2 */
+		"%s: \n" /* amplification */
 		,
 		status_item_list[SI_PATH],
 		status_item_list[SI_DIRECTORY],
@@ -1050,7 +1054,11 @@ void make_empty_status_items(char *buf)
 		status_item_list[SI_DURATION],
 		status_item_list[SI_SECONDS_TOTAL],
 		status_item_list[SI_NUM_PLAYED],
-		status_item_list[SI_LAST_PLAYED]
+		status_item_list[SI_LAST_PLAYED],
+		status_item_list[SI_AUDIO_FILE_INFO],
+		status_item_list[SI_TAGINFO1],
+		status_item_list[SI_TAGINFO2],
+		status_item_list[SI_AMPLIFICATION]
 	);
 }
 
@@ -1808,6 +1816,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 		afhi_ptr = &afhi;
 	}
 	munmap(map.data, map.size);
+	close(fd);
 	if (pad->flags & ADD_FLAG_VERBOSE) {
 		send_ret = send_va_buffer(pad->fd, "adding %s\n", path);
 		if (send_ret < 0)
@@ -1981,7 +1990,8 @@ static int touch_audio_file(__a_unused struct osl_table *table,
 			new_afsi.num_played = tad->cto->num_played;
 		if (tad->cto->last_played >= 0)
 			new_afsi.last_played = tad->cto->last_played;
-		new_afsi.amp = tad->cto->amp;
+		if (tad->cto->amp >= 0)
+			new_afsi.amp = tad->cto->amp;
 	}
 	tad->num_matches++;
 	save_afsi(&new_afsi, &obj); /* in-place update */