More spelling fixes

[pulseaudio] / src / modules / module-match.c

diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 769a6b59ef32140a94332323ed98bd39af3e393a..c94ef7901f16352845eb215c888084867cec2a14 100644 (file)
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -5,7 +5,7 @@
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
 
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published

-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -27,10 +27,15 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>

-#include <regex.h>

 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

+#if defined(HAVE_REGEX_H)
+#include <regex.h>
+#elif defined(HAVE_PCREPOSIX_H)
+#include <pcreposix.h>
+#endif
+

 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core-error.h>
 #include <pulse/xmalloc.h>
 
 #include <pulsecore/core-error.h>


@@ -38,7 +43,6 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/modargs.h>
 #include <pulsecore/log.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/modargs.h>
 #include <pulsecore/log.h>

-#include <pulsecore/core-subscribe.h>

 #include <pulsecore/sink-input.h>
 #include <pulsecore/core-util.h>
 
 #include <pulsecore/sink-input.h>
 #include <pulsecore/core-util.h>
 


@@ -48,27 +52,35 @@ PA_MODULE_AUTHOR("Lennart Poettering");
 PA_MODULE_DESCRIPTION("Playback stream expression matching module");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(TRUE);
 PA_MODULE_DESCRIPTION("Playback stream expression matching module");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(TRUE);

-PA_MODULE_USAGE("table=<filename>");
+PA_MODULE_USAGE("table=<filename> "
+                "key=<property_key>");

 
 #define WHITESPACE "\n\r \t"
 
 #define DEFAULT_MATCH_TABLE_FILE PA_DEFAULT_CONFIG_DIR"/match.table"
 #define DEFAULT_MATCH_TABLE_FILE_USER "match.table"
 
 
 #define WHITESPACE "\n\r \t"
 
 #define DEFAULT_MATCH_TABLE_FILE PA_DEFAULT_CONFIG_DIR"/match.table"
 #define DEFAULT_MATCH_TABLE_FILE_USER "match.table"
 

