You should have received a copy of the GNU Lesser General Public License
along with polypaudio; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-13071
USA.
***/
goto finish;
}
- if (!pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
- goto finish;
-
- pa_xfree(c->default_server);
- c->default_server = pa_xstrdup(t);
+ if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) {
+ pa_xfree(c->default_server);
+ c->default_server = pa_xstrdup(t);
+ }
if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) {
pa_xfree(c->default_sink);
switch (mode) {
case DUMP: {
char t[1024];
- if (!pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
- goto finish;
-
- printf("Server: %s\n", t);
+ if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
+ printf("Server: %s\n", t);
if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t)))
printf("Source: %s\n", t);
if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t)))
case IMPORT: {
char t[1024];
- if (!pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
- goto finish;
-
- printf("POLYP_SERVER='%s'\nexport POLYP_SERVER\n", t);
-
+ if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
+ printf("POLYP_SERVER='%s'\nexport POLYP_SERVER\n", t);
if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t)))
printf("POLYP_SOURCE='%s'\nexport POLYP_SOURCE\n", t);
if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t)))
goto finish;
}
+ pa_x11_del_prop(d, "POLYP_SERVER");
+ pa_x11_del_prop(d, "POLYP_SINK");
+ pa_x11_del_prop(d, "POLYP_SOURCE");
pa_x11_del_prop(d, "POLYP_ID");
-
+ pa_x11_del_prop(d, "POLYP_COOKIE");
+
if (server)
- pa_x11_set_prop(d, "POLYP_SERVER", c->default_server);
+ pa_x11_set_prop(d, "POLYP_SERVER", server);
else if (c->default_server)
pa_x11_set_prop(d, "POLYP_SERVER", c->default_server);
else {
pa_xfree(c->server);
c->server = pa_xstrdup(u);
-
+
if (!(c->client = pa_socket_client_new_string(c->mainloop, u, PA_NATIVE_DEFAULT_PORT)))
continue;
if (!server)
server = c->conf->default_server;
-
pa_context_ref(c);
assert(!c->server_list);
/* Prepend in reverse order */
- if ((d = getenv("DISPLAY")))
- c->server_list = pa_strlist_prepend(c->server_list, d);
+ if ((d = getenv("DISPLAY"))) {
+ char *e;
+ d = pa_xstrdup(d);
+ if ((e = strchr(d, ':')))
+ *e = 0;
+
+ if (*d)
+ c->server_list = pa_strlist_prepend(c->server_list, d);
+
+ pa_xfree(d);
+ }
c->server_list = pa_strlist_prepend(c->server_list, "tcp6:localhost");
c->server_list = pa_strlist_prepend(c->server_list, "localhost");
c->server_list = pa_strlist_prepend(c->server_list, pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET, ufn, sizeof(ufn)));
- /* Wrap the connection attempts in a single transaction for sane autospwan locking */
+ /* Wrap the connection attempts in a single transaction for sane autospawn locking */
if (spawn && c->conf->autospawn) {
char lf[PATH_MAX];
assert(c->read_data_length < sizeof(c->request));
if ((r = pa_iochannel_read(c->io, ((uint8_t*) &c->request) + c->read_data_length, sizeof(c->request) - c->read_data_length)) <= 0) {
- pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ if (r != 0)
+ pa_log_warn(__FILE__": read() failed: %s\n", strerror(errno));
return -1;
}
if (pa_parse_address(name, &a) < 0)
return NULL;
+ if (!a.port)
+ a.port = default_port;
+
switch (a.type) {
case PA_PARSED_ADDRESS_UNIX:
c = pa_socket_client_new_unix(m, a.path_or_host);