Attachment 116913 Details for Bug 91211 – patch

[patch] patch

0002-module-new-allow-omitting-the-server-argument.patch (text/plain), 4.19 KB, created by Pierre Ossman on 2015-07-03 12:23:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2015-07-03 12:23:28 UTC

Size: 4.19 KB

patch

obsolete

>From 251557754940917f78bba2fa4754298a3a571ada Mon Sep 17 00:00:00 2001
>From: Pierre Ossman <ossman@cendio.se>
>Date: Fri, 3 Jul 2015 14:20:08 +0200
>Subject: [PATCH 2/2] module-new: allow omitting the server argument
>
>Omitting the server argument makes it try to find a server
>automatically. Note that it can often find itself and cause a loop
>so it's only useful in certain circumstances.
>
>Signed-off-by: Pierre Ossman <ossman@cendio.se>
>---
> src/modules/module-tunnel-sink-new.c   | 14 +++++++-------
> src/modules/module-tunnel-source-new.c | 14 +++++++-------
> 2 files changed, 14 insertions(+), 14 deletions(-)
>
>diff --git a/src/modules/module-tunnel-sink-new.c b/src/modules/module-tunnel-sink-new.c
>index 7c8f089..145ce4b 100644
>--- a/src/modules/module-tunnel-sink-new.c
>+++ b/src/modules/module-tunnel-sink-new.c
>@@ -496,15 +496,14 @@ int pa__init(pa_module *m) {
>     }
> 
>     remote_server = pa_modargs_get_value(ma, "server", NULL);
>-    if (!remote_server) {
>-        pa_log("No server given!");
>-        goto fail;
>-    }
>+    if (!remote_server)
>+        pa_log_warn("No server given. Will attempt to find one automatically.");
> 
>     u = pa_xnew0(struct userdata, 1);
>     u->module = m;
>     m->userdata = u;
>-    u->remote_server = pa_xstrdup(remote_server);
>+    if (remote_server)
>+        u->remote_server = pa_xstrdup(remote_server);
>     u->thread_mainloop = pa_mainloop_new();
>     if (u->thread_mainloop == NULL) {
>         pa_log("Failed to create mainloop");
>@@ -526,8 +525,9 @@ int pa__init(pa_module *m) {
>     pa_sink_new_data_init(&sink_data);
>     sink_data.driver = __FILE__;
>     sink_data.module = m;
>+    sink_data.namereg_fail = false;
> 
>-    default_sink_name = pa_sprintf_malloc("tunnel-sink-new.%s", remote_server);
>+    default_sink_name = pa_sprintf_malloc("tunnel-sink-new.%s", remote_server ? remote_server : "auto");
>     sink_name = pa_modargs_get_value(ma, "sink_name", default_sink_name);
> 
>     pa_sink_new_data_set_name(&sink_data, sink_name);
>@@ -538,7 +538,7 @@ int pa__init(pa_module *m) {
>     pa_proplist_setf(sink_data.proplist,
>                      PA_PROP_DEVICE_DESCRIPTION,
>                      _("Tunnel to %s/%s"),
>-                     remote_server,
>+                     pa_strempty(remote_server),
>                      pa_strempty(u->remote_sink_name));
> 
>     if (pa_modargs_get_proplist(ma, "sink_properties", sink_data.proplist, PA_UPDATE_REPLACE) < 0) {
>diff --git a/src/modules/module-tunnel-source-new.c b/src/modules/module-tunnel-source-new.c
>index 50dd3f0..1f5ec26 100644
>--- a/src/modules/module-tunnel-source-new.c
>+++ b/src/modules/module-tunnel-source-new.c
>@@ -495,15 +495,14 @@ int pa__init(pa_module *m) {
>     }
> 
>     remote_server = pa_modargs_get_value(ma, "server", NULL);
>-    if (!remote_server) {
>-        pa_log("No server given!");
>-        goto fail;
>-    }
>+    if (!remote_server)
>+        pa_log_warn("No server given. Will attempt to find one automatically.");
> 
>     u = pa_xnew0(struct userdata, 1);
>     u->module = m;
>     m->userdata = u;
>-    u->remote_server = pa_xstrdup(remote_server);
>+    if (remote_server)
>+        u->remote_server = pa_xstrdup(remote_server);
>     u->thread_mainloop = pa_mainloop_new();
>     if (u->thread_mainloop == NULL) {
>         pa_log("Failed to create mainloop");
>@@ -525,8 +524,9 @@ int pa__init(pa_module *m) {
>     pa_source_new_data_init(&source_data);
>     source_data.driver = __FILE__;
>     source_data.module = m;
>+    source_data.namereg_fail = false;
> 
>-    default_source_name = pa_sprintf_malloc("tunnel-source-new.%s", remote_server);
>+    default_source_name = pa_sprintf_malloc("tunnel-source-new.%s", remote_server ? remote_server : "auto");
>     source_name = pa_modargs_get_value(ma, "source_name", default_source_name);
> 
>     pa_source_new_data_set_name(&source_data, source_name);
>@@ -537,7 +537,7 @@ int pa__init(pa_module *m) {
>     pa_proplist_setf(source_data.proplist,
>                      PA_PROP_DEVICE_DESCRIPTION,
>                      _("Tunnel to %s/%s"),
>-                     remote_server,
>+                     pa_strempty(remote_server),
>                      pa_strempty(u->remote_source_name));
> 
>     if (pa_modargs_get_proplist(ma, "source_properties", source_data.proplist, PA_UPDATE_REPLACE) < 0) {
>-- 
>2.4.3
>

Actions: View | Splinter Review

Attachments on bug 91211: 116913

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.