Get rid of afd->afsi and rename afs_status_info to verbose_ls_output.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index d2c7ced438e6ae8cfa653b215f18a590e7b7e780..fae883b4a4cab98202407c6bf1b82ffe3143f7e5 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -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,12 +725,12 @@ 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);
        if (ret < 0)