From: Andre Noll Date: Tue, 25 Sep 2007 09:39:23 +0000 (+0200) Subject: More mood cleanups. X-Git-Tag: v0.3.0~353 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=dabdb25fd7fe411933d3639f71a8148b5dc29630 More mood cleanups. - Avoid use of global current_mood pointer where possible. - Change name of non-static functions that use the current mood pointer: mood_open() -> change_current_mood() mood_close() -> close_current_mood() mood_reload() -> reload_current_mood() --- diff --git a/afs.c b/afs.c index a2194f3e..d5da1e55 100644 --- a/afs.c +++ b/afs.c @@ -476,7 +476,7 @@ static enum play_mode init_admissible_files(void) given_playlist = "given_playlist"; if (given_mood) { - ret = mood_open(given_mood); + ret = change_current_mood(given_mood); if (ret >= 0) { if (given_playlist) PARA_WARNING_LOG("ignoring playlist %s\n", @@ -489,10 +489,10 @@ static enum play_mode init_admissible_files(void) if (ret >= 0) return PLAY_MODE_PLAYLIST; } - ret = mood_open(NULL); /* open first available mood */ + ret = change_current_mood(NULL); /* open first available mood */ if (ret >= 0) return PLAY_MODE_MOOD; - mood_open(""); /* open dummy mood, always successful */ + change_current_mood(""); /* open dummy mood, always successful */ return PLAY_MODE_MOOD; } @@ -533,7 +533,7 @@ static void close_afs_tables(enum osl_close_flags flags) PARA_NOTICE_LOG("closing afs_tables\n"); score_shutdown(flags); attribute_shutdown(flags); - mood_close(); + close_current_mood(); playlist_close(); moods_shutdown(flags); playlists_shutdown(flags); diff --git a/afs.h b/afs.h index d6d0a86e..623cd145 100644 --- a/afs.h +++ b/afs.h @@ -140,10 +140,10 @@ int audio_file_loop(void *private_data, osl_rbtree_loop_func *func); int aft_check_callback(const struct osl_object *query, struct osl_object *result); /* mood */ -int mood_open(char *mood_name); -void mood_close(void); +int change_current_mood(char *mood_name); +void close_current_mood(void); int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_afsi); -int mood_reload(void); +int reload_current_mood(void); int mood_delete_audio_file(const struct osl_row *aft_row); diff --git a/attribute.c b/attribute.c index 5ee0789d..2fccac61 100644 --- a/attribute.c +++ b/attribute.c @@ -320,7 +320,7 @@ static int com_addatt_callback(const struct osl_object *query, if (ret < 0) return ret; find_greatest_att_bitnum(); - return mood_reload(); /* FIXME: mood_reload() returns an error */ + return reload_current_mood(); /* FIXME: mood_reload() returns an error */ } int com_addatt(__a_unused int fd, int argc, char * const * const argv) @@ -355,7 +355,7 @@ static int com_rmatt_callback(const struct osl_object *query, find_greatest_att_bitnum(); if (!atts_removed) return 1; - return mood_reload(); /* FIXME: Fix mood_reload() */ + return reload_current_mood(); } int com_rmatt(__a_unused int fd, int argc, char * const * const argv) diff --git a/mood.c b/mood.c index 6b2dfa07..61332461 100644 --- a/mood.c +++ b/mood.c @@ -121,7 +121,7 @@ struct mood_item { * \sa mood_item, mood_open(). */ struct mood { - /** the name of this mood */ + /** The name of this mood. */ char *name; /** The list of mood items of type \p accept. */ struct list_head accept_list; @@ -475,42 +475,38 @@ out: return ret; } -static int load_mood(const struct osl_row *row) +static int load_mood(const struct osl_row *mood_row, struct mood **m) { int ret; - struct mood *new_mood, *old_mood = current_mood; struct osl_object objs[NUM_BLOB_COLUMNS]; - ret = osl_get_object(moods_table, row, BLOBCOL_NAME, &objs[BLOBCOL_NAME]); + ret = osl_get_object(moods_table, mood_row, BLOBCOL_NAME, &objs[BLOBCOL_NAME]); if (ret < 0) return ret; if (objs[BLOBCOL_NAME].size <= 1) return -E_DUMMY_ROW; - ret = osl_open_disk_object(moods_table, row, BLOBCOL_DEF, &objs[BLOBCOL_DEF]); + ret = osl_open_disk_object(moods_table, mood_row, BLOBCOL_DEF, &objs[BLOBCOL_DEF]); if (ret < 0) return ret; - new_mood = alloc_new_mood((char*)objs[BLOBCOL_NAME].data); - current_mood = new_mood; + *m = alloc_new_mood((char*)objs[BLOBCOL_NAME].data); ret = for_each_line_ro(objs[BLOBCOL_DEF].data, objs[BLOBCOL_DEF].size, - parse_mood_line, ¤t_mood); + parse_mood_line, *m); osl_close_disk_object(&objs[BLOBCOL_DEF]); if (ret < 0) { - PARA_ERROR_LOG("unable to load mood %s: %d\n", - (char *)objs[BLOBCOL_NAME].data, ret); - destroy_mood(new_mood); - current_mood = old_mood; + PARA_ERROR_LOG("unable to load mood %s: %s\n", (*m)->name, + PARA_STRERROR(-ret)); + destroy_mood(*m); return ret; } - destroy_mood(old_mood); - current_mood = new_mood; - PARA_INFO_LOG("loaded mood %s\n", current_mood->name); + PARA_INFO_LOG("loaded mood %s\n", (*m)->name); return 1; } /* returns -E_MOOD_LOADED on _success_ to terminate the loop */ -static int mood_loop(struct osl_row *row, __a_unused void *private_data) +static int mood_loop(struct osl_row *mood_row, void *data) { - int ret = load_mood(row); + struct mood **m = data; + int ret = load_mood(mood_row, m); if (ret < 0) { if (ret != -E_DUMMY_ROW) PARA_NOTICE_LOG("invalid mood (%d), trying next mood\n", ret); @@ -519,9 +515,9 @@ static int mood_loop(struct osl_row *row, __a_unused void *private_data) return -E_MOOD_LOADED; } -static int load_first_available_mood(void) +static int load_first_available_mood(struct mood **m) { - int ret = osl_rbtree_loop(moods_table, BLOBCOL_NAME, NULL, + int ret = osl_rbtree_loop(moods_table, BLOBCOL_NAME, m, mood_loop); if (ret == -E_MOOD_LOADED) /* success */ return 1; @@ -664,6 +660,8 @@ struct admissible_file_info /** The temporary array of admissible files. */ struct admissible_array { + /** Files are admissible wrt. this mood. */ + struct mood *m; /** The size of the array */ unsigned size; /** Pointer to the array of admissible files. */ @@ -678,14 +676,13 @@ struct admissible_array { * * \return Negative on errors, positive on success. */ -static int add_if_admissible(struct osl_row *aft_row, void *private_data) +static int add_if_admissible(struct osl_row *aft_row, void *data) { + struct admissible_array *aa = data; int ret; - struct admissible_array *aa = private_data; long score = 0; - score = 0; - ret = compute_mood_score(aft_row, current_mood, &score); + ret = compute_mood_score(aft_row, aa->m, &score); if (ret < 0) return (ret == -E_NOT_ADMISSIBLE)? 1 : ret; if (statistics.num >= aa->size) { @@ -800,7 +797,7 @@ int mood_delete_audio_file(const struct osl_row *aft_row) } /** - * Compute the new score of an audio file. + * Compute the new score of an audio file wrt. the current mood. * * \param aft_row Determines the audio file. * \param old_afsi The audio file selector info before updating. @@ -873,7 +870,7 @@ static void log_statistics(void) } /** - * Open the given mood. + * Change the current mood. * * \param mood_name The name of the mood to open. * @@ -882,13 +879,15 @@ static void log_statistics(void) * the dummy mood that accepts every audio file and uses a scoring method * based only on the \a last_played information. * + * If there is already an open mood, it will be closed first. + * * \return Positive on success, negative on errors. Loading the dummy mood * always succeeds. * * \sa struct admissible_file_info, struct admissible_array, struct * afs_info::last_played, mood_close(). */ -int mood_open(char *mood_name) +int change_current_mood(char *mood_name) { int i, ret; struct admissible_array aa = { @@ -897,10 +896,14 @@ int mood_open(char *mood_name) }; if (!mood_name) { - ret = load_first_available_mood(); + struct mood *m; + ret = load_first_available_mood(&m); if (ret < 0) return ret; + destroy_mood(current_mood); + current_mood = m; } else if (*mood_name) { + struct mood *m; struct osl_row *row; struct osl_object obj = { .data = mood_name, @@ -911,13 +914,16 @@ int mood_open(char *mood_name) PARA_NOTICE_LOG("no such mood: %s\n", mood_name); return ret; } - ret = load_mood(row); + ret = load_mood(row, &m); if (ret < 0) return ret; + destroy_mood(current_mood); + current_mood = m; } else { destroy_mood(current_mood); current_mood = alloc_new_mood("dummy"); } + aa.m = current_mood; PARA_NOTICE_LOG("loaded mood %s\n", current_mood->name); PARA_INFO_LOG("%s\n", "computing statistics of admissible files"); ret = audio_file_loop(&aa, add_if_admissible); @@ -944,7 +950,7 @@ out: * Free all resources of the current mood which were allocated during * mood_open(). */ -void mood_close(void) +void close_current_mood(void) { destroy_mood(current_mood); current_mood = NULL; @@ -964,7 +970,7 @@ void mood_close(void) * * \sa mood_open(), mood_close(). */ -int mood_reload(void) +int reload_current_mood(void) { int ret; char *mood_name; @@ -973,8 +979,8 @@ int mood_reload(void) return 1; score_shutdown(0); mood_name = para_strdup(current_mood->name); - mood_close(); - ret = mood_open(mood_name); + close_current_mood(); + ret = change_current_mood(mood_name); free(mood_name); return ret; }