* \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;
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);
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;
/** 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. */
*
* \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) {
}
/**
- * 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.
}
/**
- * Open the given mood.
+ * Change the current mood.
*
* \param mood_name The name of the mood to open.
*
* 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 = {
};
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,
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);
* 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;
*
* \sa mood_open(), mood_close().
*/
-int mood_reload(void)
+int reload_current_mood(void)
{
int ret;
char *mood_name;
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;
}
projects / paraslash.git / blobdiff