From b4e3f5c5c5fb1cb0ddb10d123d69c211516c4ac7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 19 Jun 2004 18:41:24 +0000
Subject: add simple ptorocol with unix

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@25 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/Makefile.am                  | 11 +++++++++--
 src/module-simple-protocol-tcp.c | 24 ------------------------
 src/module-simple-protocol.c     | 29 +++++++++++++++++++++++++++++
 src/todo                         |  9 +++++----
 4 files changed, 43 insertions(+), 30 deletions(-)
 delete mode 100644 src/module-simple-protocol-tcp.c
 create mode 100644 src/module-simple-protocol.c

(limited to 'src')

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-tcp.c
deleted file mode 100644
index e71d7142..00000000
--- a/src/module-simple-protocol-tcp.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <assert.h>
-#include <arpa/inet.h>
-
-#include "module.h"
-#include "socket-server.h"
-#include "protocol-simple.h"
-
-int module_init(struct core *c, struct module*m) {
-    struct socket_server *s;
-    assert(c && m);
-
-    if (!(s = socket_server_new_ipv4(c->mainloop, INADDR_LOOPBACK, 4712)))
-        return -1;
-
-    m->userdata = protocol_simple_new(c, s, PROTOCOL_SIMPLE_PLAYBACK);
-    assert(m->userdata);
-    return 0;
-}
-
-void module_done(struct core *c, struct module*m) {
-    assert(c && m);
-
-    protocol_simple_free(m->userdata);
-}
diff --git a/src/module-simple-protocol.c b/src/module-simple-protocol.c
new file mode 100644
index 00000000..c25ff06a
--- /dev/null
+++ b/src/module-simple-protocol.c
@@ -0,0 +1,29 @@
+#include <assert.h>
+#include <arpa/inet.h>
+
+#include "module.h"
+#include "socket-server.h"
+#include "protocol-simple.h"
+
+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);
+    return 0;
+}
+
+void module_done(struct core *c, struct module*m) {
+    assert(c && m);
+
+    protocol_simple_free(m->userdata);
+}
diff --git a/src/todo b/src/todo
index 7e60ac3b..87b5c304 100644
--- a/src/todo
+++ b/src/todo
@@ -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
-- 
cgit