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

diff --git a/aft.c b/aft.c
index 49cdf050..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)
@@ -1920,11 +1929,13 @@ struct com_touch_options {
 	int32_t num_played;
 	/** New last played count. */
 	int64_t last_played;
-	/** new lyrics id. */
+	/** New lyrics id. */
 	int32_t lyrics_id;
-	/** new image id. */
+	/** New image id. */
 	int32_t image_id;
-	/** command line flags (see \ref touch_flags). */
+	/** New amplification value. */
+	int32_t amp;
+	/** Command line flags (see \ref touch_flags). */
 	unsigned flags;
 };
 
@@ -1945,7 +1956,7 @@ static int touch_audio_file(__a_unused struct osl_table *table,
 	struct osl_object obj;
 	struct afs_info old_afsi, new_afsi;
 	int ret, no_options = tad->cto->num_played < 0 && tad->cto->last_played < 0 &&
-		tad->cto->lyrics_id < 0 && tad->cto->image_id < 0;
+		tad->cto->lyrics_id < 0 && tad->cto->image_id < 0 && tad->cto->amp < 0;
 	struct afsi_change_event_data aced;
 
 	ret = get_afsi_object_of_row(row, &obj);
@@ -1979,6 +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;
+		if (tad->cto->amp >= 0)
+			new_afsi.amp = tad->cto->amp;
 	}
 	tad->num_matches++;
 	save_afsi(&new_afsi, &obj); /* in-place update */
@@ -2026,7 +2039,8 @@ int com_touch(int fd, int argc, char * const * const argv)
 		.num_played = -1,
 		.last_played = -1,
 		.lyrics_id = -1,
-		.image_id = -1
+		.image_id = -1,
+		.amp = -1,
 	};
 	struct osl_object query = {.data = &cto, .size = sizeof(cto)};
 	int i, ret;
@@ -2064,6 +2078,16 @@ int com_touch(int fd, int argc, char * const * const argv)
 				return ret;
 			continue;
 		}
+		if (!strncmp(arg, "-a", 2)) {
+			int32_t val;
+			ret = para_atoi32(arg + 2, &val);
+			if (ret < 0)
+				return ret;
+			if (val < 0 || val > 255)
+				return -ERRNO_TO_PARA_ERROR(EINVAL);
+			cto.amp = val;
+			continue;
+		}
 		if (!strcmp(arg, "-p")) {
 			cto.flags |= TOUCH_FLAG_FNM_PATHNAME;
 			continue;