#include <sys/stat.h>
#include <dirent.h>
+#include <time.h>
#include <pulse/xmalloc.h>
-#include <pulse/volume.h>
-#include <pulse/channelmap.h>
-#include <pulsecore/core-error.h>
#include <pulsecore/module.h>
#include <pulsecore/core-util.h>
#include <pulsecore/modargs.h>
PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Augment the property sets of streams with additional static information");
PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(TRUE);
+PA_MODULE_LOAD_ONCE(true);
#define STAT_INTERVAL 30
#define MAX_CACHE_SIZE 50
struct rule {
time_t timestamp;
- pa_bool_t good;
+ bool good;
time_t mtime;
char *process_name;
char *application_name;
pa_xfree(r);
}
-static int parse_properties(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- const char *rvalue,
- void *data,
- void *userdata) {
-
- struct rule *r = userdata;
+static int parse_properties(pa_config_parser_state *state) {
+ struct rule *r;
pa_proplist *n;
- if (!(n = pa_proplist_from_string(rvalue)))
+ pa_assert(state);
+
+ r = state->userdata;
+
+ if (!(n = pa_proplist_from_string(state->rvalue)))
return -1;
if (r->proplist) {
return 0;
}
-static int parse_categories(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- const char *rvalue,
- void *data,
- void *userdata) {
-
- struct rule *r = userdata;
- const char *state = NULL;
+static int parse_categories(pa_config_parser_state *state) {
+ struct rule *r;
+ const char *split_state = NULL;
char *c;
- while ((c = pa_split(rvalue, ";", &state))) {
+ pa_assert(state);
+
+ r = state->userdata;
+
+ while ((c = pa_split(state->rvalue, ";", &split_state))) {
if (pa_streq(c, "Game")) {
pa_xfree(r->role);
return 0;
}
-static int check_type(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- const char *rvalue,
- void *data,
- void *userdata) {
+static int check_type(pa_config_parser_state *state) {
+ pa_assert(state);
- return pa_streq(rvalue, "Application") ? 0 : -1;
+ return pa_streq(state->rvalue, "Application") ? 0 : -1;
}
-static int catch_all(
- const char *filename,
- unsigned line,
- const char *section,
- const char *lvalue,
- const char *rvalue,
- void *data,
- void *userdata) {
-
+static int catch_all(pa_config_parser_state *state) {
return 0;
}
{ NULL, catch_all, NULL, NULL },
{ NULL, NULL, NULL, NULL },
};
- pa_bool_t found = FALSE;
+ bool found = false;
pa_assert(r);
fn = pa_sprintf_malloc(DESKTOPFILEDIR PA_PATH_SEP "%s.desktop", r->process_name);
if (stat(fn, &st) == 0)
- found = TRUE;
+ found = true;
else {
+#ifdef DT_DIR
DIR *desktopfiles_dir;
struct dirent *dir;
-#ifdef DT_DIR
/* Let's try a more aggressive search, but only one level */
if ((desktopfiles_dir = opendir(DESKTOPFILEDIR))) {
while ((dir = readdir(desktopfiles_dir))) {
if (dir->d_type != DT_DIR
- || strcmp(dir->d_name, ".") == 0
- || strcmp(dir->d_name, "..") == 0)
+ || pa_streq(dir->d_name, ".")
+ || pa_streq(dir->d_name, ".."))
continue;
pa_xfree(fn);
- fn = pa_sprintf_malloc(DESKTOPFILEDIR
- PA_PATH_SEP "%s" PA_PATH_SEP "%s.desktop",
- dir->d_name, r->process_name);
+ fn = pa_sprintf_malloc(DESKTOPFILEDIR PA_PATH_SEP "%s" PA_PATH_SEP "%s.desktop", dir->d_name, r->process_name);
if (stat(fn, &st) == 0) {
- found = TRUE;
+ found = true;
break;
}
}
#endif
}
if (!found) {
- r->good = FALSE;
+ r->good = false;
pa_xfree(fn);
return;
}
} else
pa_log_debug("Found %s.", fn);
- r->good = TRUE;
+ r->good = true;
r->mtime = st.st_mtime;
pa_xfree(r->application_name);
pa_xfree(r->icon_name);
table[0].data = &r->application_name;
table[1].data = &r->icon_name;
- if (pa_config_parse(fn, NULL, table, r) < 0)
+ if (pa_config_parse(fn, NULL, table, NULL, r) < 0)
pa_log_warn("Failed to parse .desktop file %s.", fn);
pa_xfree(fn);
m->userdata = u = pa_xnew(struct userdata, 1);
- u->cache = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+ u->cache = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) rule_free);
u->client_new_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CLIENT_NEW], PA_HOOK_EARLY, (pa_hook_cb_t) client_new_cb, u);
u->client_proplist_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CLIENT_PROPLIST_CHANGED], PA_HOOK_EARLY, (pa_hook_cb_t) client_proplist_changed_cb, u);
if (ma)
pa_modargs_free(ma);
- return -1;
+ return -1;
}
void pa__done(pa_module *m) {
if (u->client_proplist_changed_slot)
pa_hook_slot_free(u->client_proplist_changed_slot);
- if (u->cache) {
- struct rule *r;
-
- while ((r = pa_hashmap_steal_first(u->cache)))
- rule_free(r);
-
- pa_hashmap_free(u->cache, NULL, NULL);
- }
+ if (u->cache)
+ pa_hashmap_free(u->cache);
pa_xfree(u);
}