mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-05 13:29:57 -05:00
Reversing incorrect commit.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@423 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
72795fcaa6
commit
067c00ff5d
4 changed files with 2 additions and 15 deletions
|
|
@ -62,10 +62,6 @@
|
||||||
#elif defined(USE_TCP6_SOCKETS)
|
#elif defined(USE_TCP6_SOCKETS)
|
||||||
#define SOCKET_DESCRIPTION "(TCP/IPv6 sockets)"
|
#define SOCKET_DESCRIPTION "(TCP/IPv6 sockets)"
|
||||||
#define SOCKET_USAGE "port=<TCP port number> loopback=<listen on loopback device only?>"
|
#define SOCKET_USAGE "port=<TCP port number> loopback=<listen on loopback device only?>"
|
||||||
#ifdef OS_IS_WIN32
|
|
||||||
static const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
|
|
||||||
static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }};
|
|
||||||
#endif
|
|
||||||
#else
|
#else
|
||||||
#define SOCKET_DESCRIPTION "(UNIX sockets)"
|
#define SOCKET_DESCRIPTION "(UNIX sockets)"
|
||||||
#define SOCKET_USAGE "socket=<path to UNIX socket>"
|
#define SOCKET_USAGE "socket=<path to UNIX socket>"
|
||||||
|
|
|
||||||
|
|
@ -367,12 +367,12 @@ static void setup_context(struct pa_context *c, struct pa_iochannel *io) {
|
||||||
assert(!c->pdispatch);
|
assert(!c->pdispatch);
|
||||||
c->pdispatch = pa_pdispatch_new(c->mainloop, command_table, PA_COMMAND_MAX);
|
c->pdispatch = pa_pdispatch_new(c->mainloop, command_table, PA_COMMAND_MAX);
|
||||||
assert(c->pdispatch);
|
assert(c->pdispatch);
|
||||||
/*
|
|
||||||
if (!c->conf->cookie_valid) {
|
if (!c->conf->cookie_valid) {
|
||||||
pa_context_fail(c, PA_ERROR_AUTHKEY);
|
pa_context_fail(c, PA_ERROR_AUTHKEY);
|
||||||
goto finish;
|
goto finish;
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
t = pa_tagstruct_new(NULL, 0);
|
t = pa_tagstruct_new(NULL, 0);
|
||||||
assert(t);
|
assert(t);
|
||||||
pa_tagstruct_putu32(t, PA_COMMAND_AUTH);
|
pa_tagstruct_putu32(t, PA_COMMAND_AUTH);
|
||||||
|
|
|
||||||
|
|
@ -70,10 +70,6 @@
|
||||||
|
|
||||||
#define CONNECT_TIMEOUT 5
|
#define CONNECT_TIMEOUT 5
|
||||||
|
|
||||||
#ifdef OS_IS_WIN32
|
|
||||||
static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct pa_socket_client {
|
struct pa_socket_client {
|
||||||
int ref;
|
int ref;
|
||||||
struct pa_mainloop_api *mainloop;
|
struct pa_mainloop_api *mainloop;
|
||||||
|
|
|
||||||
|
|
@ -65,11 +65,6 @@
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
#ifdef OS_IS_WIN32
|
|
||||||
static const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
|
|
||||||
static const struct in6_addr in6addr_loopback = {{ IN6ADDR_LOOPBACK_INIT }};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct pa_socket_server {
|
struct pa_socket_server {
|
||||||
int ref;
|
int ref;
|
||||||
int fd;
|
int fd;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue