mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor fixes

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@329 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2005-01-06 01:07:43 +00:00
parent 8199925cec
commit fb11e45cfd
5 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
polyp/client-conf-x11.c
View file

@ -15,7 +15,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with polypaudio; if not, write to the Free Software 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. USA.
***/ ***/
@ -48,11 +48,10 @@ int pa_client_conf_from_x11(struct pa_client_conf *c, const char *dname) {
goto finish; goto finish;
} }
if (!pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) {
goto finish;
pa_xfree(c->default_server); pa_xfree(c->default_server);
c->default_server = pa_xstrdup(t); c->default_server = pa_xstrdup(t);
}
if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) { if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) {
pa_xfree(c->default_sink); pa_xfree(c->default_sink);

15
polyp/pax11publish.c
View file

@ -96,9 +96,7 @@ int main(int argc, char *argv[]) {
switch (mode) { switch (mode) {
case DUMP: { case DUMP: {
char t[1024]; char t[1024];
if (!pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
goto finish;
printf("Server: %s\n", t); printf("Server: %s\n", t);
if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t))) if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t)))
printf("Source: %s\n", t); printf("Source: %s\n", t);
@ -112,11 +110,8 @@ int main(int argc, char *argv[]) {
case IMPORT: { case IMPORT: {
char t[1024]; char t[1024];
if (!pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
goto finish;
printf("POLYP_SERVER='%s'\nexport POLYP_SERVER\n", t); printf("POLYP_SERVER='%s'\nexport POLYP_SERVER\n", t);
if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t))) if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t)))
printf("POLYP_SOURCE='%s'\nexport POLYP_SOURCE\n", t); printf("POLYP_SOURCE='%s'\nexport POLYP_SOURCE\n", t);
if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t)))
@ -155,10 +150,14 @@ int main(int argc, char *argv[]) {
goto finish; 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_ID");
pa_x11_del_prop(d, "POLYP_COOKIE");
if (server) 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) else if (c->default_server)
pa_x11_set_prop(d, "POLYP_SERVER", c->default_server); pa_x11_set_prop(d, "POLYP_SERVER", c->default_server);
else { else {

14
polyp/polyplib-context.c
View file

@ -564,7 +564,6 @@ int pa_context_connect(struct pa_context *c, const char *server, int spawn, cons
if (!server) if (!server)
server = c->conf->default_server; server = c->conf->default_server;
pa_context_ref(c); pa_context_ref(c);
assert(!c->server_list); assert(!c->server_list);
@ -580,14 +579,23 @@ int pa_context_connect(struct pa_context *c, const char *server, int spawn, cons
/* Prepend in reverse order */ /* Prepend in reverse order */
if ((d = getenv("DISPLAY"))) 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); 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, "tcp6:localhost");
c->server_list = pa_strlist_prepend(c->server_list, "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))); 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) { if (spawn && c->conf->autospawn) {
char lf[PATH_MAX]; char lf[PATH_MAX];

3
polyp/protocol-esound.c
View file

@ -714,7 +714,8 @@ static int do_read(struct connection *c) {
assert(c->read_data_length < sizeof(c->request)); 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) { 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; return -1;
} }

3
polyp/socket-client.c
View file

@ -263,6 +263,9 @@ struct pa_socket_client* pa_socket_client_new_string(struct pa_mainloop_api *m,
if (pa_parse_address(name, &a) < 0) if (pa_parse_address(name, &a) < 0)
return NULL; return NULL;
if (!a.port)
a.port = default_port;
switch (a.type) { switch (a.type) {
case PA_PARSED_ADDRESS_UNIX: case PA_PARSED_ADDRESS_UNIX:
c = pa_socket_client_new_unix(m, a.path_or_host); c = pa_socket_client_new_unix(m, a.path_or_host);