X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=909da6aac53138db7e133e5eaa909445cbf3a455;hb=d9f939fe8a68267a62b68546b17e1ec9a34aab0b;hp=5c1605207f67cb114b7e7d6d4add234824bc3af5;hpb=1f31b52b6816ce2716a3755a1896f77744fa167b;p=paraslash.git

diff --git a/aft.c b/aft.c
index 5c160520..909da6aa 100644
--- a/aft.c
+++ b/aft.c
@@ -323,12 +323,18 @@ enum afhi_offsets {
 	AFHI_BITRATE_OFFSET = 4,
 	/** Position of the frequency. */
 	AFHI_FREQUENCY_OFFSET = 8,
+	/** Location of the audio file header. */
+	AFHI_HEADER_OFFSET_OFFSET = 12,
+	/* Length of the audio file header. Zero means: No header. */
+	AFHI_HEADER_LEN_OFFSET = 16,
 	/** Number of channels is stored here. */
-	AFHI_CHANNELS_OFFSET = 12,
+	AFHI_CHANNELS_OFFSET = 20,
+	/** EOF timeout in ms. */
+	AFHI_EOF_OFFSET = 21,
 	/** The tag info position. */
-	AFHI_INFO_STRING_OFFSET = 13,
+	AFHI_INFO_STRING_OFFSET = 23,
 	/** Minimal on-disk size of a valid afhi struct. */
-	MIN_AFHI_SIZE = 14
+	MIN_AFHI_SIZE = 24
 };
 
 static unsigned sizeof_afhi_buf(const struct afh_info *afhi)
@@ -346,7 +352,10 @@ static void save_afhi(struct afh_info *afhi, char *buf)
 		afhi->seconds_total);
 	write_u32(buf + AFHI_BITRATE_OFFSET, afhi->bitrate);
 	write_u32(buf + AFHI_FREQUENCY_OFFSET, afhi->frequency);
+	write_u32(buf + AFHI_HEADER_OFFSET_OFFSET, afhi->header_offset);
+	write_u32(buf + AFHI_HEADER_LEN_OFFSET, afhi->header_len);
 	write_u8(buf + AFHI_CHANNELS_OFFSET, afhi->channels);
+	write_u16(buf + AFHI_EOF_OFFSET, tv2ms(&afhi->eof_tv));
 	strcpy(buf + AFHI_INFO_STRING_OFFSET, afhi->info_string); /* OK */
 	PARA_DEBUG_LOG("last byte written: %p\n", buf + AFHI_INFO_STRING_OFFSET + strlen(afhi->info_string));
 }
@@ -357,6 +366,9 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->bitrate = read_u32(buf + AFHI_BITRATE_OFFSET);
 	afhi->frequency = read_u32(buf + AFHI_FREQUENCY_OFFSET);
 	afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
+	afhi->header_offset = read_u32(buf + AFHI_HEADER_OFFSET_OFFSET);
+	afhi->header_len = read_u32(buf + AFHI_HEADER_LEN_OFFSET);
+	ms2tv(read_u16(buf + AFHI_EOF_OFFSET), &afhi->eof_tv);
 	strcpy(afhi->info_string, buf + AFHI_INFO_STRING_OFFSET);
 }
 
@@ -719,8 +731,9 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 	ret = get_attribute_text(&afd->afsi.attributes, " ", &tmp);
 	if (ret < 0)
 		goto err;
-	tmp[sizeof(afd->attributes_string) - 1] = '\0';
-	strcpy(afd->attributes_string, tmp); /* OK */
+	assert(tmp);
+	strncpy(afd->attributes_string, tmp, sizeof(afd->attributes_string));
+	afd->attributes_string[sizeof(afd->attributes_string) - 1] = '\0';
 	free(tmp);
 
 	aced.aft_row = aft_row;
@@ -930,7 +943,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			"Received: from\nTo: bar\nFrom: a\n"
 			"Subject: %s\n\n" /* path */
 			"%s%s%s" /* score */
