diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-06-19 18:41:24 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-06-19 18:41:24 +0000 |
commit | b4e3f5c5c5fb1cb0ddb10d123d69c211516c4ac7 (patch) | |
tree | 813cfda5a7c64504b366909fac532d36f0430426 /src | |
parent | 56f8c953dd609bc5c94011fe4acdd9ef6b875747 (diff) |
add simple ptorocol with unix
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@25 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 11 | ||||
-rw-r--r-- | src/module-simple-protocol.c (renamed from src/module-simple-protocol-tcp.c) | 5 | ||||
-rw-r--r-- | src/todo | 9 |
3 files changed, 19 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9ec640c2..59e61568 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,8 @@ bin_PROGRAMS = polypaudio pkglib_LTLIBRARIES=libprotocol-simple.la module-simple-protocol-tcp.la \ libsocket-server.la module-pipe-sink.la libpstream.la libiochannel.la \ libpacket.la module-oss.la module-oss-mmap.la liboss.la libioline.la \ - libcli.la module-cli.la libtokenizer.la libdynarray.la + libcli.la module-cli.la libtokenizer.la libdynarray.la \ + module-simple-protocol-unix.la polypaudio_SOURCES = idxset.c idxset.h \ queue.c queue.h \ @@ -81,10 +82,16 @@ libtokenizer_la_SOURCES = tokenizer.c tokenizer.h libtokenizer_la_LDFLAGS = -avoid-version libtokenizer_la_LIBADD = libdynarray.la -module_simple_protocol_tcp_la_SOURCES = module-simple-protocol-tcp.c +module_simple_protocol_tcp_la_SOURCES = module-simple-protocol.c +module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS $(AM_CFLAGS) module_simple_protocol_tcp_la_LDFLAGS = -module -avoid-version module_simple_protocol_tcp_la_LIBADD = libprotocol-simple.la libiochannel.la +module_simple_protocol_unix_la_SOURCES = module-simple-protocol.c +module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS $(AM_CFLAGS) +module_simple_protocol_unix_la_LDFLAGS = -module -avoid-version +module_simple_protocol_unix_la_LIBADD = libprotocol-simple.la libiochannel.la + module_pipe_sink_la_SOURCES = module-pipe-sink.c module_pipe_sink_la_LDFLAGS = -module -avoid-version module_pipe_sink_la_LIBADD = libiochannel.la diff --git a/src/module-simple-protocol-tcp.c b/src/module-simple-protocol.c index e71d7142..c25ff06a 100644 --- a/src/module-simple-protocol-tcp.c +++ b/src/module-simple-protocol.c @@ -9,8 +9,13 @@ int module_init(struct core *c, struct module*m) { struct socket_server *s; assert(c && m); +#ifdef USE_TCP_SOCKETS if (!(s = socket_server_new_ipv4(c->mainloop, INADDR_LOOPBACK, 4712))) return -1; +#else + if (!(s = socket_server_new_unix(c->mainloop, "/tmp/polypsimple"))) + return -1; +#endif m->userdata = protocol_simple_new(c, s, PROTOCOL_SIMPLE_PLAYBACK); assert(m->userdata); @@ -1,14 +1,15 @@ -- -- simple control protocol: kill client/input/output; set_volume +- cli protocol - native protocol/library +- simple control protocol: kill client/input/output; set_volume - resampling - esound protocol -- config-parser -- record-testing +- config parser +- record testing -- 0.1 - optimierung von rebuild_pollfds() - future cancellation - client-ui +- clip cache drivers: - libao |