+#define UPDATE_REPLACE "replace"
+#define UPDATE_MERGE "merge"
+

 static const char* const valid_modargs[] = {
     "table",
 static const char* const valid_modargs[] = {
     "table",

+    "key",

     NULL,
 };
 
 struct rule {
     regex_t regex;
     pa_volume_t volume;
     NULL,
 };
 
 struct rule {
     regex_t regex;
     pa_volume_t volume;

+    pa_proplist *proplist;
+    pa_update_mode_t mode;

     struct rule *next;
 };
 
 struct userdata {
     struct rule *rules;
     struct rule *next;
 };
 
 struct userdata {
     struct rule *rules;

-    pa_subscription *subscription;
+    char *property_key;
+    pa_hook_slot *sink_input_new_hook_slot;

 };
 
 static int load_rules(struct userdata *u, const char *filename) {
 };
 
 static int load_rules(struct userdata *u, const char *filename) {


@@ -81,12 +93,11 @@ static int load_rules(struct userdata *u, const char *filename) {
     pa_assert(u);
 
     if (filename)
     pa_assert(u);
 
     if (filename)

-        f = fopen(fn = pa_xstrdup(filename), "r");
+        f = pa_fopen_cloexec(fn = pa_xstrdup(filename), "r");

     else
         f = pa_open_config_file(DEFAULT_MATCH_TABLE_FILE, DEFAULT_MATCH_TABLE_FILE_USER, NULL, &fn);
 
     if (!f) {
     else
         f = pa_open_config_file(DEFAULT_MATCH_TABLE_FILE, DEFAULT_MATCH_TABLE_FILE_USER, NULL, &fn);
 
     if (!f) {

-        pa_xfree(fn);

         pa_log("Failed to open file config file: %s", pa_cstrerror(errno));
         goto finish;
     }
         pa_log("Failed to open file config file: %s", pa_cstrerror(errno));
         goto finish;
     }


@@ -94,12 +105,14 @@ static int load_rules(struct userdata *u, const char *filename) {
     pa_lock_fd(fileno(f), 1);
 
     while (!feof(f)) {
     pa_lock_fd(fileno(f), 1);
 
     while (!feof(f)) {

-        char *d, *v;
-        pa_volume_t volume;
+        char *token_end, *value_str;
+        pa_volume_t volume = PA_VOLUME_NORM;

         uint32_t k;
         regex_t regex;
         char ln[256];
         struct rule *rule;
         uint32_t k;
         regex_t regex;
         char ln[256];
         struct rule *rule;

+        pa_proplist *proplist = NULL;
+        pa_update_mode_t mode = (pa_update_mode_t) -1;

 
         if (!fgets(ln, sizeof(ln), f))
             break;
 
         if (!fgets(ln, sizeof(ln), f))
             break;


@@ -111,31 +124,72 @@ static int load_rules(struct userdata *u, const char *filename) {
         if (ln[0] == '#' || !*ln )
             continue;
 
         if (ln[0] == '#' || !*ln )
             continue;
 

-        d = ln+strcspn(ln, WHITESPACE);
-        v = d+strspn(d, WHITESPACE);
-
+        token_end = ln + strcspn(ln, WHITESPACE);
+        value_str = token_end + strspn(token_end, WHITESPACE);
+        *token_end = 0;

 
 

-        if (!*v) {
-            pa_log(__FILE__ ": [%s:%u] failed to parse line - too few words", filename, n);
+        if (!*ln) {
+            pa_log("[%s:%u] failed to parse line - missing regexp", fn, n);

             goto finish;
         }
 
             goto finish;
         }
 

-        *d = 0;
-        if (pa_atou(v, &k) < 0) {
-            pa_log("[%s:%u] failed to parse volume", filename, n);
+        if (!*value_str) {
+            pa_log("[%s:%u] failed to parse line - too few words", fn, n);

             goto finish;
         }
 
             goto finish;
         }
 

-        volume = (pa_volume_t) k;
-
+        if (pa_atou(value_str, &k) >= 0)
+            volume = (pa_volume_t) PA_CLAMP_VOLUME(k);
+        else {
+            size_t len;
+
+            token_end = value_str + strcspn(value_str, WHITESPACE);
+
+            len = token_end - value_str;
+            if (len == (sizeof(UPDATE_REPLACE) - 1) && !strncmp(value_str, UPDATE_REPLACE, len))
+                mode = PA_UPDATE_REPLACE;
+            else if (len == (sizeof(UPDATE_MERGE) - 1) && !strncmp(value_str, UPDATE_MERGE, len))
+                mode = PA_UPDATE_MERGE;
+
+            if (mode != (pa_update_mode_t) -1) {
+                value_str = token_end + strspn(token_end, WHITESPACE);
+
+                if (!*value_str) {
+                    pa_log("[%s:%u] failed to parse line - too few words", fn, n);
+                    goto finish;
+                }
+            } else
+                mode = PA_UPDATE_MERGE;
+
+            if (*value_str == '"') {
+                value_str++;
+
+                token_end = strchr(value_str, '"');
+                if (!token_end) {
+                    pa_log("[%s:%u] failed to parse line - missing role closing quote", fn, n);
+                    goto finish;
+                }
+            } else
+                token_end = value_str + strcspn(value_str, WHITESPACE);
+
+            *token_end = 0;
+
+            value_str = pa_sprintf_malloc("media.role=\"%s\"", value_str);
+            proplist = pa_proplist_from_string(value_str);
+            pa_xfree(value_str);
+        }

 
         if (regcomp(&regex, ln, REG_EXTENDED|REG_NOSUB) != 0) {
 
         if (regcomp(&regex, ln, REG_EXTENDED|REG_NOSUB) != 0) {

-            pa_log("[%s:%u] invalid regular expression", filename, n);
+            pa_log("[%s:%u] invalid regular expression", fn, n);
+            if (proplist)
+                pa_proplist_free(proplist);

             goto finish;
         }
 
         rule = pa_xnew(struct rule, 1);
         rule->regex = regex;
             goto finish;
         }
 
         rule = pa_xnew(struct rule, 1);
         rule->regex = regex;

+        rule->proplist = proplist;
+        rule->mode = mode;

         rule->volume = volume;
         rule->next = NULL;
 
         rule->volume = volume;
         rule->next = NULL;
 


@@ -144,8 +198,6 @@ static int load_rules(struct userdata *u, const char *filename) {
         else
             u->rules = rule;
         end = rule;
         else
             u->rules = rule;
         end = rule;

-
-        *d = 0;

     }
 
     ret = 0;
     }
 
     ret = 0;


@@ -156,38 +208,39 @@ finish:
         fclose(f);
     }
 
         fclose(f);
     }
 

-    if (fn)
-        pa_xfree(fn);
+    pa_xfree(fn);

 
     return ret;
 }
 
 
     return ret;
 }
 

-static void callback(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    struct userdata *u =  userdata;
-    pa_sink_input *si;
+static pa_hook_result_t sink_input_new_hook_callback(pa_core *c, pa_sink_input_new_data *si, struct userdata *u) {

     struct rule *r;
     const char *n;
 
     pa_assert(c);
     pa_assert(u);
 
     struct rule *r;
     const char *n;
 
     pa_assert(c);
     pa_assert(u);
 

-    if (t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW))
-        return;
-
-    if (!(si = pa_idxset_get_by_index(c->sink_inputs, idx)))
-        return;
+    if (!(n = pa_proplist_gets(si->proplist, u->property_key)))
+        return PA_HOOK_OK;

 
 

-    if (!(n = pa_proplist_gets(si->proplist, PA_PROP_MEDIA_NAME)))
-        return;
+    pa_log_debug("Matching with %s", n);

 
     for (r = u->rules; r; r = r->next) {
         if (!regexec(&r->regex, n, 0, NULL, 0)) {
 
     for (r = u->rules; r; r = r->next) {
         if (!regexec(&r->regex, n, 0, NULL, 0)) {

-            pa_cvolume cv;
-            pa_log_debug("changing volume of sink input '%s' to 0x%03x", n, r->volume);
-            pa_cvolume_set(&cv, si->sample_spec.channels, r->volume);
-            pa_sink_input_set_volume(si, &cv);
+            if (r->proplist) {
+                pa_log_debug("updating proplist of sink input '%s'", n);
+                pa_proplist_update(si->proplist, r->mode, r->proplist);
+            } else if (si->volume_writable) {
+                pa_cvolume cv;
+                pa_log_debug("changing volume of sink input '%s' to 0x%03x", n, r->volume);
+                pa_cvolume_set(&cv, si->sample_spec.channels, r->volume);
+                pa_sink_input_new_data_set_volume(si, &cv);
+            } else
+                pa_log_debug("the volume of sink input '%s' is not writable, can't change it", n);

         }
     }
         }
     }

+
+    return PA_HOOK_OK;

 }
 
 int pa__init(pa_module*m) {
 }
 
 int pa__init(pa_module*m) {


@@ -201,15 +254,17 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
         goto fail;
     }
 

-    u = pa_xnew(struct userdata, 1);
+    u = pa_xnew0(struct userdata, 1);

     u->rules = NULL;
     u->rules = NULL;

-    u->subscription = NULL;

     m->userdata = u;
 
     m->userdata = u;
 

+    u->property_key = pa_xstrdup(pa_modargs_get_value(ma, "key", PA_PROP_MEDIA_NAME));
+

     if (load_rules(u, pa_modargs_get_value(ma, "table", NULL)) < 0)
         goto fail;
 
     if (load_rules(u, pa_modargs_get_value(ma, "table", NULL)) < 0)
         goto fail;
 

-    u->subscription = pa_subscription_new(m->core, PA_SUBSCRIPTION_MASK_SINK_INPUT, callback, u);
+    /* hook EARLY - 1, to match before stream-restore */
+    u->sink_input_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_INPUT_NEW], PA_HOOK_EARLY - 1, (pa_hook_cb_t) sink_input_new_hook_callback, u);

 
     pa_modargs_free(ma);
     return 0;
 
     pa_modargs_free(ma);
     return 0;


@@ -219,7 +274,7 @@ fail:
 
     if (ma)
         pa_modargs_free(ma);
 
     if (ma)
         pa_modargs_free(ma);

-    return  -1;
+    return -1;

 }
 
 void pa__done(pa_module*m) {
 }
 
 void pa__done(pa_module*m) {


@@ -231,13 +286,18 @@ void pa__done(pa_module*m) {
     if (!(u = m->userdata))
         return;
 
     if (!(u = m->userdata))
         return;
 

-    if (u->subscription)
-        pa_subscription_free(u->subscription);
+    if (u->sink_input_new_hook_slot)
+        pa_hook_slot_free(u->sink_input_new_hook_slot);
+
+    if (u->property_key)
+        pa_xfree(u->property_key);

 
     for (r = u->rules; r; r = n) {
         n = r->next;
 
         regfree(&r->regex);
 
     for (r = u->rules; r; r = n) {
         n = r->next;
 
         regfree(&r->regex);

+        if (r->proplist)
+            pa_proplist_free(r->proplist);

         pa_xfree(r);
     }
 
         pa_xfree(r);
     }