-			"%s"
+			"%s\n" /* attributes */
 			"hash: %s\n"
 			"image_id: %s\n"
 			"lyrics_id: %s\n"
@@ -1221,12 +1234,8 @@ out:
 }
 
 /*
- * TODO: flags -h (sort by hash) -lm (list in mbox format)
- *
- * long list: list hash, attributes as (xx--x-x-), file size, lastplayed
- * full list: list everything, including afsi, afhi, atts as clear text
- *
- * */
+ * TODO: flags -h (sort by hash)
+ */
 int com_ls(int fd, int argc, char * const * const argv)
 {
 	int i, ret;
@@ -1693,7 +1702,7 @@ static int add_one_audio_file(const char *path, const void *private_data)
 	save_audio_file_info(hash, path, afhi_ptr, pad->flags, format_num, &obj);
 	/* Ask afs to consider this entry for adding. */
 	ret = send_callback_request(com_add_callback, &obj, &result);
-	if (ret >= 0 && result.data && result.size) {
+	if (ret > 0) {
 		ret2 = send_va_buffer(pad->fd, "%s", (char *)result.data);
 		free(result.data);
 		if (ret >= 0 && ret2 < 0)
@@ -1793,16 +1802,25 @@ enum touch_flags {
 	TOUCH_FLAG_VERBOSE = 2
 };
 
+/** Options used by com_touch(). */
 struct com_touch_options {
+	/** New num_played value. */
 	int32_t num_played;
+	/** New last played count. */
 	int64_t last_played;
+	/** new lyrics id. */
 	int32_t lyrics_id;
+	/** new image id. */
 	int32_t image_id;
+	/** command line flags (see \ref touch_flags). */
 	unsigned flags;
 };
 
+/** Data passed to the action handler of com_touch(). */
 struct touch_action_data {
+	/** Command line options (see \ref com_touch_options). */
 	struct com_touch_options *cto;
+	/** Message buffer. */
 	struct para_buffer pb;
 };
 
@@ -1947,22 +1965,30 @@ int com_touch(int fd, int argc, char * const * const argv)
 	return ret;
 }
 
+/** Flags for com_rm(). */
 enum rm_flags {
+	/** -v */
 	RM_FLAG_VERBOSE = 1,
+	/** -f */
 	RM_FLAG_FORCE = 2,
+	/** -p */
 	RM_FLAG_FNM_PATHNAME = 4
 };
 
-struct com_rm_data {
+/** Data passed to the action handler of com_rm(). */
+struct com_rm_action_data {
+	/** Command line flags ((see \ref rm_flags). */
 	uint32_t flags;
+	/** Message buffer. */
 	struct para_buffer pb;
+	/** Number of audio files removed. */
 	unsigned num_removed;
 };
 
 static int remove_audio_file(__a_unused struct osl_table *table,
 		struct osl_row *row, const char *name, void *data)
 {
-	struct com_rm_data *crd = data;
+	struct com_rm_action_data *crd = data;
 	int ret;
 
 	if (crd->flags & RM_FLAG_VERBOSE)
@@ -1979,7 +2005,7 @@ static int remove_audio_file(__a_unused struct osl_table *table,
 static int com_rm_callback(const struct osl_object *query,
 		__a_unused struct osl_object *result)
 {
-	struct com_rm_data crd = {.flags = *(uint32_t *)query->data};
+	struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data};
 	int ret;
 	struct pattern_match_data pmd = {
 		.table = audio_file_table,
@@ -2071,10 +2097,15 @@ enum cpsi_flags {
 	CPSI_FLAG_VERBOSE = 32,
 };
 
+/** Data passed to the action handler of com_cpsi(). */
 struct cpsi_action_data {
+	/** command line flags (see \ref cpsi_flags). */
 	unsigned flags;
+	/** Number of audio files changed. */
 	unsigned num_copied;
+	/** Message buffer. */
 	struct para_buffer pb;
+	/** Values are copied from here. */
 	struct afs_info source_afsi;
 };