projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[paraslash.git]
/
mm.c
diff --git
a/mm.c
b/mm.c
index 4f76d40f306f1de0706617c04e27dd3281e7ff40..ead20681f781427f1c1d27aec015bc64f79ff9e0 100644
(file)
--- a/
mm.c
+++ b/
mm.c
@@
-32,7
+32,7
@@
enum mood_comparator_id {MOOD_COMPARATORS NUM_MOOD_COMPARATORS};
#undef MC
#define MC(a, b) # b,
enum mood_comparator_id {MOOD_COMPARATORS NUM_MOOD_COMPARATORS};
#undef MC
#define MC(a, b) # b,
-const char const *mood_comparators[] = {MOOD_COMPARATORS};
+
static
const char const *mood_comparators[] = {MOOD_COMPARATORS};
#undef MC
static int parse_mood_comparator(const char *word)
#undef MC
static int parse_mood_comparator(const char *word)
@@
-187,6
+187,14
@@
static int mm_channels_score_function(__a_unused const char *path,
return mm_compare_num_score_function(afhi->channels, private);
}
return mm_compare_num_score_function(afhi->channels, private);
}
+static int mm_num_played_score_function(__a_unused const char *path,
+ const struct afs_info *afsi,
+ __a_unused const struct afh_info *afhi,
+ const void *private)
+{
+ return mm_compare_num_score_function(afsi->num_played, private);
+}
+
struct mm_year_data {
/** Comparator and year given at the mood line. */
struct mm_compare_num_data *cnd;
struct mm_year_data {
/** Comparator and year given at the mood line. */
struct mm_compare_num_data *cnd;
@@
-343,5
+351,6
@@
const struct mood_method mood_methods[] = {
{DEFINE_COMPARE_NUM_MOOD_METHOD(bitrate)},
{DEFINE_COMPARE_NUM_MOOD_METHOD(frequency)},
{DEFINE_COMPARE_NUM_MOOD_METHOD(channels)},
{DEFINE_COMPARE_NUM_MOOD_METHOD(bitrate)},
{DEFINE_COMPARE_NUM_MOOD_METHOD(frequency)},
{DEFINE_COMPARE_NUM_MOOD_METHOD(channels)},
+ {DEFINE_COMPARE_NUM_MOOD_METHOD(num_played)},
{.parser = NULL}
};
{.parser = NULL}
};