X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=9fca561cdd5919e011e07673a54e8a4f00f21003;hp=d2c7ced438e6ae8cfa653b215f18a590e7b7e780;hb=81b9f55a3b231cef27073d02098178895386077d;hpb=4ef71951aaf3621308977c1de7b8506b00331294

diff --git a/aft.c b/aft.c
index d2c7ced4..9fca561c 100644
--- a/aft.c
+++ b/aft.c
@@ -351,9 +351,9 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
 	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);
+	afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
 	ms2tv(read_u16(buf + AFHI_EOF_OFFSET), &afhi->eof_tv);
 	strcpy(afhi->info_string, buf + AFHI_INFO_STRING_OFFSET);
 }
@@ -663,14 +663,14 @@ int load_afd(int shmid, struct audio_file_data *afd)
  * and the lastplayed time is set to the current time. Finally, the score of
  * the audio file is updated.
  *
- * \return Positive on success, negative on errors.
+ * \return Positive shmid on success, negative on errors.
  */
 int open_and_update_audio_file(struct osl_row *aft_row,
 	struct audio_file_data *afd, long score)
 {
 	HASH_TYPE *aft_hash, file_hash[HASH_SIZE];
 	struct osl_object afsi_obj;
-	struct afs_info new_afsi;
+	struct afs_info old_afsi, new_afsi;
 	int ret = get_hash_of_row(aft_row, &aft_hash);
 	struct afsi_change_event_data aced;
 	struct osl_object map, chunk_table_obj;
@@ -684,7 +684,7 @@ int open_and_update_audio_file(struct osl_row *aft_row,
 	ret = get_afsi_object_of_row(aft_row, &afsi_obj);
 	if (ret < 0)
 		return ret;
-	ret = load_afsi(&afd->afsi, &afsi_obj);
+	ret = load_afsi(&old_afsi, &afsi_obj);
 	if (ret < 0)
 		return ret;
 	ret = get_afhi_of_row(aft_row, &afd->afhi);
@@ -705,7 +705,7 @@ int open_and_update_audio_file(struct osl_row *aft_row,
 		ret = -E_HASH_MISMATCH;
 		goto err;
 	}
-	new_afsi = afd->afsi;
+	new_afsi = old_afsi;
 	new_afsi.num_played++;
 	new_afsi.last_played = time(NULL);
 	save_afsi(&new_afsi, &afsi_obj); /* in-place update */
@@ -716,7 +716,7 @@ int open_and_update_audio_file(struct osl_row *aft_row,
 	{
 		struct ls_data d = {
 			.afhi = afd->afhi,
-			.afsi = afd->afsi,
+			.afsi = old_afsi,
 			.path = path,
 			.score = score,
 			.hash = file_hash
@@ -725,17 +725,17 @@ int open_and_update_audio_file(struct osl_row *aft_row,
 		ret = make_status_items(&d, &pb);
 		if (ret < 0)
 			goto err;
-		strncpy(afd->afs_status_info, pb.buf, AFS_STATUS_INFO_SIZE);
-		afd->afs_status_info[AFS_STATUS_INFO_SIZE - 1] = '\0';
+		strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
+		afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0';
 		free(pb.buf);
 	}
 	aced.aft_row = aft_row;
-	aced.old_afsi = &afd->afsi;
+	aced.old_afsi = &old_afsi;
 	afs_event(AFSI_CHANGE, NULL, &aced);
 	ret = save_afd(afd);
+	free(afd->afhi.chunk_table);
 	if (ret < 0)
 		goto err;
-	free(afd->afhi.chunk_table);
 err:
 	osl_close_disk_object(&chunk_table_obj);
 	return ret;
@@ -810,8 +810,9 @@ static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
 	get_attribute_text(&afsi->attributes, " ", &att_text);
 	if (!att_text)
 		return para_strdup(att_bitmap);
-	att_lines = make_message("attributes: %s\nattributes_txt: %s",
-		att_bitmap, att_text);
+	att_lines = make_message("%s: %s\n%s: %s",
+		status_item_list[SI_ATTRIBUTES_BITMAP], att_bitmap,
+		status_item_list[SI_ATTRIBUTES_TXT], att_text);
 	free(att_text);
 	return att_lines;
 }
@@ -924,15 +925,15 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			"hash: %s\n"
 			"%s" /* image id, image name */
 			"%s" /* lyrics */
-			"bitrate: %dkbit/s\n"
+			"%s: %dkbit/s\n" /* bitrate */
 			"format: %s\n"
-			"frequency: %dHz\n"
+			"%s: %dHz\n" /* frequency */
 			"channels: %d\n"
 			"duration: %s\n"
 			"seconds_total: %lu\n"
 			"num_played: %d\n"
 			"last_played: %s\n"
-			"tag info: %s\n",
+			"%s\n", /* tag info */
 			filename_lines,
 			have_score? "score: " : "", score_buf,
 				have_score? "\n" : "",
@@ -940,9 +941,9 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			asc_hash,
 			image_lines,
 			lyrics_lines,
-			afhi->bitrate,
+			status_item_list[SI_BITRATE], afhi->bitrate,
 			audio_format_name(afsi->audio_format_id),
-			afhi->frequency,
+			status_item_list[SI_FREQUENCY], afhi->frequency,
 			afhi->channels,
 			duration_buf,
 			afhi->seconds_total,
@@ -968,7 +969,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			"channels: %d\n"
 			"duration: %s\n"
 			"num_played: %d\n"
-			"tag info: %s\n"
+			"%s\n" /* tag info */
 			"%s%s\n",
 			last_played_time,
 			d->path,
@@ -1609,6 +1610,7 @@ static int com_add_callback(const struct osl_object *query,
 	objs[AFTCOL_AFSI].size = AFSI_SIZE;
 	save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);
 	ret = osl_add_and_get_row(audio_file_table, objs, &aft_row);
+	afs_event(AUDIO_FILE_ADD, &msg, aft_row);
 out:
 	if (ret < 0)
 		para_printf(&msg, "%s\n", PARA_STRERROR(-ret));
@@ -1616,7 +1618,6 @@ out:
 		return 0;
 	result->data = msg.buf;
 	result->size = msg.size;
-	afs_event(AUDIO_FILE_ADD, &msg, aft_row);
 	return 1;
 }