Attachment 51317 Details for Bug 40992 – Proposed patch

[patch] Proposed patch

0001-pasuspender-Allow-suspending-only-a-subset-of-sinks-.patch (text/plain), 6.33 KB, created by Jon Nordby on 2011-09-18 10:14:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Nordby

Created: 2011-09-18 10:14:58 UTC

Size: 6.33 KB

patch

obsolete

>From 7c72ba17583b3486b726937a83f4677be238c31a Mon Sep 17 00:00:00 2001
>From: Jon Nordby <jononor@gmail.com>
>Date: Sun, 18 Sep 2011 19:03:48 +0200
>Subject: [PATCH] pasuspender: Allow suspending only a subset of sinks and
> sources
>
>FDO#40992
>---
> src/utils/pasuspender.c |   78 ++++++++++++++++++++++++++++++++++++++++++-----
> 1 files changed, 70 insertions(+), 8 deletions(-)
>
>diff --git a/src/utils/pasuspender.c b/src/utils/pasuspender.c
>index 90881b2..40ccb71 100644
>--- a/src/utils/pasuspender.c
>+++ b/src/utils/pasuspender.c
>@@ -44,6 +44,7 @@
> 
> #include <pulsecore/i18n.h>
> #include <pulsecore/macro.h>
>+#include <pulsecore/core-util.h>
> 
> static pa_context *context = NULL;
> static pa_mainloop_api *mainloop_api = NULL;
>@@ -52,6 +53,8 @@ static int child_argc = 0;
> static pid_t child_pid = (pid_t) -1;
> static int child_ret = 0;
> static int dead = 1;
>+static char *sink_names = NULL;
>+static char *source_names = NULL;
> 
> static void quit(int ret) {
>     pa_assert(mainloop_api);
>@@ -100,6 +103,7 @@ static void start_child(void) {
> 
> static void suspend_complete(pa_context *c, int success, void *userdata) {
>     static int n = 0;
>+    const int callbacks = *((int *)userdata);
> 
>     n++;
> 
>@@ -109,12 +113,13 @@ static void suspend_complete(pa_context *c, int success, void *userdata) {
>         return;
>     }
> 
>-    if (n >= 2)
>+    if (n >= callbacks)
>         start_child();
> }
> 
> static void resume_complete(pa_context *c, int success, void *userdata) {
>     static int n = 0;
>+    const int callbacks = *((int *)userdata);
> 
>     n++;
> 
>@@ -124,10 +129,42 @@ static void resume_complete(pa_context *c, int success, void *userdata) {
>         return;
>     }
> 
>-    if (n >= 2)
>+    if (n >= callbacks)
>         drain(); /* drain and quit */
> }
> 
>+
>+static void suspend_sinks_and_sources(pa_context *c, int suspend, pa_context_success_cb_t cb, int *callbacks) {
>+    const char *state = NULL;
>+    char *name;
>+
>+    /* Note: code assumes the callbacks are not called syncronously by PA */
>+
>+    if (!source_names) {
>+        (*callbacks)++;
>+        pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, suspend, cb, callbacks));
>+
>+    } else while ((name = pa_split(source_names, ",", &state))) {
>+        (*callbacks)++;
>+        pa_operation_unref(pa_context_suspend_source_by_name(c, name, suspend, cb, callbacks));
>+        pa_xfree(name);
>+    }
>+    state = NULL;
>+
>+    if (!sink_names) {
>+        (*callbacks)++;
>+        pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, suspend, cb, callbacks));
>+
>+    } else while ((name = pa_split(sink_names, ",", &state))) {
>+        (*callbacks)++;
>+        pa_operation_unref(pa_context_suspend_sink_by_name(c, name, suspend, cb, callbacks));
>+        pa_xfree(name);
>+    }
>+
>+    if (*callbacks == 0)
>+        cb(NULL, 1, callbacks); /* No callback registered with PA, call it manually */
>+}
>+
> static void context_state_callback(pa_context *c, void *userdata) {
>     pa_assert(c);
> 
>@@ -139,8 +176,9 @@ static void context_state_callback(pa_context *c, void *userdata) {
> 
>         case PA_CONTEXT_READY:
>             if (pa_context_is_local(c)) {
>-                pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, 1, suspend_complete, NULL));
>-                pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, 1, suspend_complete, NULL));
>+                static int suspend_callbacks = 0;
>+                suspend_sinks_and_sources(c, 1, suspend_complete, &suspend_callbacks);
>+
>             } else {
>                 fprintf(stderr, _("WARNING: Sound server is not local, not suspending.\n"));
>                 start_child();
>@@ -196,8 +234,9 @@ static void sigchld_callback(pa_mainloop_api *m, pa_signal_event *e, int sig, vo
>     if (context) {
>         if (pa_context_is_local(context)) {
>             /* A context is around, so let's resume */
>-            pa_operation_unref(pa_context_suspend_sink_by_index(context, PA_INVALID_INDEX, 0, resume_complete, NULL));
>-            pa_operation_unref(pa_context_suspend_source_by_index(context, PA_INVALID_INDEX, 0, resume_complete, NULL));
>+            static int resume_callbacks = 0;
>+            suspend_sinks_and_sources(context, 0, resume_complete, &resume_callbacks);
>+
>         } else
>             drain();
>     } else
>@@ -210,12 +249,21 @@ static void help(const char *argv0) {
>     printf(_("%s [options] ... \n\n"
>            "  -h, --help                            Show this help\n"
>            "      --version                         Show version\n"
>-           "  -s, --server=SERVER                   The name of the server to connect to\n\n"),
>+           "      --sink-names=NAMES                Only suspend the named sinks\n"
>+           "      --source-names=NAMES              Only suspend the named sources\n"
>+           "  -s, --server=SERVER                   The name of the server to connect to\n"
>+           "\n"
>+           "Sink/source names are delimited by comma and can be either symbolic names\n"
>+           "or numerical ids. An empty string indicates that no sinks/sources should be suspended.\n"
>+           "Note that the suspend state of monitor sources follows the state of the\n"
>+           "respective sink, and cannot be manipulated directly.\n"),
>            argv0);
> }
> 
> enum {
>-    ARG_VERSION = 256
>+    ARG_VERSION = 256,
>+    ARG_SINK_NAMES,
>+    ARG_SOURCE_NAMES
> };
> 
> int main(int argc, char *argv[]) {
>@@ -227,6 +275,8 @@ int main(int argc, char *argv[]) {
>         {"server",      1, NULL, 's'},
>         {"version",     0, NULL, ARG_VERSION},
>         {"help",        0, NULL, 'h'},
>+        {"sink-names",  1, NULL,  ARG_SINK_NAMES},
>+        {"source-names",1, NULL,  ARG_SOURCE_NAMES},
>         {NULL,          0, NULL, 0}
>     };
> 
>@@ -257,6 +307,16 @@ int main(int argc, char *argv[]) {
>                 server = pa_xstrdup(optarg);
>                 break;
> 
>+            case ARG_SINK_NAMES:
>+                pa_xfree(sink_names);
>+                sink_names = pa_xstrdup(optarg);
>+                break;
>+
>+            case ARG_SOURCE_NAMES:
>+                pa_xfree(source_names);
>+                source_names = pa_xstrdup(optarg);
>+                break;
>+
>             default:
>                 goto quit;
>         }
>@@ -306,6 +366,8 @@ quit:
>         pa_mainloop_free(m);
>     }
> 
>+    pa_xfree(sink_names);
>+    pa_xfree(source_names);
>     pa_xfree(server);
> 
>     if (!dead)
>-- 
>1.7.6.1
>

Actions: View | Splinter Review

Attachments on bug 40992: 51317

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.