X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=fae883b4a4cab98202407c6bf1b82ffe3143f7e5;hp=e41073ac1d4053925d53ce7b07bfa672e5e5ddac;hb=99daab96f932309995188ee7f7618c036994eb46;hpb=51cab2aba416fc1d57336f4e72da6b76ec60174c

diff --git a/aft.c b/aft.c
index e41073ac..fae883b4 100644
--- a/aft.c
+++ b/aft.c
@@ -663,13 +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)
+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;
@@ -683,7 +684,7 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 	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);
@@ -704,7 +705,7 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 		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 */
@@ -715,21 +716,21 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 	{
 		struct ls_data d = {
 			.afhi = afd->afhi,
-			.afsi = afd->afsi,
+			.afsi = old_afsi,
 			.path = path,
-			.score = afd->score,
+			.score = score,
 			.hash = file_hash
 		};
 		struct para_buffer pb = {.buf = NULL};
 		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);
 	if (ret < 0)