/*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
* \sa struct mood_method, mood_parser.
*/
typedef int mood_score_function(const char *path, const struct afs_info *afsi,
- const struct audio_format_info *afhi, const void *data);
+ const struct afh_info *afhi, const void *data);
/**
* Pre-process a mood line.
static int mm_no_attributes_set_score_function(__a_unused const char *path,
const struct afs_info *afsi,
- __a_unused const struct audio_format_info *afhi,
+ __a_unused const struct afh_info *afhi,
__a_unused const void *data)
{
if (!afsi->attributes)
static int mm_played_rarely_score_function(__a_unused const char *path,
const struct afs_info *afsi,
- __a_unused const struct audio_format_info *afhi,
+ __a_unused const struct afh_info *afhi,
__a_unused const void *data)
{
unsigned num;
return 1;
}
-static int mm_name_like_score_function(const char *path,
+static int mm_path_matches_score_function(const char *path,
__a_unused const struct afs_info *afsi,
- __a_unused const struct audio_format_info *afhi,
+ __a_unused const struct afh_info *afhi,
const void *data)
{
if (fnmatch(data, path, 0))
return 100;
}
-static int mm_name_like_parser(const char *arg, void **data)
+static int mm_path_matches_parser(const char *arg, void **data)
{
*data = para_strdup(arg);
return 1;
}
-static void mm_name_like_cleanup(void *data)
+static void mm_path_matches_cleanup(void *data)
{
free(data);
}
static int mm_is_set_score_function(__a_unused const char *path,
__a_unused const struct afs_info *afsi,
- __a_unused const struct audio_format_info *afhi,
+ __a_unused const struct afh_info *afhi,
const void *data)
{
const unsigned char *bn = data;
long *score_arg_sum)
{
struct afs_info afsi;
- struct audio_format_info afhi;
+ struct afh_info afhi;
char *path;
int ret;
{DEFINE_MOOD_METHOD(no_attributes_set)},
{DEFINE_MOOD_METHOD(played_rarely)},
{DEFINE_MOOD_METHOD(is_set)},
- {DEFINE_MOOD_METHOD_WITH_CLEANUP(name_like)},
+ {DEFINE_MOOD_METHOD_WITH_CLEANUP(path_matches)},
{.parser = NULL}
};
ML_SCORE
};
+/** Data passed to the parser of a mood line. */
struct mood_line_parser_data {
+ /** The mood this mood line belongs to. */
struct mood *m;
+ /** The line number in the mood definition. */
unsigned line_num;
};
w++;
if (!*w)
goto out;
- if (!strcmp(*w, "with")) {
- w++;
- if (!*w)
- goto out;
- }
+ if (strcmp(*w, "with"))
+ goto check_for_if;
+ w++;
+ if (!*w)
+ goto out;
+ if (strcmp(*w, "score"))
+ goto out;
}
if (mlt == ML_SCORE || !strcmp(*w, "score")) {
ret = -E_MOOD_SYNTAX;
w++;
if (!*w)
goto out;
+check_for_if:
if (!strcmp(*w, "if")) {
ret = -E_MOOD_SYNTAX;
w++;
osl_close_disk_object(&mood_def);
if (ret < 0) {
PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name,
- PARA_STRERROR(-ret));
+ para_strerror(-ret));
destroy_mood(mlpd.m);
return ret;
}
parse_mood_line, &mlpd);
if (ret < 0)
para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
- PARA_STRERROR(-ret));
+ para_strerror(-ret));
out:
osl_close_disk_object(&mood_def);
return 1;
int ret;
char *mood_name = NULL;
- PARA_NOTICE_LOG("reloading current mood\n");
if (!current_mood)
return 1;
+ PARA_NOTICE_LOG("reloading %s\n", current_mood->name?
+ current_mood->name : "(dummy)");
if (current_mood->name)
mood_name = para_strdup(current_mood->name);
close_current_mood();
default:
return 1;
}
- return 1;
}