Reorganised the source tree. We now have src/ with a couple of subdirs:

* daemon/ - Contains the files specific to the polypaudio daemon.
 * modules/ - All loadable modules.
 * polyp/ - Files that are part of the public, application interface or
   are only used in libpolyp.
 * polypcore/ - All other shared files.
 * tests/ - Test programs.
 * utils/ - Utility programs.


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@487 fefdeb5f-60dc-0310-8127-8f9354f1896f

Makefile.am

@@ -18,7 +18,7 @@
 # USA.
 
 EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4 ltdl.m4
-SUBDIRS=libltdl polyp doc
+SUBDIRS=libltdl src doc
 
 MAINTAINERCLEANFILES =
 noinst_DATA =

configure.ac

@@ -21,7 +21,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([polypaudio],[0.8],[mzcbylcnhqvb (at) 0pointer (dot) de])
-AC_CONFIG_SRCDIR([polyp/main.c])
+AC_CONFIG_SRCDIR([src/daemon/main.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
 
@@ -392,7 +392,7 @@ fi
 
 AC_CONFIG_FILES([
 Makefile
-polyp/Makefile
+src/Makefile
 polyplib.pc
 polyplib-simple.pc
 polyplib-mainloop.pc
@@ -407,7 +407,7 @@ doc/daemon.html
 doc/modules.html
 doxygen/Makefile
 doxygen/doxygen.conf
-polyp/polyplib-version.h
+src/polyp/polyplib-version.h
 doc/FAQ.html
 ])
 AC_OUTPUT

src/daemon/caps.c

@@ -32,7 +32,7 @@
 #include <sys/capability.h>
 #endif
 
-#include "log.h"
+#include <polypcore/log.h>
 #include "caps.h"
 
 #ifdef HAVE_GETUID

src/daemon/cmdline.c

@@ -31,9 +31,9 @@
 #include <sys/stat.h>
 
 #include "cmdline.h"
-#include "util.h"
-#include "strbuf.h"
-#include "xmalloc.h"
+#include <polypcore/util.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/xmalloc.h>
 
 /* Argument codes for getopt_long() */
 enum {

src/daemon/cpulimit.c

@@ -24,8 +24,8 @@
 #endif
 
 #include "cpulimit.h"
-#include "util.h"
-#include "log.h"
+#include <polypcore/util.h>
+#include <polypcore/log.h>
 
 #ifdef HAVE_SIGXCPU
 

src/daemon/cpulimit.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
 
 /* This kills the polypaudio process if it eats more than 70% of the
  * CPU time. This is build around setrlimit() and SIGXCPU. It is handy

src/daemon/daemon-conf.c

@@ -30,11 +30,11 @@
 #include <unistd.h>
 
 #include "daemon-conf.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "strbuf.h"
-#include "conf-parser.h"
-#include "resampler.h"
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/conf-parser.h>
+#include <polypcore/resampler.h>
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32

src/daemon/daemon-conf.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "log.h"
+#include <polypcore/log.h>
 
 /* The actual command to execute */
 typedef enum pa_daemon_conf_cmd {

src/daemon/dumpmodules.c

@@ -30,8 +30,8 @@
 #include <ltdl.h>
 
 #include "dumpmodules.h"
-#include "modinfo.h"
-#include "util.h"
+#include <polypcore/modinfo.h>
+#include <polypcore/util.h>
 
 #define PREFIX "module-"
 

src/daemon/main.c

@@ -32,7 +32,6 @@
 #include <stddef.h>
 #include <assert.h>
 #include <ltdl.h>
-#include <memblock.h>
 #include <limits.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -48,25 +47,26 @@
 #include <tcpd.h>
 #endif
 
-#include "winsock.h"
+#include <polypcore/winsock.h>
 
-#include "core.h"
-#include "mainloop.h"
-#include "module.h"
-#include "mainloop-signal.h"
+#include <polypcore/core.h>
+#include <polypcore/memblock.h>
+#include <polyp/mainloop.h>
+#include <polypcore/module.h>
+#include <polyp/mainloop-signal.h>
 #include "cmdline.h"
-#include "cli-command.h"
-#include "util.h"
-#include "sioman.h"
-#include "xmalloc.h"
+#include <polypcore/cli-command.h>
+#include <polypcore/util.h>
+#include <polypcore/sioman.h>
+#include <polypcore/xmalloc.h>
 #include "cpulimit.h"
-#include "log.h"
+#include <polypcore/log.h>
 #include "daemon-conf.h"
 #include "dumpmodules.h"
 #include "caps.h"
-#include "cli-text.h"
-#include "pid.h"
-#include "namereg.h"
+#include <polypcore/cli-text.h>
+#include <polypcore/pid.h>
+#include <polypcore/namereg.h>
 
 #ifdef HAVE_LIBWRAP
 /* Only one instance of these variables */

src/modules/module-alsa-sink.c

@@ -34,16 +34,17 @@
 
 #include <asoundlib.h>
 
-#include "module.h"
-#include "core.h"
-#include "memchunk.h"
-#include "sink.h"
-#include "modargs.h"
-#include "util.h"
-#include "sample-util.h"
-#include "alsa-util.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/core.h>
+#include <polypcore/module.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/alsa-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-alsa-sink-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-alsa-source.c

@@ -34,16 +34,17 @@
 
 #include <asoundlib.h>
 
-#include "module.h"
-#include "core.h"
-#include "memchunk.h"
-#include "sink.h"
-#include "modargs.h"
-#include "util.h"
-#include "sample-util.h"
-#include "alsa-util.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/core.h>
+#include <polypcore/module.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/alsa-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-alsa-source-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-cli.c

@@ -27,11 +27,12 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include "module.h"
-#include "iochannel.h"
-#include "cli.h"
-#include "sioman.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/iochannel.h>
+#include <polypcore/cli.h>
+#include <polypcore/sioman.h>
+#include <polypcore/log.h>
+
 #include "module-cli-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-combine.c

@@ -26,16 +26,17 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "module.h"
-#include "llist.h"
-#include "sink.h"
-#include "sink-input.h"
-#include "memblockq.h"
-#include "log.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "modargs.h"
-#include "namereg.h"
+#include <polypcore/module.h>
+#include <polypcore/llist.h>
+#include <polypcore/sink.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/memblockq.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/modargs.h>
+#include <polypcore/namereg.h>
+
 #include "module-combine-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-defs.h.m4

@@ -1,6 +1,6 @@
 dnl $Id$
 changecom(`/*', `*/')dnl
-define(`module_name', patsubst(patsubst(fname, `-symdef.h$'), `[^0-9a-zA-Z]', `_'))dnl
+define(`module_name', patsubst(patsubst(patsubst(fname, `-symdef.h$'), `^.*/'), `[^0-9a-zA-Z]', `_'))dnl
 define(`c_symbol', patsubst(module_name, `[^0-9a-zA-Z]', `_'))dnl
 define(`c_macro', patsubst(module_name, `[^0-9a-zA-Z]', `'))dnl
 define(`incmacro', `foo'c_macro`symdeffoo')dnl
@@ -8,8 +8,8 @@ define(`gen_symbol', `#define $1 'module_name`_LTX_$1')dnl
 #ifndef incmacro
 #define incmacro
 
-#include "core.h"
-#include "module.h"
+#include <polypcore/core.h>
+#include <polypcore/module.h>
 
 gen_symbol(pa__init)
 gen_symbol(pa__done)

src/modules/module-detect.c

@@ -31,11 +31,12 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "module.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-detect-symdef.h"
-#include "xmalloc.h"
-#include "modargs.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers")

src/modules/module-esound-compat-spawnfd.c

@@ -28,10 +28,11 @@
 #include <string.h>
 #include <errno.h>
 
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "module-esound-compat-spawnfd-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-esound-compat-spawnpid.c

@@ -28,10 +28,11 @@
 #include <errno.h>
 #include <signal.h>
 
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/log.h>
+
 #include "module-esound-compat-spawnpid-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-esound-sink.c

@@ -33,17 +33,18 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "iochannel.h"
-#include "sink.h"
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/socket-client.h>
+#include <polypcore/esound.h>
+#include <polypcore/authkey.h>
+
 #include "module-esound-sink-symdef.h"
-#include "socket-client.h"
-#include "esound.h"
-#include "authkey.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ESOUND Sink")

src/modules/module-lirc.c

@@ -30,13 +30,14 @@
 #include <lirc/lirc_client.h>
 #include <stdlib.h>
 
-#include "module.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/log.h>
+#include <polypcore/namereg.h>
+#include <polypcore/sink.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/modargs.h>
+
 #include "module-lirc-symdef.h"
-#include "namereg.h"
-#include "sink.h"
-#include "xmalloc.h"
-#include "modargs.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("LIRC volume control")

src/modules/module-match.c

@@ -32,13 +32,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
-#include "subscribe.h"
-#include "xmalloc.h"
-#include "sink-input.h"
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/log.h>
+#include <polypcore/subscribe.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/sink-input.h>
+
 #include "module-match-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-mmkbd-evdev.c

@@ -33,14 +33,15 @@
 
 #include <linux/input.h>
 
-#include "module.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/log.h>
+#include <polypcore/namereg.h>
+#include <polypcore/sink.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+
 #include "module-mmkbd-evdev-symdef.h"
-#include "namereg.h"
-#include "sink.h"
-#include "xmalloc.h"
-#include "modargs.h"
-#include "util.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("Multimedia keyboard support via Linux evdev")

src/modules/module-native-protocol-fd.c

@@ -27,11 +27,12 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include "module.h"
-#include "iochannel.h"
-#include "modargs.h"
-#include "protocol-native.h"
-#include "log.h"
+#include <polypcore/module.h>
+#include <polypcore/iochannel.h>
+#include <polypcore/modargs.h>
+#include <polypcore/protocol-native.h>
+#include <polypcore/log.h>
+
 #include "module-native-protocol-fd-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-null-sink.c

@@ -33,13 +33,14 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "iochannel.h"
-#include "sink.h"
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-null-sink-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-oss-mmap.c

@@ -36,16 +36,17 @@
 #include <limits.h>
 #include <sys/mman.h>
 
-#include "iochannel.h"
-#include "sink.h"
-#include "source.h"
-#include "module.h"
-#include "oss-util.h"
-#include "sample-util.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/oss-util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-oss-mmap-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-oss.c

@@ -35,16 +35,17 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "iochannel.h"
-#include "sink.h"
-#include "source.h"
-#include "module.h"
-#include "oss-util.h"
-#include "sample-util.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/oss-util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-oss-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-pipe-sink.c

@@ -33,13 +33,14 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "iochannel.h"
-#include "sink.h"
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-pipe-sink-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-pipe-source.c

@@ -33,13 +33,14 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "iochannel.h"
-#include "source.h"
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-pipe-source-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-protocol-stub.c

@@ -40,16 +40,15 @@
 #include <netinet/in.h>
 #endif
 
-#include "winsock.h"
+#include <polypcore/winsock.h>
 
-#include "module.h"
-#include "socket-server.h"
-#include "socket-util.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
-#include "native-common.h"
-#include "util.h"
+#include <polypcore/module.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/socket-util.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/log.h>
+#include <polypcore/native-common.h>
 
 #ifdef USE_TCP_SOCKETS
 #define SOCKET_DESCRIPTION "(TCP sockets)"
@@ -63,7 +62,7 @@
 #endif
 
 #if defined(USE_PROTOCOL_SIMPLE)
-  #include "protocol-simple.h"
+  #include <polypcore/protocol-simple.h>
   #define protocol_new pa_protocol_simple_new
   #define protocol_free pa_protocol_simple_free
   #define TCPWRAP_SERVICE "polypaudio-simple"
@@ -80,7 +79,7 @@
   PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE("rate=<sample rate> format=<sample format> channels=<number of channels> sink=<sink to connect to> source=<source to connect to> playback=<enable playback?> record=<enable record?> "SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_CLI)
-  #include "protocol-cli.h" 
+  #include <polypcore/protocol-cli.h> 
   #define protocol_new pa_protocol_cli_new
   #define protocol_free pa_protocol_cli_free
   #define TCPWRAP_SERVICE "polypaudio-cli"
@@ -97,7 +96,7 @@
   PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE(SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_HTTP)
-  #include "protocol-http.h" 
+  #include <polypcore/protocol-http.h>
   #define protocol_new pa_protocol_http_new
   #define protocol_free pa_protocol_http_free
   #define TCPWRAP_SERVICE "polypaudio-http"
@@ -114,7 +113,7 @@
   PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE(SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_NATIVE)
-  #include "protocol-native.h"
+  #include <polypcore/protocol-native.h>
   #define protocol_new pa_protocol_native_new
   #define protocol_free pa_protocol_native_free
   #define TCPWRAP_SERVICE "polypaudio-native"
@@ -131,8 +130,8 @@
   PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE("public=<don't check for cookies?> cookie=<path to cookie file> "SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_ESOUND)
-  #include "protocol-esound.h"
-  #include "esound.h"
+  #include <polypcore/protocol-esound.h>
+  #include <polypcore/esound.h>
   #define protocol_new pa_protocol_esound_new
   #define protocol_free pa_protocol_esound_free
   #define TCPWRAP_SERVICE "esound"

src/modules/module-sine.c

@@ -27,12 +27,13 @@
 #include <assert.h>
 #include <math.h>
 
-#include "sink-input.h"
-#include "module.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "namereg.h"
-#include "log.h"
+#include <polypcore/sink-input.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/namereg.h>
+#include <polypcore/log.h>
+
 #include "module-sine-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-solaris.c

@@ -40,16 +40,18 @@
 #include <sys/conf.h>
 #include <sys/audio.h>
 
-#include "iochannel.h"
-#include "sink.h"
-#include "source.h"
-#include "module.h"
-#include "sample-util.h"
-#include "util.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "mainloop-signal.h"
+#include <polyp/mainloop-signal.h>
+
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "module-solaris-symdef.h"
 
 PA_MODULE_AUTHOR("Pierre Ossman")

src/modules/module-tunnel.c

@@ -31,20 +31,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "module.h"
-#include "util.h"
-#include "modargs.h"
-#include "log.h"
-#include "subscribe.h"
-#include "xmalloc.h"
-#include "sink-input.h"
-#include "pdispatch.h"
-#include "pstream.h"
-#include "pstream-util.h"
-#include "authkey.h"
-#include "socket-client.h"
-#include "socket-util.h"
-#include "authkey-prop.h"
+#include <polypcore/module.h>
+#include <polypcore/util.h>
+#include <polypcore/modargs.h>
+#include <polypcore/log.h>
+#include <polypcore/subscribe.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/pdispatch.h>
+#include <polypcore/pstream.h>
+#include <polypcore/pstream-util.h>
+#include <polypcore/authkey.h>
+#include <polypcore/socket-client.h>
+#include <polypcore/socket-util.h>
+#include <polypcore/authkey-prop.h>
 
 #ifdef TUNNEL_SINK
 #include "module-tunnel-sink-symdef.h"

src/modules/module-waveout.c

@@ -27,15 +27,17 @@
 #include <mmsystem.h>
 #include <assert.h>
 
-#include "sink.h"
-#include "source.h"
-#include "module.h"
-#include "mainloop-api.h"
-#include "modargs.h"
-#include "sample-util.h"
-#include "util.h"
-#include "log.h"
-#include "xmalloc.h"
+#include <polyp/mainloop-api.h>
+
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/xmalloc.h>
+
 #include "module-waveout-symdef.h"
 
 PA_MODULE_AUTHOR("Pierre Ossman")

src/modules/module-x11-bell.c

@@ -31,14 +31,15 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
-#include "module.h"
-#include "sink.h"
-#include "scache.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "namereg.h"
-#include "log.h"
-#include "x11wrap.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/sink.h>
+#include <polypcore/scache.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/namereg.h>
+#include <polypcore/log.h>
+#include <polypcore/x11wrap.h>
+
 #include "module-x11-bell-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

src/modules/module-x11-publish.c

@@ -32,22 +32,23 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include "module.h"
-#include "sink.h"
-#include "scache.h"
-#include "modargs.h"
-#include "xmalloc.h"
-#include "namereg.h"
-#include "log.h"
-#include "x11wrap.h"
-#include "util.h"
-#include "native-common.h"
+#include <polypcore/module.h>
+#include <polypcore/sink.h>
+#include <polypcore/scache.h>
+#include <polypcore/modargs.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/namereg.h>
+#include <polypcore/log.h>
+#include <polypcore/x11wrap.h>
+#include <polypcore/util.h>
+#include <polypcore/native-common.h>
+#include <polypcore/authkey-prop.h>
+#include <polypcore/authkey.h>
+#include <polypcore/x11prop.h>
+#include <polypcore/strlist.h>
+#include <polypcore/props.h>
+
 #include "module-x11-publish-symdef.h"
-#include "authkey-prop.h"
-#include "authkey.h"
-#include "x11prop.h"
-#include "strlist.h"
-#include "props.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("X11 Credential Publisher")

src/modules/module-zeroconf-publish.c

@@ -29,19 +29,20 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <polypcore/howl-wrap.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/autoload.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/native-common.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/subscribe.h>
+#include <polypcore/dynarray.h>
+#include <polypcore/endianmacros.h>
+#include <polypcore/modargs.h>
+
 #include "module-zeroconf-publish-symdef.h"
-#include "howl-wrap.h"
-#include "xmalloc.h"
-#include "autoload.h"
-#include "sink.h"
-#include "source.h"
-#include "native-common.h"
-#include "util.h"
-#include "log.h"
-#include "subscribe.h"
-#include "dynarray.h"
-#include "endianmacros.h"
-#include "modargs.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Publisher")

src/polyp/client-conf-x11.c

@@ -30,10 +30,10 @@
 #include <X11/Xatom.h>
 
 #include "client-conf-x11.h"
-#include "x11prop.h"
-#include "log.h"
-#include "xmalloc.h"
-#include "util.h"
+#include <polypcore/x11prop.h>
+#include <polypcore/log.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
 
 int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
     Display *d = NULL;

src/polyp/client-conf-x11.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "client-conf.h"
+#include <polyp/client-conf.h>
 
 /* Load client configuration data from the specified X11 display,
  * overwriting the current settings in *c */

src/polyp/client-conf.c

@@ -29,12 +29,13 @@
 #include <errno.h>
 #include <string.h>
 
-#include "client-conf.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "conf-parser.h"
-#include "util.h"
-#include "authkey.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/conf-parser.h>
+#include <polypcore/util.h>
+#include <polypcore/authkey.h>
+
+#include <polyp/client-conf.h>
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32

src/polyp/client-conf.h

@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "native-common.h"
+#include "../polypcore/native-common.h"
 
 /* A structure containing configuration data for polypaudio clients. */
 

src/polyp/glib-mainloop.c

@@ -25,11 +25,11 @@
 
 #include <assert.h>
 
-#include "glib-mainloop.h"
-#include "idxset.h"
-#include "xmalloc.h"
+#include <polyp/glib-mainloop.h>
+#include <polypcore/idxset.h>
+#include <polypcore/xmalloc.h>
 #include "glib.h"
-#include "util.h"
+#include <polypcore/util.h>
 
 struct pa_io_event  {
     pa_glib_mainloop *mainloop;

src/polyp/glib-mainloop.h

@@ -24,8 +24,8 @@
 
 #include <glib.h>
 
-#include "mainloop-api.h"
-#include "cdecl.h"
+#include <polyp/mainloop-api.h>
+#include <polyp/cdecl.h>
 
 /** \file
  * GLIB main loop support */

src/polyp/glib12-mainloop.c

@@ -25,10 +25,10 @@
 
 #include <assert.h>
 
-#include "glib-mainloop.h"
-#include "idxset.h"
-#include "xmalloc.h"
-#include "util.h"
+#include <polyp/glib-mainloop.h>
+#include <polypcore/idxset.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
 
 /* A mainloop implementation based on GLIB 1.2 */
 

src/polyp/mainloop-api.c

@@ -27,8 +27,8 @@
 #include <stdlib.h>
 
 #include "mainloop-api.h"
-#include "xmalloc.h"
-#include "gccmacro.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
 
 struct once_info {
     void (*callback)(pa_mainloop_api*m, void *userdata);

src/polyp/mainloop-signal.c

@@ -36,11 +36,11 @@
 #include <windows.h>
 #endif
 
-#include "mainloop-signal.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "gccmacro.h"
+#include <polyp/mainloop-signal.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/gccmacro.h>
 
 struct pa_signal_event {
     int sig;

src/polyp/mainloop-signal.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "mainloop-api.h"
-#include "cdecl.h"
+#include <polyp/mainloop-api.h>
+#include <polyp/cdecl.h>
 
 PA_C_DECL_BEGIN
 

src/polyp/mainloop.c

@@ -38,13 +38,13 @@
 #include "poll.h"
 #endif
 
-#include "winsock.h"
+#include <polypcore/winsock.h>
 
 #include "mainloop.h"
-#include "util.h"
-#include "idxset.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/util.h>
+#include <polypcore/idxset.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
 
 struct pa_io_event {
     pa_mainloop *mainloop;

src/polyp/mainloop.h

@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "mainloop-api.h"
-#include "cdecl.h"
+#include <polyp/mainloop-api.h>
+#include <polyp/cdecl.h>
 
 PA_C_DECL_BEGIN
 

src/polyp/polyplib-browser.c

@@ -23,9 +23,9 @@
 #include <howl.h>
 
 #include "polyplib-browser.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "util.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
 
 #define SERVICE_NAME_SINK "_polypaudio-sink._tcp."
 #define SERVICE_NAME_SOURCE "_polypaudio-source._tcp."

src/polyp/polyplib-context.c

@@ -45,22 +45,22 @@
 #include <netdb.h>
 #endif
 
-#include "winsock.h"
+#include <polypcore/winsock.h>
 
 #include "polyplib-internal.h"
 #include "polyplib-context.h"
 #include "polyplib-version.h"
-#include "native-common.h"
-#include "pdispatch.h"
-#include "pstream.h"
-#include "dynarray.h"
-#include "socket-client.h"
-#include "pstream-util.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "client-conf.h"
-#include "socket-util.h"
+#include <polypcore/native-common.h>
+#include <polypcore/pdispatch.h>
+#include <polypcore/pstream.h>
+#include <polypcore/dynarray.h>
+#include <polypcore/socket-client.h>
+#include <polypcore/pstream-util.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polyp/client-conf.h>
+#include <polypcore/socket-util.h>
 
 #ifdef HAVE_X11
 #include "client-conf-x11.h"

src/polyp/polyplib-error.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #include "polyplib-error.h"
-#include "native-common.h"
+#include <polypcore/native-common.h>
 
 static const char* const errortab[PA_ERROR_MAX] = {
     [PA_ERROR_OK] = "OK",

src/polyp/polyplib-error.h

@@ -23,7 +23,7 @@
 ***/
 
 #include <inttypes.h>
-#include "cdecl.h"
+#include <polyp/cdecl.h>
 
 /** \file
  * Error management */

src/polyp/polyplib-internal.h

@@ -22,20 +22,20 @@
   USA.
 ***/
 
-#include "mainloop-api.h"
-#include "socket-client.h"
-#include "pstream.h"
-#include "pdispatch.h"
-#include "dynarray.h"
+#include <polyp/mainloop-api.h>
+#include <polypcore/socket-client.h>
+#include <polypcore/pstream.h>
+#include <polypcore/pdispatch.h>
+#include <polypcore/dynarray.h>
 
 #include "polyplib-context.h"
 #include "polyplib-stream.h"
 #include "polyplib-operation.h"
-#include "llist.h"
-#include "native-common.h"
-#include "client-conf.h"
-#include "strlist.h"
-#include "mcalign.h"
+#include <polypcore/llist.h>
+#include <polypcore/native-common.h>
+#include <polyp/client-conf.h>
+#include <polypcore/strlist.h>
+#include <polypcore/mcalign.h>
 
 #define DEFAULT_TIMEOUT (10)
 

src/polyp/polyplib-introspect.c

@@ -28,8 +28,8 @@
 #include "polyplib-introspect.h"
 #include "polyplib-context.h"
 #include "polyplib-internal.h"
-#include "pstream-util.h"
-#include "gccmacro.h"
+#include <polypcore/pstream-util.h>
+#include <polypcore/gccmacro.h>
 
 /*** Statistics ***/
 

src/polyp/polyplib-operation.c

@@ -25,7 +25,7 @@
 
 #include <assert.h>
 
-#include "xmalloc.h"
+#include <polypcore/xmalloc.h>
 #include "polyplib-internal.h"
 #include "polyplib-operation.h"
 

src/polyp/polyplib-scache.c

@@ -30,7 +30,7 @@
 
 #include "polyplib-scache.h"
 #include "polyplib-internal.h"
-#include "pstream-util.h"
+#include <polypcore/pstream-util.h>
 
 void pa_stream_connect_upload(pa_stream *s, size_t length) {
     pa_tagstruct *t;

src/polyp/polyplib-simple.c

@@ -31,9 +31,9 @@
 #include "polyplib-simple.h"
 #include "polyplib.h"
 #include "mainloop.h"
-#include "native-common.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <polypcore/native-common.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
 
 struct pa_simple {
     pa_mainloop *mainloop;

src/polyp/polyplib-simple.h

@@ -26,7 +26,7 @@
 
 #include "sample.h"
 #include "polyplib-def.h"
-#include "cdecl.h"
+#include <polyp/cdecl.h>
 
 /** \file
  * A simple but limited synchronous playback and recording

src/polyp/polyplib-stream.c

@@ -29,10 +29,10 @@
 #include <string.h>
 
 #include "polyplib-internal.h"
-#include "xmalloc.h"
-#include "pstream-util.h"
-#include "util.h"
-#include "log.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/pstream-util.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
 
 #define LATENCY_IPOL_INTERVAL_USEC (10000L)
 

src/polyp/polyplib-subscribe.c

@@ -28,8 +28,8 @@
 
 #include "polyplib-subscribe.h"
 #include "polyplib-internal.h"
-#include "pstream-util.h"
-#include "gccmacro.h"
+#include <polypcore/pstream-util.h>
+#include <polypcore/gccmacro.h>
 
 void pa_command_subscribe_event(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
     pa_context *c = userdata;

src/polypcore/alsa-util.c

@@ -27,7 +27,7 @@
 #include <asoundlib.h>
 
 #include "alsa-util.h"
-#include "sample.h"
+#include <polyp/sample.h>
 #include "xmalloc.h"
 #include "log.h"
 

src/polypcore/alsa-util.h

@@ -24,8 +24,8 @@
 
 #include <asoundlib.h>
 
-#include "sample.h"
-#include "mainloop-api.h"
+#include <polyp/sample.h>
+#include <polyp/mainloop-api.h>
 
 int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, const pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size);
 

src/polypcore/cli-text.c

@@ -38,7 +38,7 @@
 #include "scache.h"
 #include "autoload.h"
 #include "xmalloc.h"
-#include "volume.h"
+#include <polyp/volume.h>
 
 char *pa_module_list_to_string(pa_core *c) {
     pa_strbuf *s;