kill afd->score.
authorAndre Noll <maan@systemlinux.org>
Thu, 1 Nov 2007 20:02:21 +0000 (21:02 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 1 Nov 2007 20:02:21 +0000 (21:02 +0100)
This is also contained in afd->afs_status_info.

afs.c
afs.h
aft.c

diff --git a/afs.c b/afs.c
index 20f2455..3554008 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -486,12 +486,13 @@ int open_next_audio_file(void)
        struct audio_file_data afd;
        int ret, shmid;
        char buf[8];
+       long score;
 
        PARA_NOTICE_LOG("getting next audio file\n");
-       ret = score_get_best(&aft_row, &afd.score);
+       ret = score_get_best(&aft_row, &score);
        if (ret < 0)
                return ret;
-       ret = open_and_update_audio_file(aft_row, &afd);
+       ret = open_and_update_audio_file(aft_row, &afd, score);
        if (ret < 0)
                return ret;
        shmid = ret;
diff --git a/afs.h b/afs.h
index 212ddfe..46f3b2f 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -115,7 +115,6 @@ struct audio_file_data {
        enum play_mode current_play_mode;
        char afs_status_info[AFS_STATUS_INFO_SIZE];
        int fd;
-       long score;
        struct afs_info afsi;
        struct afh_info afhi;
 };
@@ -195,7 +194,8 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text);
 /* aft */
 void aft_init(struct afs_table *t);
 int aft_get_row_of_path(const char *path, struct osl_row **row);
-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);
 int load_afd(int shmid, struct audio_file_data *afd);
 int load_afsi(struct afs_info *afsi, struct osl_object *obj);
 void save_afsi(struct afs_info *afsi, struct osl_object *obj);
diff --git a/aft.c b/aft.c
index e41073a..d2c7ced 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -665,7 +665,8 @@ int load_afd(int shmid, struct audio_file_data *afd)
  *
  * \return Positive 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;
@@ -717,7 +718,7 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
                        .afhi = afd->afhi,
                        .afsi = afd->afsi,
                        .path = path,
-                       .score = afd->score,
+                       .score = score,
                        .hash = file_hash
                };
                struct para_buffer pb = {.buf = NULL};