From 4ef71951aaf3621308977c1de7b8506b00331294 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Thu, 1 Nov 2007 21:02:21 +0100 Subject: [PATCH] kill afd->score. This is also contained in afd->afs_status_info. --- afs.c | 5 +++-- afs.h | 4 ++-- aft.c | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/afs.c b/afs.c index 20f2455e..35540087 100644 --- 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 212ddfec..46f3b2fb 100644 --- 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 e41073ac..d2c7ced4 100644 --- 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}; -- 2.39.5