Reorganised the source tree. We now have src/ with a couple of subdirs:
authorPierre Ossman <ossman@cendio.se>
Thu, 16 Feb 2006 19:19:58 +0000 (19:19 +0000)
committerPierre Ossman <ossman@cendio.se>
Thu, 16 Feb 2006 19:19:58 +0000 (19:19 +0000)
 * 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

246 files changed:
Makefile.am
configure.ac
src/Makefile.am [moved from polyp/Makefile.am with 64% similarity]
src/client.conf.in [moved from polyp/client.conf.in with 100% similarity]
src/daemon.conf.in [moved from polyp/daemon.conf.in with 100% similarity]
src/daemon/caps.c [moved from polyp/caps.c with 98% similarity]
src/daemon/caps.h [moved from polyp/caps.h with 100% similarity]
src/daemon/cmdline.c [moved from polyp/cmdline.c with 99% similarity]
src/daemon/cmdline.h [moved from polyp/cmdline.h with 100% similarity]
src/daemon/cpulimit.c [moved from polyp/cpulimit.c with 99% similarity]
src/daemon/cpulimit.h [moved from polyp/cpulimit.h with 97% similarity]
src/daemon/daemon-conf.c [moved from polyp/daemon-conf.c with 98% similarity]
src/daemon/daemon-conf.h [moved from polyp/daemon-conf.h with 99% similarity]
src/daemon/dumpmodules.c [moved from polyp/dumpmodules.c with 97% similarity]
src/daemon/dumpmodules.h [moved from polyp/dumpmodules.h with 100% similarity]
src/daemon/main.c [moved from polyp/main.c with 96% similarity]
src/default.pa.in [moved from polyp/default.pa.in with 100% similarity]
src/default.pa.win32 [moved from polyp/default.pa.win32 with 100% similarity]
src/depmod.py [moved from polyp/depmod.py with 100% similarity]
src/modules/module-alsa-sink.c [moved from polyp/module-alsa-sink.c with 96% similarity]
src/modules/module-alsa-source.c [moved from polyp/module-alsa-source.c with 96% similarity]
src/modules/module-cli.c [moved from polyp/module-cli.c with 93% similarity]
src/modules/module-combine.c [moved from polyp/module-combine.c with 97% similarity]
src/modules/module-defs.h.m4 [moved from polyp/module-defs.h.m4 with 81% similarity]
src/modules/module-detect.c [moved from polyp/module-detect.c with 97% similarity]
src/modules/module-esound-compat-spawnfd.c [moved from polyp/module-esound-compat-spawnfd.c with 94% similarity]
src/modules/module-esound-compat-spawnpid.c [moved from polyp/module-esound-compat-spawnpid.c with 94% similarity]
src/modules/module-esound-sink.c [moved from polyp/module-esound-sink.c with 97% similarity]
src/modules/module-lirc.c [moved from polyp/module-lirc.c with 97% similarity]
src/modules/module-match.c [moved from polyp/module-match.c with 96% similarity]
src/modules/module-mmkbd-evdev.c [moved from polyp/module-mmkbd-evdev.c with 97% similarity]
src/modules/module-native-protocol-fd.c [moved from polyp/module-native-protocol-fd.c with 92% similarity]
src/modules/module-null-sink.c [moved from polyp/module-null-sink.c with 94% similarity]
src/modules/module-oss-mmap.c [moved from polyp/module-oss-mmap.c with 97% similarity]
src/modules/module-oss.c [moved from polyp/module-oss.c with 97% similarity]
src/modules/module-pipe-sink.c [moved from polyp/module-pipe-sink.c with 96% similarity]
src/modules/module-pipe-source.c [moved from polyp/module-pipe-source.c with 96% similarity]
src/modules/module-protocol-stub.c [moved from polyp/module-protocol-stub.c with 94% similarity]
src/modules/module-sine.c [moved from polyp/module-sine.c with 96% similarity]
src/modules/module-solaris.c [moved from polyp/module-solaris.c with 97% similarity]
src/modules/module-tunnel.c [moved from polyp/module-tunnel.c with 97% similarity]
src/modules/module-waveout.c [moved from polyp/module-waveout.c with 98% similarity]
src/modules/module-x11-bell.c [moved from polyp/module-x11-bell.c with 94% similarity]
src/modules/module-x11-publish.c [moved from polyp/module-x11-publish.c with 91% similarity]
src/modules/module-zeroconf-publish.c [moved from polyp/module-zeroconf-publish.c with 97% similarity]
src/polyp/cdecl.h [moved from polyp/cdecl.h with 100% similarity]
src/polyp/channelmap.c [moved from polyp/channelmap.c with 100% similarity]
src/polyp/channelmap.h [moved from polyp/channelmap.h with 100% similarity]
src/polyp/client-conf-x11.c [moved from polyp/client-conf-x11.c with 95% similarity]
src/polyp/client-conf-x11.h [moved from polyp/client-conf-x11.h with 97% similarity]
src/polyp/client-conf.c [moved from polyp/client-conf.c with 96% similarity]
src/polyp/client-conf.h [moved from polyp/client-conf.h with 97% similarity]
src/polyp/glib-mainloop.c [moved from polyp/glib-mainloop.c with 99% similarity]
src/polyp/glib-mainloop.h [moved from polyp/glib-mainloop.h with 96% similarity]
src/polyp/glib12-mainloop.c [moved from polyp/glib12-mainloop.c with 99% similarity]
src/polyp/mainloop-api.c [moved from polyp/mainloop-api.c with 96% similarity]
src/polyp/mainloop-api.h [moved from polyp/mainloop-api.h with 100% similarity]
src/polyp/mainloop-signal.c [moved from polyp/mainloop-signal.c with 97% similarity]
src/polyp/mainloop-signal.h [moved from polyp/mainloop-signal.h with 97% similarity]
src/polyp/mainloop.c [moved from polyp/mainloop.c with 99% similarity]
src/polyp/mainloop.h [moved from polyp/mainloop.h with 98% similarity]
src/polyp/polyplib-browser.c [moved from polyp/polyplib-browser.c with 99% similarity]
src/polyp/polyplib-browser.h [moved from polyp/polyplib-browser.h with 100% similarity]
src/polyp/polyplib-context.c [moved from polyp/polyplib-context.c with 98% similarity]
src/polyp/polyplib-context.h [moved from polyp/polyplib-context.h with 100% similarity]
src/polyp/polyplib-def.h [moved from polyp/polyplib-def.h with 100% similarity]
src/polyp/polyplib-error.c [moved from polyp/polyplib-error.c with 97% similarity]
src/polyp/polyplib-error.h [moved from polyp/polyplib-error.h with 97% similarity]
src/polyp/polyplib-internal.h [moved from polyp/polyplib-internal.h with 93% similarity]
src/polyp/polyplib-introspect.c [moved from polyp/polyplib-introspect.c with 99% similarity]
src/polyp/polyplib-introspect.h [moved from polyp/polyplib-introspect.h with 100% similarity]
src/polyp/polyplib-operation.c [moved from polyp/polyplib-operation.c with 98% similarity]
src/polyp/polyplib-operation.h [moved from polyp/polyplib-operation.h with 100% similarity]
src/polyp/polyplib-scache.c [moved from polyp/polyplib-scache.c with 99% similarity]
src/polyp/polyplib-scache.h [moved from polyp/polyplib-scache.h with 100% similarity]
src/polyp/polyplib-simple.c [moved from polyp/polyplib-simple.c with 98% similarity]
src/polyp/polyplib-simple.h [moved from polyp/polyplib-simple.h with 99% similarity]
src/polyp/polyplib-stream.c [moved from polyp/polyplib-stream.c with 99% similarity]
src/polyp/polyplib-stream.h [moved from polyp/polyplib-stream.h with 100% similarity]
src/polyp/polyplib-subscribe.c [moved from polyp/polyplib-subscribe.c with 97% similarity]
src/polyp/polyplib-subscribe.h [moved from polyp/polyplib-subscribe.h with 100% similarity]
src/polyp/polyplib-version.h.in [moved from polyp/polyplib-version.h.in with 100% similarity]
src/polyp/polyplib.h [moved from polyp/polyplib.h with 100% similarity]
src/polyp/sample.c [moved from polyp/sample.c with 100% similarity]
src/polyp/sample.h [moved from polyp/sample.h with 100% similarity]
src/polyp/volume.c [moved from polyp/volume.c with 100% similarity]
src/polyp/volume.h [moved from polyp/volume.h with 100% similarity]
src/polypcore/alsa-util.c [moved from polyp/alsa-util.c with 99% similarity]
src/polypcore/alsa-util.h [moved from polyp/alsa-util.h with 95% similarity]
src/polypcore/authkey-prop.c [moved from polyp/authkey-prop.c with 100% similarity]
src/polypcore/authkey-prop.h [moved from polyp/authkey-prop.h with 100% similarity]
src/polypcore/authkey.c [moved from polyp/authkey.c with 100% similarity]
src/polypcore/authkey.h [moved from polyp/authkey.h with 100% similarity]
src/polypcore/autoload.c [moved from polyp/autoload.c with 100% similarity]
src/polypcore/autoload.h [moved from polyp/autoload.h with 100% similarity]
src/polypcore/cli-command.c [moved from polyp/cli-command.c with 100% similarity]
src/polypcore/cli-command.h [moved from polyp/cli-command.h with 100% similarity]
src/polypcore/cli-text.c [moved from polyp/cli-text.c with 99% similarity]
src/polypcore/cli-text.h [moved from polyp/cli-text.h with 100% similarity]
src/polypcore/cli.c [moved from polyp/cli.c with 100% similarity]
src/polypcore/cli.h [moved from polyp/cli.h with 100% similarity]
src/polypcore/client.c [moved from polyp/client.c with 100% similarity]
src/polypcore/client.h [moved from polyp/client.h with 100% similarity]
src/polypcore/conf-parser.c [moved from polyp/conf-parser.c with 100% similarity]
src/polypcore/conf-parser.h [moved from polyp/conf-parser.h with 100% similarity]
src/polypcore/core.c [moved from polyp/core.c with 100% similarity]
src/polypcore/core.h [moved from polyp/core.h with 97% similarity]
src/polypcore/dllmain.c [moved from polyp/dllmain.c with 100% similarity]
src/polypcore/dynarray.c [moved from polyp/dynarray.c with 100% similarity]
src/polypcore/dynarray.h [moved from polyp/dynarray.h with 100% similarity]
src/polypcore/endianmacros.h [moved from polyp/endianmacros.h with 100% similarity]
src/polypcore/esound.h [moved from polyp/esound.h with 100% similarity]
src/polypcore/g711.c [moved from polyp/g711.c with 100% similarity]
src/polypcore/g711.h [moved from polyp/g711.h with 100% similarity]
src/polypcore/gccmacro.h [moved from polyp/gccmacro.h with 100% similarity]
src/polypcore/hashmap.c [moved from polyp/hashmap.c with 100% similarity]
src/polypcore/hashmap.h [moved from polyp/hashmap.h with 100% similarity]
src/polypcore/howl-wrap.c [moved from polyp/howl-wrap.c with 100% similarity]
src/polypcore/howl-wrap.h [moved from polyp/howl-wrap.h with 100% similarity]
src/polypcore/idxset.c [moved from polyp/idxset.c with 100% similarity]
src/polypcore/idxset.h [moved from polyp/idxset.h with 100% similarity]
src/polypcore/inet_ntop.c [moved from polyp/inet_ntop.c with 100% similarity]
src/polypcore/inet_ntop.h [moved from polyp/inet_ntop.h with 100% similarity]
src/polypcore/iochannel.c [moved from polyp/iochannel.c with 100% similarity]
src/polypcore/iochannel.h [moved from polyp/iochannel.h with 98% similarity]
src/polypcore/ioline.c [moved from polyp/ioline.c with 100% similarity]
src/polypcore/ioline.h [moved from polyp/ioline.h with 100% similarity]
src/polypcore/llist.h [moved from polyp/llist.h with 100% similarity]
src/polypcore/log.c [moved from polyp/log.c with 100% similarity]
src/polypcore/log.h [moved from polyp/log.h with 100% similarity]
src/polypcore/mcalign.c [moved from polyp/mcalign.c with 100% similarity]
src/polypcore/mcalign.h [moved from polyp/mcalign.h with 100% similarity]
src/polypcore/memblock.c [moved from polyp/memblock.c with 100% similarity]
src/polypcore/memblock.h [moved from polyp/memblock.h with 100% similarity]
src/polypcore/memblockq.c [moved from polyp/memblockq.c with 100% similarity]
src/polypcore/memblockq.h [moved from polyp/memblockq.h with 100% similarity]
src/polypcore/memchunk.c [moved from polyp/memchunk.c with 100% similarity]
src/polypcore/memchunk.h [moved from polyp/memchunk.h with 100% similarity]
src/polypcore/modargs.c [moved from polyp/modargs.c with 100% similarity]
src/polypcore/modargs.h [moved from polyp/modargs.h with 98% similarity]
src/polypcore/modinfo.c [moved from polyp/modinfo.c with 100% similarity]
src/polypcore/modinfo.h [moved from polyp/modinfo.h with 100% similarity]
src/polypcore/module.c [moved from polyp/module.c with 100% similarity]
src/polypcore/module.h [moved from polyp/module.h with 100% similarity]
src/polypcore/namereg.c [moved from polyp/namereg.c with 100% similarity]
src/polypcore/namereg.h [moved from polyp/namereg.h with 100% similarity]
src/polypcore/native-common.h [moved from polyp/native-common.h with 98% similarity]
src/polypcore/oss-util.c [moved from polyp/oss-util.c with 100% similarity]
src/polypcore/oss-util.h [moved from polyp/oss-util.h with 97% similarity]
src/polypcore/packet.c [moved from polyp/packet.c with 100% similarity]
src/polypcore/packet.h [moved from polyp/packet.h with 100% similarity]
src/polypcore/parseaddr.c [moved from polyp/parseaddr.c with 100% similarity]
src/polypcore/parseaddr.h [moved from polyp/parseaddr.h with 100% similarity]
src/polypcore/pdispatch.c [moved from polyp/pdispatch.c with 100% similarity]
src/polypcore/pdispatch.h [moved from polyp/pdispatch.h with 98% similarity]
src/polypcore/pid.c [moved from polyp/pid.c with 100% similarity]
src/polypcore/pid.h [moved from polyp/pid.h with 100% similarity]
src/polypcore/play-memchunk.c [moved from polyp/play-memchunk.c with 100% similarity]
src/polypcore/play-memchunk.h [moved from polyp/play-memchunk.h with 100% similarity]
src/polypcore/poll.c [moved from polyp/poll.c with 100% similarity]
src/polypcore/poll.h [moved from polyp/poll.h with 100% similarity]
src/polypcore/props.c [moved from polyp/props.c with 100% similarity]
src/polypcore/props.h [moved from polyp/props.h with 100% similarity]
src/polypcore/protocol-cli.c [moved from polyp/protocol-cli.c with 100% similarity]
src/polypcore/protocol-cli.h [moved from polyp/protocol-cli.h with 100% similarity]
src/polypcore/protocol-esound.c [moved from polyp/protocol-esound.c with 99% similarity]
src/polypcore/protocol-esound.h [moved from polyp/protocol-esound.h with 100% similarity]
src/polypcore/protocol-http.c [moved from polyp/protocol-http.c with 100% similarity]
src/polypcore/protocol-http.h [moved from polyp/protocol-http.h with 100% similarity]
src/polypcore/protocol-native.c [moved from polyp/protocol-native.c with 100% similarity]
src/polypcore/protocol-native.h [moved from polyp/protocol-native.h with 100% similarity]
src/polypcore/protocol-simple.c [moved from polyp/protocol-simple.c with 100% similarity]
src/polypcore/protocol-simple.h [moved from polyp/protocol-simple.h with 100% similarity]
src/polypcore/pstream-util.c [moved from polyp/pstream-util.c with 100% similarity]
src/polypcore/pstream-util.h [moved from polyp/pstream-util.h with 100% similarity]
src/polypcore/pstream.c [moved from polyp/pstream.c with 100% similarity]
src/polypcore/pstream.h [moved from polyp/pstream.h with 98% similarity]
src/polypcore/queue.c [moved from polyp/queue.c with 100% similarity]
src/polypcore/queue.h [moved from polyp/queue.h with 100% similarity]
src/polypcore/random.c [moved from polyp/random.c with 100% similarity]
src/polypcore/random.h [moved from polyp/random.h with 100% similarity]
src/polypcore/resampler.c [moved from polyp/resampler.c with 100% similarity]
src/polypcore/resampler.h [moved from polyp/resampler.h with 97% similarity]
src/polypcore/sample-util.c [moved from polyp/sample-util.c with 100% similarity]
src/polypcore/sample-util.h [moved from polyp/sample-util.h with 96% similarity]
src/polypcore/scache.c [moved from polyp/scache.c with 99% similarity]
src/polypcore/scache.h [moved from polyp/scache.h with 100% similarity]
src/polypcore/sconv-s16be.c [moved from polyp/sconv-s16be.c with 100% similarity]
src/polypcore/sconv-s16be.h [moved from polyp/sconv-s16be.h with 100% similarity]
src/polypcore/sconv-s16le.c [moved from polyp/sconv-s16le.c with 100% similarity]
src/polypcore/sconv-s16le.h [moved from polyp/sconv-s16le.h with 100% similarity]
src/polypcore/sconv.c [moved from polyp/sconv.c with 100% similarity]
src/polypcore/sconv.h [moved from polyp/sconv.h with 97% similarity]
src/polypcore/sink-input.c [moved from polyp/sink-input.c with 100% similarity]
src/polypcore/sink-input.h [moved from polyp/sink-input.h with 99% similarity]
src/polypcore/sink.c [moved from polyp/sink.c with 99% similarity]
src/polypcore/sink.h [moved from polyp/sink.h with 96% similarity]
src/polypcore/sioman.c [moved from polyp/sioman.c with 100% similarity]
src/polypcore/sioman.h [moved from polyp/sioman.h with 100% similarity]
src/polypcore/socket-client.c [moved from polyp/socket-client.c with 100% similarity]
src/polypcore/socket-client.h [moved from polyp/socket-client.h with 98% similarity]
src/polypcore/socket-server.c [moved from polyp/socket-server.c with 100% similarity]
src/polypcore/socket-server.h [moved from polyp/socket-server.h with 98% similarity]
src/polypcore/socket-util.c [moved from polyp/socket-util.c with 100% similarity]
src/polypcore/socket-util.h [moved from polyp/socket-util.h with 100% similarity]
src/polypcore/sound-file-stream.c [moved from polyp/sound-file-stream.c with 100% similarity]
src/polypcore/sound-file-stream.h [moved from polyp/sound-file-stream.h with 100% similarity]
src/polypcore/sound-file.c [moved from polyp/sound-file.c with 99% similarity]
src/polypcore/sound-file.h [moved from polyp/sound-file.h with 97% similarity]
src/polypcore/source-output.c [moved from polyp/source-output.c with 100% similarity]
src/polypcore/source-output.h [moved from polyp/source-output.h with 98% similarity]
src/polypcore/source.c [moved from polyp/source.c with 100% similarity]
src/polypcore/source.h [moved from polyp/source.h with 97% similarity]
src/polypcore/strbuf.c [moved from polyp/strbuf.c with 99% similarity]
src/polypcore/strbuf.h [moved from polyp/strbuf.h with 100% similarity]
src/polypcore/strlist.c [moved from polyp/strlist.c with 100% similarity]
src/polypcore/strlist.h [moved from polyp/strlist.h with 100% similarity]
src/polypcore/subscribe.c [moved from polyp/subscribe.c with 100% similarity]
src/polypcore/subscribe.h [moved from polyp/subscribe.h with 100% similarity]
src/polypcore/tagstruct.c [moved from polyp/tagstruct.c with 100% similarity]
src/polypcore/tagstruct.h [moved from polyp/tagstruct.h with 97% similarity]
src/polypcore/tokenizer.c [moved from polyp/tokenizer.c with 100% similarity]
src/polypcore/tokenizer.h [moved from polyp/tokenizer.h with 100% similarity]
src/polypcore/util.c [moved from polyp/util.c with 100% similarity]
src/polypcore/util.h [moved from polyp/util.h with 99% similarity]
src/polypcore/winsock.h [moved from polyp/winsock.h with 100% similarity]
src/polypcore/x11prop.c [moved from polyp/x11prop.c with 100% similarity]
src/polypcore/x11prop.h [moved from polyp/x11prop.h with 100% similarity]
src/polypcore/x11wrap.c [moved from polyp/x11wrap.c with 100% similarity]
src/polypcore/x11wrap.h [moved from polyp/x11wrap.h with 100% similarity]
src/polypcore/xmalloc.c [moved from polyp/xmalloc.c with 100% similarity]
src/polypcore/xmalloc.h [moved from polyp/xmalloc.h with 100% similarity]
src/tests/cpulimit-test.c [moved from polyp/cpulimit-test.c with 93% similarity]
src/tests/mainloop-test.c [moved from polyp/mainloop-test.c with 96% similarity]
src/tests/mcalign-test.c [moved from polyp/mcalign-test.c with 96% similarity]
src/tests/pacat-simple.c [moved from polyp/pacat-simple.c with 98% similarity]
src/tests/parec-simple.c [moved from polyp/parec-simple.c with 98% similarity]
src/tests/strlist-test.c [moved from polyp/strlist-test.c with 89% similarity]
src/tests/voltest.c [moved from polyp/voltest.c with 94% similarity]
src/utils/esdcompat.sh.in [moved from polyp/esdcompat.sh.in with 100% similarity]
src/utils/pabrowse.c [moved from polyp/pabrowse.c with 100% similarity]
src/utils/pacat.c [moved from polyp/pacat.c with 100% similarity]
src/utils/pacmd.c [moved from polyp/pacmd.c with 98% similarity]
src/utils/pactl.c [moved from polyp/pactl.c with 100% similarity]
src/utils/paplay.c [moved from polyp/paplay.c with 100% similarity]
src/utils/pax11publish.c [moved from polyp/pax11publish.c with 97% similarity]

index 2cf93c7..9705d45 100644 (file)
@@ -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 =
index 0366359..182a245 100644 (file)
@@ -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
similarity index 64%
rename from polyp/Makefile.am
rename to src/Makefile.am
index 061b82b..92c7dae 100644 (file)
@@ -23,6 +23,7 @@
 ###################################
 
 polypincludedir=$(includedir)/polyp
+polypcoreincludedir=$(includedir)/polypcore
 polypconfdir=$(sysconfdir)/polypaudio
 
 modlibdir=$(libdir)/polypaudio
@@ -42,7 +43,7 @@ endif
 #     Compiler/linker flags       #
 ###################################
 
-AM_CFLAGS = -I$(top_srcdir)
+AM_CFLAGS = -I$(top_srcdir)/src
 AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS
 AM_CFLAGS += $(LTDLINCL)
 AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -78,12 +79,12 @@ EXTRA_DIST = \
                daemon.conf.in \
                default.pa.in \
                depmod.py \
-               esdcompat.sh.in \
-               module-defs.h.m4
+               utils/esdcompat.sh.in \
+               modules/module-defs.h.m4
 
 polypconf_DATA = default.pa daemon.conf client.conf
 
-BUILT_SOURCES = polyplib-version.h
+BUILT_SOURCES = polyp/polyplib-version.h
 
 ###################################
 #          Main daemon            #
@@ -92,15 +93,13 @@ BUILT_SOURCES = polyplib-version.h
 bin_PROGRAMS = polypaudio
 
 polypaudio_SOURCES = \
-               caps.h caps.c \
-               cmdline.c cmdline.h \
-               cpulimit.c cpulimit.h \
-               conf-parser.h conf-parser.c \
-               daemon-conf.c daemon-conf.h \
-               dumpmodules.c dumpmodules.h \
-               gcc-printf.h \
-               main.c \
-               pid.c pid.h
+               daemon/caps.h daemon/caps.c \
+               daemon/cmdline.c daemon/cmdline.h \
+               daemon/cpulimit.c daemon/cpulimit.h \
+               daemon/daemon-conf.c daemon/daemon-conf.h \
+               daemon/dumpmodules.c daemon/dumpmodules.h \
+               daemon/main.c \
+               polypcore/gccmacro.h
 
 polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 polypaudio_CPPFLAGS = $(AM_CPPFLAGS) 
@@ -135,34 +134,34 @@ if HAVE_HOWL
 bin_PROGRAMS +=        pabrowse
 endif
 
-bin_SCRIPTS = esdcompat.sh
+bin_SCRIPTS = utils/esdcompat.sh
 
-pacat_SOURCES = pacat.c
+pacat_SOURCES = utils/pacat.c
 pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
 pacat_CFLAGS = $(AM_CFLAGS) 
 pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-paplay_SOURCES = paplay.c
+paplay_SOURCES = utils/paplay.c
 paplay_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
 paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 paplay_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-pactl_SOURCES = pactl.c
+pactl_SOURCES = utils/pactl.c
 pactl_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
 pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-pacmd_SOURCES = pacmd.c util.c util.h xmalloc.c xmalloc.h log.c log.h pid.c pid.h
+pacmd_SOURCES = utils/pacmd.c polypcore/pid.c polypcore/pid.h
 pacmd_CFLAGS = $(AM_CFLAGS)
-pacmd_LDADD = $(AM_LDADD)
+pacmd_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la
 pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-pax11publish_SOURCES = pax11publish.c util.c util.h xmalloc.c xmalloc.h log.c log.h authkey.c authkey.h client-conf.c client-conf.h conf-parser.c conf-parser.h x11prop.c x11prop.h random.c random.h
+pax11publish_SOURCES = utils/pax11publish.c
 pax11publish_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
-pax11publish_LDADD = $(AM_LDADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
+pax11publish_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
 pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-pabrowse_SOURCES = pabrowse.c
+pabrowse_SOURCES = utils/pabrowse.c
 pabrowse_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp-browse-@PA_MAJORMINOR@.la
 pabrowse_CFLAGS = $(AM_CFLAGS)
 pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
@@ -195,44 +194,44 @@ noinst_PROGRAMS += \
                mainloop-test-glib12
 endif
 
-mainloop_test_SOURCES = mainloop-test.c
+mainloop_test_SOURCES = tests/mainloop-test.c
 mainloop_test_CFLAGS = $(AM_CFLAGS)
 mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp-@PA_MAJORMINOR@.la
 mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-mcalign_test_SOURCES = mcalign-test.c util.c util.h xmalloc.c xmalloc.h log.c log.h mcalign.c mcalign.h memchunk.c memchunk.h memblock.c memblock.h
+mcalign_test_SOURCES = tests/mcalign-test.c
 mcalign_test_CFLAGS = $(AM_CFLAGS)
-mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
 mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-pacat_simple_SOURCES = pacat-simple.c
+pacat_simple_SOURCES = tests/pacat-simple.c
 pacat_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
 pacat_simple_CFLAGS = $(AM_CFLAGS)
 pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-parec_simple_SOURCES = parec-simple.c
+parec_simple_SOURCES = tests/parec-simple.c
 parec_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
 parec_simple_CFLAGS = $(AM_CFLAGS)
 parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-strlist_test_SOURCES = strlist-test.c strlist.c strlist.h strbuf.c strbuf.h util.c util.h xmalloc.c xmalloc.h log.c log.h
+strlist_test_SOURCES = tests/strlist-test.c
 strlist_test_CFLAGS = $(AM_CFLAGS)
-strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la libstrlist.la
 strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-voltest_SOURCES = voltest.c sample.c volume.c volume.h sample.h
+voltest_SOURCES = tests/voltest.c
 voltest_CFLAGS = $(AM_CFLAGS)
-voltest_LDADD = $(AM_LDADD)
+voltest_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la
 voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit.h util.h log.h idxset.c idxset.h
+cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
 cpulimit_test_CFLAGS = $(AM_CFLAGS)
-cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
+cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolypcore.la
 cpulimit_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c log.c cpulimit.h util.h log.h idxset.c idxset.h
+cpulimit_test2_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
 cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
-cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la
+cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop-@PA_MAJORMINOR@.la libpolypcore.la
 cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
@@ -250,29 +249,29 @@ mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 ###################################
 
 polypinclude_HEADERS = \
-               cdecl.h \
-               channelmap.h \
-               glib-mainloop.h \
-               mainloop.h \
-               mainloop-api.h \
-               mainloop-signal.h \
-               polyplib.h \
-               polyplib-context.h \
-               polyplib-def.h \
-               polyplib-error.h \
-               polyplib-introspect.h \
-               polyplib-operation.h \
-               polyplib-scache.h \
-               polyplib-simple.h \
-               polyplib-stream.h \
-               polyplib-subscribe.h \
-               polyplib-version.h \
-               sample.h \
-               volume.h
+               polyp/cdecl.h \
+               polyp/channelmap.h \
+               polyp/glib-mainloop.h \
+               polyp/mainloop.h \
+               polyp/mainloop-api.h \
+               polyp/mainloop-signal.h \
+               polyp/polyplib.h \
+               polyp/polyplib-context.h \
+               polyp/polyplib-def.h \
+               polyp/polyplib-error.h \
+               polyp/polyplib-introspect.h \
+               polyp/polyplib-operation.h \
+               polyp/polyplib-scache.h \
+               polyp/polyplib-simple.h \
+               polyp/polyplib-stream.h \
+               polyp/polyplib-subscribe.h \
+               polyp/polyplib-version.h \
+               polyp/sample.h \
+               polyp/volume.h
 
 if HAVE_HOWL
 polypinclude_HEADERS += \
-               polyplib-browser.h
+               polyp/polyplib-browser.h
 endif
 
 lib_LTLIBRARIES = \
@@ -296,55 +295,59 @@ lib_LTLIBRARIES += \
                libpolyp-mainloop-glib12-@PA_MAJORMINOR@.la
 endif
 
+# Public interface
 libpolyp_@PA_MAJORMINOR@_la_SOURCES = \
-               authkey.c authkey.h \
-               cdecl.h \
-               client-conf.c client-conf.h \
-               conf-parser.c conf-parser.h \
-               dllmain.c \
-               dynarray.c dynarray.h \
-               gcc-printf.h \
-               idxset.c idxset.h \
-               iochannel.c iochannel.h \
-               llist.h \
-               log.c log.h \
-               mainloop-api.c mainloop-api.h \
-               mcalign.c mcalign.h \
-               memblock.c memblock.h \
-               memchunk.c memchunk.h \
-               native-common.h \
-               packet.c packet.h \
-               parseaddr.c parseaddr.h \
-               pdispatch.c pdispatch.h \
-               polyplib.h \
-               polyplib-context.c polyplib-context.h \
-               polyplib-def.h \
-               polyplib-internal.h \
-               polyplib-introspect.c polyplib-introspect.h \
-               polyplib-operation.c polyplib-operation.h \
-               polyplib-scache.c polyplib-scache.h \
-               polyplib-stream.c polyplib-stream.h \
-               polyplib-subscribe.c polyplib-subscribe.h \
-               pstream.c pstream.h \
-               pstream-util.c pstream-util.h \
-               queue.c queue.h \
-               random.c random.h \
-               sample.c sample.h \
-               socket-client.c socket-client.h \
-               socket-util.c socket-util.h \
-               strbuf.c strbuf.h \
-               strlist.c strlist.h \
-               tagstruct.c tagstruct.h \
-               util.c util.h \
-               winsock.h \
-               xmalloc.c xmalloc.h \
-               channelmap.c channelmap.h \
-               volume.c volume.h
+               polyp/cdecl.h \
+               polyp/channelmap.c polyp/channelmap.h \
+               polyp/client-conf.c polyp/client-conf.h \
+               polyp/llist.h \
+               polyp/mainloop-api.c polyp/mainloop-api.h \
+               polyp/polyplib.h \
+               polyp/polyplib-context.c polyp/polyplib-context.h \
+               polyp/polyplib-def.h \
+               polyp/polyplib-internal.h \
+               polyp/polyplib-introspect.c polyp/polyplib-introspect.h \
+               polyp/polyplib-operation.c polyp/polyplib-operation.h \
+               polyp/polyplib-scache.c polyp/polyplib-scache.h \
+               polyp/polyplib-stream.c polyp/polyplib-stream.h \
+               polyp/polyplib-subscribe.c polyp/polyplib-subscribe.h \
+               polyp/sample.c polyp/sample.h \
+               polyp/volume.c polyp/volume.h
+
+# Internal stuff that is shared with libpolypcore
+libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
+               polypcore/authkey.c polypcore/authkey.h \
+               polypcore/conf-parser.c polypcore/conf-parser.h \
+               polypcore/dllmain.c \
+               polypcore/dynarray.c polypcore/dynarray.h \
+               polypcore/gccmacro.h \
+               polypcore/idxset.c polypcore/idxset.h \
+               polypcore/iochannel.c polypcore/iochannel.h \
+               polypcore/log.c polypcore/log.h \
+               polypcore/mcalign.c polypcore/mcalign.h \
+               polypcore/memblock.c polypcore/memblock.h \
+               polypcore/memchunk.c polypcore/memchunk.h \
+               polypcore/native-common.h \
+               polypcore/packet.c polypcore/packet.h \
+               polypcore/parseaddr.c polypcore/parseaddr.h \
+               polypcore/pdispatch.c polypcore/pdispatch.h \
+               polypcore/pstream.c polypcore/pstream.h \
+               polypcore/pstream-util.c polypcore/pstream-util.h \
+               polypcore/queue.c polypcore/queue.h \
+               polypcore/random.c polypcore/random.h \
+               polypcore/socket-client.c polypcore/socket-client.h \
+               polypcore/socket-util.c polypcore/socket-util.h \
+               polypcore/strbuf.c polypcore/strbuf.h \
+               polypcore/strlist.c polypcore/strlist.h \
+               polypcore/tagstruct.c polypcore/tagstruct.h \
+               polypcore/util.c polypcore/util.h \
+               polypcore/winsock.h \
+               polypcore/xmalloc.c polypcore/xmalloc.h
 
 if HAVE_X11
 libpolyp_@PA_MAJORMINOR@_la_SOURCES += \
-               client-conf-x11.c client-conf-x11.h \
-               x11prop.c x11prop.h
+               polyp/client-conf-x11.c polyp/client-conf-x11.h \
+               polypcore/x11prop.c polypcore/x11prop.h
 endif
 
 libpolyp_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
@@ -361,36 +364,35 @@ libpolyp_@PA_MAJORMINOR@_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
 libpolyp_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS)
 endif
 
-libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyplib-error.c polyplib-error.h
+libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-error.c polyp/polyplib-error.h
 libpolyp_error_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
 libpolyp_error_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la
 libpolyp_error_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
 
 libpolyp_mainloop_@PA_MAJORMINOR@_la_SOURCES = \
-               mainloop.c mainloop.h \
-               mainloop-api.h mainloop-api.c \
-               mainloop-signal.c mainloop-signal.h \
-               poll.c poll.h
+               polyp/mainloop.c polyp/mainloop.h \
+               polyp/mainloop-signal.c polyp/mainloop-signal.h \
+               polypcore/poll.c polypcore/poll.h
 libpolyp_mainloop_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
 libpolyp_mainloop_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la $(WINSOCK_LIBS)
 libpolyp_mainloop_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
 
-libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyplib-simple.c polyplib-simple.h 
+libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-simple.c polyp/polyplib-simple.h 
 libpolyp_simple_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS)
 libpolyp_simple_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
 libpolyp_simple_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
 
-libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyplib-browser.c polyplib-browser.h 
+libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-browser.c polyp/polyplib-browser.h 
 libpolyp_browse_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
 libpolyp_browse_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la $(HOWL_LIBS)
 libpolyp_browse_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0 
 
-libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib-mainloop.c
+libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_SOURCES = polyp/glib-mainloop.h polyp/glib-mainloop.c
 libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
 libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB20_LIBS)
 libpolyp_mainloop_glib_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
 
-libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib12-mainloop.c
+libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_SOURCES = polyp/glib-mainloop.h polyp/glib12-mainloop.c
 libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
 libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB12_LIBS)
 libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
@@ -399,90 +401,97 @@ libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0
 #      Daemon core library        #
 ###################################
 
-polypinclude_HEADERS += \
-               cli-command.h \
-               client.h \
-               core.h \
-               dynarray.h \
-               endianmacros.h \
-               hashmap.h \
-               idxset.h \
-               iochannel.h \
-               memblock.h \
-               memblockq.h \
-               memchunk.h \
-               modargs.h \
-               module.h \
-               namereg.h \
-               queue.h \
-               resampler.h \
-               sample-util.h \
-               sink.h \
-               sink-input.h \
-               sioman.h \
-               socket-server.h \
-               socket-client.h \
-               socket-util.h \
-               source.h \
-               source-output.h \
-               strbuf.h \
-               tokenizer.h \
-               tagstruct.h \
-               util.h
+polypcoreinclude_HEADERS = \
+               polypcore/cli-command.h \
+               polypcore/client.h \
+               polypcore/core.h \
+               polypcore/dynarray.h \
+               polypcore/endianmacros.h \
+               polypcore/hashmap.h \
+               polypcore/idxset.h \
+               polypcore/iochannel.h \
+               polypcore/log.h \
+               polypcore/memblock.h \
+               polypcore/memblockq.h \
+               polypcore/memchunk.h \
+               polypcore/modargs.h \
+               polypcore/module.h \
+               polypcore/namereg.h \
+               polypcore/queue.h \
+               polypcore/resampler.h \
+               polypcore/sample-util.h \
+               polypcore/sink.h \
+               polypcore/sink-input.h \
+               polypcore/sioman.h \
+               polypcore/socket-server.h \
+               polypcore/socket-client.h \
+               polypcore/socket-util.h \
+               polypcore/source.h \
+               polypcore/source-output.h \
+               polypcore/strbuf.h \
+               polypcore/tokenizer.h \
+               polypcore/tagstruct.h \
+               polypcore/util.h
 
 lib_LTLIBRARIES += libpolypcore.la
 
+# Some public stuff is used even in the core.
 libpolypcore_la_SOURCES = \
-               autoload.c autoload.h \
-               cli-command.c cli-command.h \
-               cli-text.c cli-text.h \
-               client.c client.h \
-               core.c core.h \
-               dllmain.c \
-               dynarray.c dynarray.h \
-               endianmacros.h \
-               g711.c g711.h \
-               hashmap.c hashmap.h \
-               idxset.c idxset.h \
-               log.c log.h \
-               mainloop.c mainloop.h \
-               mainloop-api.c mainloop-api.h \
-               mainloop-signal.c mainloop-signal.h \
-               mcalign.c mcalign.h \
-               memblock.c memblock.h \
-               memblockq.c memblockq.h \
-               memchunk.c memchunk.h \
-               modargs.c modargs.h \
-               modinfo.c modinfo.h \
-               module.c module.h \
-               namereg.c namereg.h \
-               play-memchunk.c play-memchunk.h \
-               poll.c poll.h \
-               props.c props.h \
-               queue.c queue.h \
-               random.c random.h \
-               resampler.c resampler.h \
-               sample.c sample.h \
-               sample-util.c sample-util.h \
-               scache.c scache.h \
-               sconv.c sconv.h \
-               sconv-s16be.c sconv-s16be.h \
-               sconv-s16le.c sconv-s16le.h \
-               sink.c sink.h \
-               sink-input.c sink-input.h \
-               sioman.c sioman.h \
-               sound-file.c sound-file.h \
-               sound-file-stream.c sound-file-stream.h \
-               source.c source.h \
-               source-output.c source-output.h \
-               strbuf.c strbuf.h \
-               subscribe.c subscripe.h \
-               tokenizer.c tokenizer.h \
-               util.c util.h \
-               winsock.h \
-               xmalloc.c xmalloc.h \
-               volume.c volume.h \
-               channelmap.c channelmap.h
+               polyp/channelmap.c polyp/channelmap.h \
+               polyp/mainloop.c polyp/mainloop.h \
+               polyp/mainloop-api.c polyp/mainloop-api.h \
+               polyp/mainloop-signal.c polyp/mainloop-signal.h \
+               polyp/sample.c polyp/sample.h \
+               polyp/volume.c polyp/volume.h
+
+# Pure core stuff (some are shared in libpolyp though).
+libpolypcore_la_SOURCES += \
+               polypcore/autoload.c polypcore/autoload.h \
+               polypcore/cli-command.c polypcore/cli-command.h \
+               polypcore/cli-text.c polypcore/cli-text.h \
+               polypcore/client.c polypcore/client.h \
+               polypcore/conf-parser.c polypcore/conf-parser.h \
+               polypcore/core.c polypcore/core.h \
+               polypcore/dllmain.c \
+               polypcore/dynarray.c polypcore/dynarray.h \
+               polypcore/endianmacros.h \
+               polypcore/g711.c polypcore/g711.h \
+               polypcore/hashmap.c polypcore/hashmap.h \
+               polypcore/idxset.c polypcore/idxset.h \
+               polypcore/log.c polypcore/log.h \
+               polypcore/mcalign.c polypcore/mcalign.h \
+               polypcore/memblock.c polypcore/memblock.h \
+               polypcore/memblockq.c polypcore/memblockq.h \
+               polypcore/memchunk.c polypcore/memchunk.h \
+               polypcore/modargs.c polypcore/modargs.h \
+               polypcore/modinfo.c polypcore/modinfo.h \
+               polypcore/module.c polypcore/module.h \
+               polypcore/namereg.c polypcore/namereg.h \
+               polypcore/pid.c polypcore/pid.h \
+               polypcore/play-memchunk.c polypcore/play-memchunk.h \
+               polypcore/poll.c polypcore/poll.h \
+               polypcore/props.c polypcore/props.h \
+               polypcore/queue.c polypcore/queue.h \
+               polypcore/random.c polypcore/random.h \
+               polypcore/resampler.c polypcore/resampler.h \
+               polypcore/sample-util.c polypcore/sample-util.h \
+               polypcore/scache.c polypcore/scache.h \
+               polypcore/sconv.c polypcore/sconv.h \
+               polypcore/sconv-s16be.c polypcore/sconv-s16be.h \
+               polypcore/sconv-s16le.c polypcore/sconv-s16le.h \
+               polypcore/sink.c polypcore/sink.h \
+               polypcore/sink-input.c polypcore/sink-input.h \
+               polypcore/sioman.c polypcore/sioman.h \
+               polypcore/sound-file.c polypcore/sound-file.h \
+               polypcore/sound-file-stream.c polypcore/sound-file-stream.h \
+               polypcore/source.c polypcore/source.h \
+               polypcore/source-output.c polypcore/source-output.h \
+               polypcore/strbuf.c polypcore/strbuf.h \
+               polypcore/subscribe.c polypcore/subscribe.h \
+               polypcore/tokenizer.c polypcore/tokenizer.h \
+               polypcore/util.c polypcore/util.h \
+               polypcore/winsock.h \
+               polypcore/xmalloc.c polypcore/xmalloc.h
 
 libpolypcore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
 libpolypcore_la_LDFLAGS = -avoid-version
@@ -540,117 +549,117 @@ modlib_LTLIBRARIES += \
                libhowl-wrap.la
 endif
 
-libprotocol_simple_la_SOURCES = protocol-simple.c protocol-simple.h
+libprotocol_simple_la_SOURCES = polypcore/protocol-simple.c polypcore/protocol-simple.h
 libprotocol_simple_la_LDFLAGS = -avoid-version
 libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-server.la libiochannel.la
 
 libsocket_server_la_SOURCES = \
-               inet_ntop.c inet_ntop.h \
-               socket-server.c socket-server.h
+               polypcore/inet_ntop.c polypcore/inet_ntop.h \
+               polypcore/socket-server.c polypcore/socket-server.h
 libsocket_server_la_LDFLAGS = -avoid-version
 libsocket_server_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS)
 
-libsocket_client_la_SOURCES = socket-client.c socket-client.h
+libsocket_client_la_SOURCES = polypcore/socket-client.c polypcore/socket-client.h
 libsocket_client_la_LDFLAGS = -avoid-version
 libsocket_client_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la libparseaddr.la $(LIBASYNCNS_LIBS) $(WINSOCK_LIBS)
 libsocket_client_la_CFLAGS = $(AM_CFLAGS) $(LIBASYNCNS_CFLAGS)
 
-libparseaddr_la_SOURCES = parseaddr.c parseaddr.h
+libparseaddr_la_SOURCES = polypcore/parseaddr.c polypcore/parseaddr.h
 libparseaddr_la_LDFLAGS = -avoid-version
 libparseaddr_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-libpstream_la_SOURCES = pstream.c pstream.h
+libpstream_la_SOURCES = polypcore/pstream.c polypcore/pstream.h
 libpstream_la_LDFLAGS = -avoid-version
 libpstream_la_LIBADD = $(AM_LIBADD) libpolypcore.la libpacket.la libiochannel.la $(WINSOCK_LIBS)
 
-libpstream_util_la_SOURCES = pstream-util.c pstream-util.h
+libpstream_util_la_SOURCES = polypcore/pstream-util.c polypcore/pstream-util.h
 libpstream_util_la_LDFLAGS = -avoid-version
 libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
 
-libpdispatch_la_SOURCES = pdispatch.c pdispatch.h
+libpdispatch_la_SOURCES = polypcore/pdispatch.c polypcore/pdispatch.h
 libpdispatch_la_LDFLAGS = -avoid-version
 libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpolypcore.la
 
-libiochannel_la_SOURCES = iochannel.c iochannel.h
+libiochannel_la_SOURCES = polypcore/iochannel.c polypcore/iochannel.h
 libiochannel_la_LDFLAGS = -avoid-version
 libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpolypcore.la $(WINSOCK_LIBS)
 
-libpacket_la_SOURCES = packet.c packet.h
+libpacket_la_SOURCES = polypcore/packet.c polypcore/packet.h
 libpacket_la_LDFLAGS = -avoid-version
 libpacket_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-libioline_la_SOURCES = ioline.c ioline.h
+libioline_la_SOURCES = polypcore/ioline.c polypcore/ioline.h
 libioline_la_LDFLAGS = -avoid-version
 libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpolypcore.la
 
-libcli_la_SOURCES = cli.c cli.h
+libcli_la_SOURCES = polypcore/cli.c polypcore/cli.h
 libcli_la_CPPFLAGS = $(AM_CPPFLAGS)
 libcli_la_LDFLAGS = -avoid-version
 libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpolypcore.la
 
-libstrlist_la_SOURCES = strlist.c strlist.h
+libstrlist_la_SOURCES = polypcore/strlist.c polypcore/strlist.h
 libstrlist_la_LDFLAGS = -avoid-version
 libstrlist_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-libprotocol_cli_la_SOURCES = protocol-cli.c protocol-cli.h
+libprotocol_cli_la_SOURCES = polypcore/protocol-cli.c polypcore/protocol-cli.h
 libprotocol_cli_la_LDFLAGS = -avoid-version
 libprotocol_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpolypcore.la
 
-libprotocol_http_la_SOURCES = protocol-http.c protocol-http.h
+libprotocol_http_la_SOURCES = polypcore/protocol-http.c polypcore/protocol-http.h
 libprotocol_http_la_LDFLAGS = -avoid-version
 libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpolypcore.la libiochannel.la
 
-libprotocol_native_la_SOURCES = protocol-native.c protocol-native.h native-common.h
+libprotocol_native_la_SOURCES = polypcore/protocol-native.c polypcore/protocol-native.h polypcore/native-common.h
 libprotocol_native_la_LDFLAGS = -avoid-version
 libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpolypcore.la libiochannel.la
 
-libtagstruct_la_SOURCES = tagstruct.c tagstruct.h
+libtagstruct_la_SOURCES = polypcore/tagstruct.c polypcore/tagstruct.h
 libtagstruct_la_LDFLAGS = -avoid-version
 libtagstruct_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(WINSOCK_LIBS)
 
-libprotocol_esound_la_SOURCES = protocol-esound.c protocol-esound.h esound.h
+libprotocol_esound_la_SOURCES = polypcore/protocol-esound.c polypcore/protocol-esound.h polypcore/esound.h
 libprotocol_esound_la_LDFLAGS = -avoid-version
 libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpolypcore.la
 
-libauthkey_la_SOURCES = authkey.c authkey.h
+libauthkey_la_SOURCES = polypcore/authkey.c polypcore/authkey.h
 libauthkey_la_LDFLAGS = -avoid-version
 libauthkey_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-libauthkey_prop_la_SOURCES = authkey-prop.c authkey-prop.h
+libauthkey_prop_la_SOURCES = polypcore/authkey-prop.c polypcore/authkey-prop.h
 libauthkey_prop_la_LDFLAGS = -avoid-version
 libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-libsocket_util_la_SOURCES = socket-util.c socket-util.h
+libsocket_util_la_SOURCES = polypcore/socket-util.c polypcore/socket-util.h
 libsocket_util_la_LDFLAGS = -avoid-version
 libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS)
 
 # X11
 
-libx11wrap_la_SOURCES = x11wrap.c x11wrap.h
+libx11wrap_la_SOURCES = polypcore/x11wrap.c polypcore/x11wrap.h
 libx11wrap_la_LDFLAGS = -avoid-version
 libx11wrap_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
 
-libx11prop_la_SOURCES = x11prop.c x11prop.h
+libx11prop_la_SOURCES = polypcore/x11prop.c polypcore/x11prop.h
 libx11prop_la_LDFLAGS = -avoid-version
 libx11prop_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 libx11prop_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
 
 # OSS
 
-liboss_util_la_SOURCES = oss-util.c oss-util.h
+liboss_util_la_SOURCES = polypcore/oss-util.c polypcore/oss-util.h
 liboss_util_la_LDFLAGS = -avoid-version
 
 # ALSA
 
-libalsa_util_la_SOURCES = alsa-util.c alsa-util.h
+libalsa_util_la_SOURCES = polypcore/alsa-util.c polypcore/alsa-util.h
 libalsa_util_la_LDFLAGS = -avoid-version
 libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS)
 libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 # HOWL
 
-libhowl_wrap_la_SOURCES = howl-wrap.c howl-wrap.h
+libhowl_wrap_la_SOURCES = polypcore/howl-wrap.c polypcore/howl-wrap.h
 libhowl_wrap_la_LDFLAGS = -avoid-version
 libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS)
 libhowl_wrap_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
@@ -752,268 +761,268 @@ endif
 # These are generated by a M4 script
 
 SYMDEF_FILES = \
-               module-cli-symdef.h \
-               module-cli-protocol-tcp-symdef.h \
-               module-cli-protocol-tcp6-symdef.h \
-               module-cli-protocol-unix-symdef.h \
-               module-pipe-sink-symdef.h \
-               module-pipe-source-symdef.h \
-               module-simple-protocol-tcp-symdef.h \
-               module-simple-protocol-tcp6-symdef.h \
-               module-simple-protocol-unix-symdef.h \
-               module-esound-protocol-tcp-symdef.h \
-               module-esound-protocol-tcp6-symdef.h \
-               module-esound-protocol-unix-symdef.h \
-               module-native-protocol-tcp-symdef.h \
-               module-native-protocol-tcp6-symdef.h \
-               module-native-protocol-unix-symdef.h \
-               module-native-protocol-fd-symdef.h \
-               module-sine-symdef.h \
-               module-combine-symdef.h \
-               module-esound-compat-spawnfd-symdef.h \
-               module-esound-compat-spawnpid-symdef.h \
-               module-match-symdef.h \
-               module-tunnel-sink-symdef.h \
-               module-tunnel-source-symdef.h \
-               module-null-sink-symdef.h \
-               module-esound-sink-symdef.h \
-               module-zeroconf-publish-symdef.h \
-               module-lirc-symdef.h \
-               module-mmkbd-evdev-symdef.h \
-               module-http-protocol-tcp-symdef.h \
-               module-http-protocol-tcp6-symdef.h \
-               module-http-protocol-unix-symdef.h \
-               module-x11-bell-symdef.h \
-               module-x11-publish-symdef.h \
-               module-oss-symdef.h \
-               module-oss-mmap-symdef.h \
-               module-alsa-sink-symdef.h \
-               module-alsa-source-symdef.h \
-               module-solaris-symdef.h \
-               module-waveout-symdef.h \
-               module-detect-symdef.h
+               modules/module-cli-symdef.h \
+               modules/module-cli-protocol-tcp-symdef.h \
+               modules/module-cli-protocol-tcp6-symdef.h \
+               modules/module-cli-protocol-unix-symdef.h \
+               modules/module-pipe-sink-symdef.h \
+               modules/module-pipe-source-symdef.h \
+               modules/module-simple-protocol-tcp-symdef.h \
+               modules/module-simple-protocol-tcp6-symdef.h \
+               modules/module-simple-protocol-unix-symdef.h \
+               modules/module-esound-protocol-tcp-symdef.h \
+               modules/module-esound-protocol-tcp6-symdef.h \
+               modules/module-esound-protocol-unix-symdef.h \
+               modules/module-native-protocol-tcp-symdef.h \
+               modules/module-native-protocol-tcp6-symdef.h \
+               modules/module-native-protocol-unix-symdef.h \
+               modules/module-native-protocol-fd-symdef.h \
+               modules/module-sine-symdef.h \
+               modules/module-combine-symdef.h \
+               modules/module-esound-compat-spawnfd-symdef.h \
+               modules/module-esound-compat-spawnpid-symdef.h \
+               modules/module-match-symdef.h \
+               modules/module-tunnel-sink-symdef.h \
+               modules/module-tunnel-source-symdef.h \
+               modules/module-null-sink-symdef.h \
+               modules/module-esound-sink-symdef.h \
+               modules/module-zeroconf-publish-symdef.h \
+               modules/module-lirc-symdef.h \
+               modules/module-mmkbd-evdev-symdef.h \
+               modules/module-http-protocol-tcp-symdef.h \
+               modules/module-http-protocol-tcp6-symdef.h \
+               modules/module-http-protocol-unix-symdef.h \
+               modules/module-x11-bell-symdef.h \
+               modules/module-x11-publish-symdef.h \
+               modules/module-oss-symdef.h \
+               modules/module-oss-mmap-symdef.h \
+               modules/module-alsa-sink-symdef.h \
+               modules/module-alsa-source-symdef.h \
+               modules/module-solaris-symdef.h \
+               modules/module-waveout-symdef.h \
+               modules/module-detect-symdef.h
 
 EXTRA_DIST += $(SYMDEF_FILES)
 BUILT_SOURCES += $(SYMDEF_FILES)
 
-$(SYMDEF_FILES): module-defs.h.m4
+$(SYMDEF_FILES): modules/module-defs.h.m4
        $(M4) -Dfname="$@" $< > $@
 
 # Simple protocol
 
-module_simple_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
 module_simple_protocol_tcp_la_LDFLAGS = -module -avoid-version
 module_simple_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la
 
-module_simple_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_simple_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
 module_simple_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
 module_simple_protocol_tcp6_la_LDFLAGS = -module -avoid-version
 module_simple_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la
 
-module_simple_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_simple_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
 module_simple_protocol_unix_la_LDFLAGS = -module -avoid-version
 module_simple_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la libsocket-util.la
 
 # CLI protocol
 
-module_cli_la_SOURCES = module-cli.c
+module_cli_la_SOURCES = modules/module-cli.c
 module_cli_la_LDFLAGS = -module -avoid-version
 module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la libpolypcore.la
 
-module_cli_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_cli_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_cli_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
 module_cli_protocol_tcp_la_LDFLAGS = -module -avoid-version
 module_cli_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la
 
-module_cli_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_cli_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
 module_cli_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
 module_cli_protocol_tcp6_la_LDFLAGS = -module -avoid-version
 module_cli_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la
 
-module_cli_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_cli_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_cli_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
 module_cli_protocol_unix_la_LDFLAGS = -module -avoid-version
 module_cli_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la libsocket-util.la
 
 # HTTP protocol
 
-module_http_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_http_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_http_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
 module_http_protocol_tcp_la_LDFLAGS = -module -avoid-version
 module_http_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la
 
-module_http_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_http_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
 module_http_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
 module_http_protocol_tcp6_la_LDFLAGS = -module -avoid-version
 module_http_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la
 
-module_http_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_http_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_http_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
 module_http_protocol_unix_la_LDFLAGS = -module -avoid-version
 module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la libsocket-util.la
 
 # Native protocol
 
-module_native_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_native_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_native_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
 module_native_protocol_tcp_la_LDFLAGS = -module -avoid-version
 module_native_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la
 
-module_native_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_native_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
 module_native_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
 module_native_protocol_tcp6_la_LDFLAGS = -module -avoid-version
 module_native_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la
 
-module_native_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_native_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_native_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
 module_native_protocol_unix_la_LDFLAGS = -module -avoid-version
 module_native_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la
 
-module_native_protocol_fd_la_SOURCES = module-native-protocol-fd.c
+module_native_protocol_fd_la_SOURCES = modules/module-native-protocol-fd.c
 module_native_protocol_fd_la_CFLAGS = $(AM_CFLAGS)
 module_native_protocol_fd_la_LDFLAGS = -module -avoid-version
 module_native_protocol_fd_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la libiochannel.la
 
 # EsounD protocol
 
-module_esound_protocol_tcp_la_SOURCES = module-protocol-stub.c
+module_esound_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_esound_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
 module_esound_protocol_tcp_la_LDFLAGS = -module -avoid-version
 module_esound_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la
 
-module_esound_protocol_tcp6_la_SOURCES = module-protocol-stub.c
+module_esound_protocol_tcp6_la_SOURCES = modules/module-protocol-stub.c
 module_esound_protocol_tcp6_la_CFLAGS = -DUSE_TCP6_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
 module_esound_protocol_tcp6_la_LDFLAGS = -module -avoid-version
 module_esound_protocol_tcp6_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la
 
-module_esound_protocol_unix_la_SOURCES = module-protocol-stub.c
+module_esound_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_esound_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
 module_esound_protocol_unix_la_LDFLAGS = -module -avoid-version
 module_esound_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la libsocket-util.la
 
-module_esound_compat_spawnfd_la_SOURCES = module-esound-compat-spawnfd.c
+module_esound_compat_spawnfd_la_SOURCES = modules/module-esound-compat-spawnfd.c
 module_esound_compat_spawnfd_la_LDFLAGS = -module -avoid-version
 module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-module_esound_compat_spawnpid_la_SOURCES = module-esound-compat-spawnpid.c
+module_esound_compat_spawnpid_la_SOURCES = modules/module-esound-compat-spawnpid.c
 module_esound_compat_spawnpid_la_LDFLAGS = -module -avoid-version
 module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-module_esound_sink_la_SOURCES = module-esound-sink.c
+module_esound_sink_la_SOURCES = modules/module-esound-sink.c
 module_esound_sink_la_LDFLAGS = -module -avoid-version
 module_esound_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-client.la libauthkey.la
 
 # Pipes
 
-module_pipe_sink_la_SOURCES = module-pipe-sink.c
+module_pipe_sink_la_SOURCES = modules/module-pipe-sink.c
 module_pipe_sink_la_LDFLAGS = -module -avoid-version
 module_pipe_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la
 
-module_pipe_source_la_SOURCES = module-pipe-source.c
+module_pipe_source_la_SOURCES = modules/module-pipe-source.c
 module_pipe_source_la_LDFLAGS = -module -avoid-version
 module_pipe_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la
 
 # Fake sources/sinks
 
-module_sine_la_SOURCES = module-sine.c
+module_sine_la_SOURCES = modules/module-sine.c
 module_sine_la_LDFLAGS = -module -avoid-version
 module_sine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-module_null_sink_la_SOURCES = module-null-sink.c
+module_null_sink_la_SOURCES = modules/module-null-sink.c
 module_null_sink_la_LDFLAGS = -module -avoid-version
 module_null_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
 # Couplings
 
-module_combine_la_SOURCES = module-combine.c
+module_combine_la_SOURCES = modules/module-combine.c
 module_combine_la_LDFLAGS = -module -avoid-version
 module_combine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-module_match_la_SOURCES = module-match.c
+module_match_la_SOURCES = modules/module-match.c
 module_match_la_LDFLAGS = -module -avoid-version
 module_match_la_LIBADD = $(AM_LIBADD) libpolypcore.la
 
-module_tunnel_sink_la_SOURCES = module-tunnel.c
+module_tunnel_sink_la_SOURCES = modules/module-tunnel.c
 module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS)
 module_tunnel_sink_la_LDFLAGS = -module -avoid-version
 module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
 
-module_tunnel_source_la_SOURCES = module-tunnel.c
+module_tunnel_source_la_SOURCES = modules/module-tunnel.c
 module_tunnel_source_la_LDFLAGS = -module -avoid-version
 module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
 
 # X11
 
-module_x11_bell_la_SOURCES = module-x11-bell.c
+module_x11_bell_la_SOURCES = modules/module-x11-bell.c
 module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 module_x11_bell_la_LDFLAGS = -module -avoid-version
 module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la
 
-module_x11_publish_la_SOURCES = module-x11-publish.c
+module_x11_publish_la_SOURCES = modules/module-x11-publish.c
 module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 module_x11_publish_la_LDFLAGS = -module -avoid-version
 module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libauthkey.la libauthkey-prop.la libx11prop.la libstrlist.la
 
 # OSS
 
-module_oss_la_SOURCES = module-oss.c
+module_oss_la_SOURCES = modules/module-oss.c
 module_oss_la_LDFLAGS = -module -avoid-version
 module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la
 
-module_oss_mmap_la_SOURCES = module-oss-mmap.c
+module_oss_mmap_la_SOURCES = modules/module-oss-mmap.c
 module_oss_mmap_la_LDFLAGS = -module -avoid-version
 module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.la
 
 # ALSA
 
-module_alsa_sink_la_SOURCES = module-alsa-sink.c
+module_alsa_sink_la_SOURCES = modules/module-alsa-sink.c
 module_alsa_sink_la_LDFLAGS = -module -avoid-version
 module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
 module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
-module_alsa_source_la_SOURCES = module-alsa-source.c
+module_alsa_source_la_SOURCES = modules/module-alsa-source.c
 module_alsa_source_la_LDFLAGS = -module -avoid-version
 module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
 module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 # Solaris
 
-module_solaris_la_SOURCES = module-solaris.c
+module_solaris_la_SOURCES = modules/module-solaris.c
 module_solaris_la_LDFLAGS = -module -avoid-version
 module_solaris_la_LIBADD = $(AM_LIBADD) libiochannel.la
 
 # HOWL
 
-module_zeroconf_publish_la_SOURCES = module-zeroconf-publish.c
+module_zeroconf_publish_la_SOURCES = modules/module-zeroconf-publish.c
 module_zeroconf_publish_la_LDFLAGS = -module -avoid-version
 module_zeroconf_publish_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libhowl-wrap.la
 module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
 
 # LIRC
 
-module_lirc_la_SOURCES = module-lirc.c
+module_lirc_la_SOURCES = modules/module-lirc.c
 module_lirc_la_LDFLAGS = -module -avoid-version
 module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) 
 module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
 
 # Linux evdev
 
-module_mmkbd_evdev_la_SOURCES = module-mmkbd-evdev.c
+module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c
 module_mmkbd_evdev_la_LDFLAGS = -module -avoid-version
 module_mmkbd_evdev_la_LIBADD = $(AM_LIBADD)
 module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS)
 
 # Windows waveout
 
-module_waveout_la_SOURCES = module-waveout.c
+module_waveout_la_SOURCES = modules/module-waveout.c
 module_waveout_la_LDFLAGS = -module -avoid-version
 module_waveout_la_LIBADD = $(AM_LIBADD) libpolypcore.la -lwinmm
 module_waveout_la_CFLAGS = $(AM_CFLAGS)
 
 # Hardware autodetection module
-module_detect_la_SOURCES = module-detect.c
+module_detect_la_SOURCES = modules/module-detect.c
 module_detect_la_LDFLAGS = -module -avoid-version
 module_detect_la_LIBADD = $(AM_LIBADD)
 module_detect_la_CFLAGS = $(AM_CFLAGS)
@@ -1026,7 +1035,7 @@ suid: polypaudio
        chown root $<
        chmod u+s $<
 
-esdcompat.sh: esdcompat.sh.in Makefile
+utils/esdcompat.sh: utils/esdcompat.sh.in Makefile
        sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
similarity index 100%
rename from polyp/client.conf.in
rename to src/client.conf.in
similarity index 100%
rename from polyp/daemon.conf.in
rename to src/daemon.conf.in
similarity index 98%
rename from polyp/caps.c
rename to src/daemon/caps.c
index 4ecb584..8d42945 100644 (file)
@@ -32,7 +32,7 @@
 #include <sys/capability.h>
 #endif
 
-#include "log.h"
+#include <polypcore/log.h>
 #include "caps.h"
 
 #ifdef HAVE_GETUID
similarity index 100%
rename from polyp/caps.h
rename to src/daemon/caps.h
similarity index 99%
rename from polyp/cmdline.c
rename to src/daemon/cmdline.c
index 5635707..0b5f9ec 100644 (file)
@@ -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 {
similarity index 100%
rename from polyp/cmdline.h
rename to src/daemon/cmdline.h
similarity index 99%
rename from polyp/cpulimit.c
rename to src/daemon/cpulimit.c
index a834b09..6887796 100644 (file)
@@ -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
 
similarity index 97%
rename from polyp/cpulimit.h
rename to src/daemon/cpulimit.h
index 8ca4f8d..f3c5534 100644 (file)
@@ -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
similarity index 98%
rename from polyp/daemon-conf.c
rename to src/daemon/daemon-conf.c
index 103cf46..8fe3c4c 100644 (file)
 #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
similarity index 99%
rename from polyp/daemon-conf.h
rename to src/daemon/daemon-conf.h
index cebc0bd..d513141 100644 (file)
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "log.h"
+#include <polypcore/log.h>
 
 /* The actual command to execute */
 typedef enum pa_daemon_conf_cmd {
similarity index 97%
rename from polyp/dumpmodules.c
rename to src/daemon/dumpmodules.c
index 6864b96..8d8eb0b 100644 (file)
@@ -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-"
 
similarity index 100%
rename from polyp/dumpmodules.h
rename to src/daemon/dumpmodules.h
similarity index 96%
rename from polyp/main.c
rename to src/daemon/main.c
index b5aac85..6be83d8 100644 (file)
@@ -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>
 #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 */
similarity index 100%
rename from polyp/default.pa.in
rename to src/default.pa.in
similarity index 100%
rename from polyp/default.pa.win32
rename to src/default.pa.win32
similarity index 100%
rename from polyp/depmod.py
rename to src/depmod.py
similarity index 96%
rename from polyp/module-alsa-sink.c
rename to src/modules/module-alsa-sink.c
index 9aa220b..48e90e9 100644 (file)
 
 #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")
similarity index 96%
rename from polyp/module-alsa-source.c
rename to src/modules/module-alsa-source.c
index efc84ef..f03e51a 100644 (file)
 
 #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")
similarity index 93%
rename from polyp/module-cli.c
rename to src/modules/module-cli.c
index db0e895..c782ff8 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-combine.c
rename to src/modules/module-combine.c
index 0c21c2f..aabb8f2 100644 (file)
 #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")
similarity index 81%
rename from polyp/module-defs.h.m4
rename to src/modules/module-defs.h.m4
index 2eff25a..8f10d65 100644 (file)
@@ -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)
similarity index 97%
rename from polyp/module-detect.c
rename to src/modules/module-detect.c
index ee75da3..e325b22 100644 (file)
 #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")
similarity index 94%
rename from polyp/module-esound-compat-spawnfd.c
rename to src/modules/module-esound-compat-spawnfd.c
index 5051e4d..5c656be 100644 (file)
 #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")
similarity index 94%
rename from polyp/module-esound-compat-spawnpid.c
rename to src/modules/module-esound-compat-spawnpid.c
index aa8b0f8..5daa129 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-esound-sink.c
rename to src/modules/module-esound-sink.c
index afd5fee..4f72481 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-lirc.c
rename to src/modules/module-lirc.c
index d2e248a..ea8a2bd 100644 (file)
 #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")
similarity index 96%
rename from polyp/module-match.c
rename to src/modules/module-match.c
index e3e7b17..10ceb75 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-mmkbd-evdev.c
rename to src/modules/module-mmkbd-evdev.c
index ec45ec4..b60f786 100644 (file)
 
 #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")
similarity index 92%
rename from polyp/module-native-protocol-fd.c
rename to src/modules/module-native-protocol-fd.c
index 7f09ff9..abc531b 100644 (file)
 #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")
similarity index 94%
rename from polyp/module-null-sink.c
rename to src/modules/module-null-sink.c
index 93abca7..5731a40 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-oss-mmap.c
rename to src/modules/module-oss-mmap.c
index f976cf8..6986b03 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-oss.c
rename to src/modules/module-oss.c
index b5c7ae8..0445841 100644 (file)
 #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")
similarity index 96%
rename from polyp/module-pipe-sink.c
rename to src/modules/module-pipe-sink.c
index 20e220c..6ace377 100644 (file)
 #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")
similarity index 96%
rename from polyp/module-pipe-source.c
rename to src/modules/module-pipe-source.c
index 42f13d4..a7bb0ce 100644 (file)
 #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")
similarity index 94%
rename from polyp/module-protocol-stub.c
rename to src/modules/module-protocol-stub.c
index a031436..469ddce 100644 (file)
 #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"
   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"
   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"
similarity index 96%
rename from polyp/module-sine.c
rename to src/modules/module-sine.c
index 529c061..446e397 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-solaris.c
rename to src/modules/module-solaris.c
index f85e71d..e0745fc 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-tunnel.c
rename to src/modules/module-tunnel.c
index c088dae..5ee10fd 100644 (file)
 #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"
similarity index 98%
rename from polyp/module-waveout.c
rename to src/modules/module-waveout.c
index e9d9f12..8809c31 100644 (file)
 #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")
similarity index 94%
rename from polyp/module-x11-bell.c
rename to src/modules/module-x11-bell.c
index 4fc4a60..d722b73 100644 (file)
 #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")
similarity index 91%
rename from polyp/module-x11-publish.c
rename to src/modules/module-x11-publish.c
index 0116914..dca5d04 100644 (file)
 #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")
similarity index 97%
rename from polyp/module-zeroconf-publish.c
rename to src/modules/module-zeroconf-publish.c
index 7e0a276..45d566a 100644 (file)
 #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")
similarity index 100%
rename from polyp/cdecl.h
rename to src/polyp/cdecl.h
similarity index 100%
rename from polyp/channelmap.c
rename to src/polyp/channelmap.c
similarity index 100%
rename from polyp/channelmap.h
rename to src/polyp/channelmap.h
similarity index 95%
rename from polyp/client-conf-x11.c
rename to src/polyp/client-conf-x11.c
index 4fd7574..83d0bd2 100644 (file)
 #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;
similarity index 97%
rename from polyp/client-conf-x11.h
rename to src/polyp/client-conf-x11.h
index 6445922..8084117 100644 (file)
@@ -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 */
similarity index 96%
rename from polyp/client-conf.c
rename to src/polyp/client-conf.c
index bcd4275..2df201c 100644 (file)
 #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
similarity index 97%
rename from polyp/client-conf.h
rename to src/polyp/client-conf.h
index 7ca2f23..2d8a019 100644 (file)
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "native-common.h"
+#include "../polypcore/native-common.h"
 
 /* A structure containing configuration data for polypaudio clients. */
 
similarity index 99%
rename from polyp/glib-mainloop.c
rename to src/polyp/glib-mainloop.c
index 6f7c1dc..962eb57 100644 (file)
 
 #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;
similarity index 96%
rename from polyp/glib-mainloop.h
rename to src/polyp/glib-mainloop.h
index d3e9859..b4815ed 100644 (file)
@@ -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 */
similarity index 99%
rename from polyp/glib12-mainloop.c
rename to src/polyp/glib12-mainloop.c
index 8bc4483..80a02b1 100644 (file)
 
 #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 */
 
similarity index 96%
rename from polyp/mainloop-api.c
rename to src/polyp/mainloop-api.c
index 3229ec2..a3eaee9 100644 (file)
@@ -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);
similarity index 97%
rename from polyp/mainloop-signal.c
rename to src/polyp/mainloop-signal.c
index 7693603..a03c915 100644 (file)
 #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;
similarity index 97%
rename from polyp/mainloop-signal.h
rename to src/polyp/mainloop-signal.h
index 6ce3137..76065b2 100644 (file)
@@ -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
 
similarity index 99%
rename from polyp/mainloop.c
rename to src/polyp/mainloop.c
index d25af78..3fa9245 100644 (file)
 #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;
similarity index 98%
rename from polyp/mainloop.h
rename to src/polyp/mainloop.h
index 921a070..691f8c5 100644 (file)
@@ -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
 
similarity index 99%
rename from polyp/polyplib-browser.c
rename to src/polyp/polyplib-browser.c
index 6fee84a..9a38948 100644 (file)
@@ -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."
similarity index 98%
rename from polyp/polyplib-context.c
rename to src/polyp/polyplib-context.c
index 15f2e4c..c392f0f 100644 (file)
 #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"
similarity index 97%
rename from polyp/polyplib-error.c
rename to src/polyp/polyplib-error.c
index 50a6727..188d6a9 100644 (file)
@@ -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",
similarity index 97%
rename from polyp/polyplib-error.h
rename to src/polyp/polyplib-error.h
index dbbbf00..1bb9782 100644 (file)
@@ -23,7 +23,7 @@
 ***/
 
 #include <inttypes.h>
-#include "cdecl.h"
+#include <polyp/cdecl.h>
 
 /** \file
  * Error management */
similarity index 93%
rename from polyp/polyplib-internal.h
rename to src/polyp/polyplib-internal.h
index 2959606..b95a20f 100644 (file)
   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)
 
similarity index 99%
rename from polyp/polyplib-introspect.c
rename to src/polyp/polyplib-introspect.c
index 49298a9..0bdffa3 100644 (file)
@@ -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 ***/
 
similarity index 98%
rename from polyp/polyplib-operation.c
rename to src/polyp/polyplib-operation.c
index 68bc8c6..ea336c1 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <assert.h>
 
-#include "xmalloc.h"
+#include <polypcore/xmalloc.h>
 #include "polyplib-internal.h"
 #include "polyplib-operation.h"
 
similarity index 99%
rename from polyp/polyplib-scache.c
rename to src/polyp/polyplib-scache.c
index 01c6482..1315af9 100644 (file)
@@ -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;
similarity index 98%
rename from polyp/polyplib-simple.c
rename to src/polyp/polyplib-simple.c
index e551215..7436f00 100644 (file)
@@ -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;
similarity index 99%
rename from polyp/polyplib-simple.h
rename to src/polyp/polyplib-simple.h
index 0c80f46..b01f30d 100644 (file)
@@ -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
similarity index 99%
rename from polyp/polyplib-stream.c
rename to src/polyp/polyplib-stream.c
index 7b9d686..63c9245 100644 (file)
 #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)
 
similarity index 97%
rename from polyp/polyplib-subscribe.c
rename to src/polyp/polyplib-subscribe.c
index ef90ab0..13fcfb4 100644 (file)
@@ -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;
similarity index 100%
rename from polyp/polyplib.h
rename to src/polyp/polyplib.h
similarity index 100%
rename from polyp/sample.c
rename to src/polyp/sample.c
similarity index 100%
rename from polyp/sample.h
rename to src/polyp/sample.h
similarity index 100%
rename from polyp/volume.c
rename to src/polyp/volume.c
similarity index 100%
rename from polyp/volume.h
rename to src/polyp/volume.h
similarity index 99%
rename from polyp/alsa-util.c
rename to src/polypcore/alsa-util.c
index cc65b8d..7528ee0 100644 (file)
@@ -27,7 +27,7 @@
 #include <asoundlib.h>
 
 #include "alsa-util.h"
-#include "sample.h"
+#include <polyp/sample.h>
 #include "xmalloc.h"
 #include "log.h"
 
similarity index 95%
rename from polyp/alsa-util.h
rename to src/polypcore/alsa-util.h
index d180db3..5d6d663 100644 (file)
@@ -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);
 
similarity index 100%
rename from polyp/authkey.c
rename to src/polypcore/authkey.c
similarity index 100%
rename from polyp/authkey.h
rename to src/polypcore/authkey.h
similarity index 100%
rename from polyp/autoload.c
rename to src/polypcore/autoload.c
similarity index 100%
rename from polyp/autoload.h
rename to src/polypcore/autoload.h
similarity index 99%
rename from polyp/cli-text.c
rename to src/polypcore/cli-text.c
index 328aca4..58248d8 100644 (file)
@@ -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;
similarity index 100%
rename from polyp/cli-text.h
rename to src/polypcore/cli-text.h
similarity index 100%
rename from polyp/cli.c
rename to src/polypcore/cli.c
similarity index 100%
rename from polyp/cli.h
rename to src/polypcore/cli.h
similarity index 100%
rename from polyp/client.c
rename to src/polypcore/client.c
similarity index 100%
rename from polyp/client.h
rename to src/polypcore/client.h
similarity index 100%
rename from polyp/core.c
rename to src/polypcore/core.c
similarity index 97%
rename from polyp/core.h
rename to src/polypcore/core.h
index 9241fcd..f7a9016 100644 (file)
@@ -26,8 +26,8 @@ typedef struct pa_core pa_core;
 
 #include "idxset.h"
 #include "hashmap.h"
-#include "mainloop-api.h"
-#include "sample.h"
+#include <polyp/mainloop-api.h>
+#include <polyp/sample.h>
 #include "memblock.h"
 #include "resampler.h"
 #include "queue.h"
similarity index 100%
rename from polyp/dllmain.c
rename to src/polypcore/dllmain.c
similarity index 100%
rename from polyp/dynarray.c
rename to src/polypcore/dynarray.c
similarity index 100%
rename from polyp/dynarray.h
rename to src/polypcore/dynarray.h
similarity index 100%
rename from polyp/esound.h
rename to src/polypcore/esound.h
similarity index 100%
rename from polyp/g711.c
rename to src/polypcore/g711.c
similarity index 100%
rename from polyp/g711.h
rename to src/polypcore/g711.h
similarity index 100%
rename from polyp/gccmacro.h
rename to src/polypcore/gccmacro.h
similarity index 100%
rename from polyp/hashmap.c
rename to src/polypcore/hashmap.c
similarity index 100%
rename from polyp/hashmap.h
rename to src/polypcore/hashmap.h
similarity index 100%
rename from polyp/howl-wrap.c
rename to src/polypcore/howl-wrap.c
similarity index 100%
rename from polyp/howl-wrap.h
rename to src/polypcore/howl-wrap.h
similarity index 100%
rename from polyp/idxset.c
rename to src/polypcore/idxset.c
similarity index 100%
rename from polyp/idxset.h
rename to src/polypcore/idxset.h
similarity index 100%
rename from polyp/inet_ntop.c
rename to src/polypcore/inet_ntop.c
similarity index 100%
rename from polyp/inet_ntop.h
rename to src/polypcore/inet_ntop.h
similarity index 100%
rename from polyp/iochannel.c
rename to src/polypcore/iochannel.c
similarity index 98%
rename from polyp/iochannel.h
rename to src/polypcore/iochannel.h
index e2b8bcc..7d355d8 100644 (file)
@@ -23,7 +23,7 @@
 ***/
 
 #include <sys/types.h>
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
 
 /* A wrapper around UNIX file descriptors for attaching them to the a
    main event loop. Everytime new data may be read or be written to
similarity index 100%
rename from polyp/ioline.c
rename to src/polypcore/ioline.c
similarity index 100%
rename from polyp/ioline.h
rename to src/polypcore/ioline.h
similarity index 100%
rename from polyp/llist.h
rename to src/polypcore/llist.h
similarity index 100%
rename from polyp/log.c
rename to src/polypcore/log.c
similarity index 100%
rename from polyp/log.h
rename to src/polypcore/log.h
similarity index 100%
rename from polyp/mcalign.c
rename to src/polypcore/mcalign.c
similarity index 100%
rename from polyp/mcalign.h
rename to src/polypcore/mcalign.h
similarity index 100%
rename from polyp/memblock.c
rename to src/polypcore/memblock.c
similarity index 100%
rename from polyp/memblock.h
rename to src/polypcore/memblock.h
similarity index 100%
rename from polyp/memblockq.c
rename to src/polypcore/memblockq.c
similarity index 100%
rename from polyp/memblockq.h
rename to src/polypcore/memblockq.h
similarity index 100%
rename from polyp/memchunk.c
rename to src/polypcore/memchunk.c
similarity index 100%
rename from polyp/memchunk.h
rename to src/polypcore/memchunk.h
similarity index 100%
rename from polyp/modargs.c
rename to src/polypcore/modargs.c
similarity index 98%
rename from polyp/modargs.h
rename to src/polypcore/modargs.h
index 5660537..678ea1a 100644 (file)
@@ -23,7 +23,7 @@
 ***/
 
 #include <inttypes.h>
-#include "sample.h"
+#include <polyp/sample.h>
 #include "core.h"
 
 typedef struct pa_modargs pa_modargs;
similarity index 100%
rename from polyp/modinfo.c
rename to src/polypcore/modinfo.c
similarity index 100%
rename from polyp/modinfo.h
rename to src/polypcore/modinfo.h
similarity index 100%
rename from polyp/module.c
rename to src/polypcore/module.c
similarity index 100%
rename from polyp/module.h
rename to src/polypcore/module.h
similarity index 100%
rename from polyp/namereg.c
rename to src/polypcore/namereg.c
similarity index 100%
rename from polyp/namereg.h
rename to src/polypcore/namereg.h
similarity index 98%
rename from polyp/native-common.h
rename to src/polypcore/native-common.h
index 569f3b7..78ae721 100644 (file)
@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "cdecl.h"
-#include "polyplib-def.h"
+#include <polyp/cdecl.h>
+#include <polyp/polyplib-def.h>
 
 PA_C_DECL_BEGIN
 
similarity index 100%
rename from polyp/oss-util.c
rename to src/polypcore/oss-util.c
similarity index 97%
rename from polyp/oss-util.h
rename to src/polypcore/oss-util.h
index 3ee51cc..6b2746c 100644 (file)
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "sample.h"
+#include <polyp/sample.h>
 
 int pa_oss_open(const char *device, int *mode, int* pcaps);
 int pa_oss_auto_format(int fd, pa_sample_spec *ss);
similarity index 100%
rename from polyp/packet.c
rename to src/polypcore/packet.c
similarity index 100%
rename from polyp/packet.h
rename to src/polypcore/packet.h
similarity index 100%
rename from polyp/parseaddr.c
rename to src/polypcore/parseaddr.c
similarity index 100%
rename from polyp/parseaddr.h
rename to src/polypcore/parseaddr.h
similarity index 100%
rename from polyp/pdispatch.c
rename to src/polypcore/pdispatch.c
similarity index 98%
rename from polyp/pdispatch.h
rename to src/polypcore/pdispatch.h
index 40f5d4c..fdd4d7f 100644 (file)
@@ -25,7 +25,7 @@
 #include <inttypes.h>
 #include "tagstruct.h"
 #include "packet.h"
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
 
 typedef struct pa_pdispatch pa_pdispatch;
 
similarity index 100%
rename from polyp/pid.c
rename to src/polypcore/pid.c
similarity index 100%
rename from polyp/pid.h
rename to src/polypcore/pid.h
similarity index 100%
rename from polyp/poll.c
rename to src/polypcore/poll.c
similarity index 100%
rename from polyp/poll.h
rename to src/polypcore/poll.h
similarity index 100%
rename from polyp/props.c
rename to src/polypcore/props.c
similarity index 100%
rename from polyp/props.h
rename to src/polypcore/props.h
similarity index 99%
rename from polyp/protocol-esound.c
rename to src/polypcore/protocol-esound.c
index 6f004e1..14f237c 100644 (file)
@@ -38,7 +38,7 @@
 #include "sink.h"
 #include "source-output.h"
 #include "source.h"
-#include "sample.h"
+#include <polyp/sample.h>
 #include "scache.h"
 #include "sample-util.h"
 #include "authkey.h"
similarity index 100%
rename from polyp/pstream.c
rename to src/polypcore/pstream.c
similarity index 98%
rename from polyp/pstream.h
rename to src/polypcore/pstream.h
index 77c9280..ec63a98 100644 (file)
@@ -27,7 +27,7 @@
 #include "packet.h"
 #include "memblock.h"
 #include "iochannel.h"
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
 #include "memchunk.h"
 
 typedef struct pa_pstream pa_pstream;
similarity index 100%
rename from polyp/queue.c
rename to src/polypcore/queue.c
similarity index 100%
rename from polyp/queue.h
rename to src/polypcore/queue.h
similarity index 100%
rename from polyp/random.c
rename to src/polypcore/random.c
similarity index 100%
rename from polyp/random.h
rename to src/polypcore/random.h
similarity index 100%
rename from polyp/resampler.c
rename to src/polypcore/resampler.c
similarity index 97%
rename from polyp/resampler.h
rename to src/polypcore/resampler.h
index e14942f..cad48be 100644 (file)
 
 #include <samplerate.h>
 
-#include "sample.h"
+#include <polyp/sample.h>
 #include "memblock.h"
 #include "memchunk.h"
-#include "channelmap.h"
+#include <polyp/channelmap.h>
 
 typedef struct pa_resampler pa_resampler;
 
similarity index 96%
rename from polyp/sample-util.h
rename to src/polypcore/sample-util.h
index e433f9c..d0efbcc 100644 (file)
   USA.
 ***/
 
-#include "sample.h"
+#include <polyp/sample.h>
 #include "memblock.h"
 #include "memchunk.h"
-#include "volume.h"
+#include <polyp/volume.h>
 
 pa_memblock *pa_silence_memblock(pa_memblock* b, const pa_sample_spec *spec);
 void pa_silence_memchunk(pa_memchunk *c, const pa_sample_spec *spec);
similarity index 99%
rename from polyp/scache.c
rename to src/polypcore/scache.c
index 39fa26f..02c7d34 100644 (file)
@@ -43,7 +43,7 @@
 
 #include "scache.h"
 #include "sink-input.h"
-#include "mainloop.h"
+#include <polyp/mainloop.h>
 #include "sample-util.h"
 #include "play-memchunk.h"
 #include "xmalloc.h"
@@ -52,8 +52,8 @@
 #include "sound-file.h"
 #include "util.h"
 #include "log.h"
-#include "channelmap.h"
-#include "volume.h"
+#include <polyp/channelmap.h>
+#include <polyp/volume.h>
 
 #define UNLOAD_POLL_TIME 2
 
similarity index 100%
rename from polyp/scache.h
rename to src/polypcore/scache.h
similarity index 100%
rename from polyp/sconv.c
rename to src/polypcore/sconv.c
similarity index 97%
rename from polyp/sconv.h
rename to src/polypcore/sconv.h
index 2a00521..a0c15c2 100644 (file)
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "sample.h"
+#include <polyp/sample.h>
 
 typedef void (*pa_convert_to_float32ne_func_t)(unsigned n, const void *a, float *b);
 typedef void (*pa_convert_from_float32ne_func_t)(unsigned n, const float *a, void *b);
similarity index 99%
rename from polyp/sink-input.h
rename to src/polypcore/sink-input.h
index 1db993f..a5ad195 100644 (file)
@@ -27,7 +27,7 @@
 typedef struct pa_sink_input pa_sink_input;
 
 #include "sink.h"
-#include "sample.h"
+#include <polyp/sample.h>
 #include "memblockq.h"
 #include "resampler.h"
 #include "module.h"
similarity index 99%
rename from polyp/sink.c
rename to src/polypcore/sink.c
index bb65664..411befe 100644 (file)
@@ -36,7 +36,7 @@
 #include "xmalloc.h"
 #include "subscribe.h"
 #include "log.h"
-#include "polyplib-introspect.h"
+#include <polyp/polyplib-introspect.h>
 
 #define MAX_MIX_CHANNELS 32
 
similarity index 96%
rename from polyp/sink.h
rename to src/polypcore/sink.h
index 33aba23..268461e 100644 (file)
 typedef struct pa_sink pa_sink;
 
 #include "core.h"
-#include "sample.h"
+#include <polyp/sample.h>
 #include "idxset.h"
 #include "source.h"
-#include "channelmap.h"
+#include <polyp/channelmap.h>
 #include "module.h"
-#include "volume.h"
+#include <polyp/volume.h>
 
 #define PA_MAX_INPUTS_PER_SINK 6
 
similarity index 100%
rename from polyp/sioman.c
rename to src/polypcore/sioman.c
similarity index 100%
rename from polyp/sioman.h
rename to src/polypcore/sioman.h
similarity index 98%
rename from polyp/socket-client.h
rename to src/polypcore/socket-client.h
index 40e9629..624880d 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <inttypes.h>
 
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
 #include "iochannel.h"
 
 struct sockaddr;
similarity index 98%
rename from polyp/socket-server.h
rename to src/polypcore/socket-server.h
index 6c5d7ba..4d8bfad 100644 (file)
@@ -23,7 +23,7 @@
 ***/
 
 #include <inttypes.h>
-#include "mainloop-api.h"
+#include <polyp/mainloop-api.h>
 #include "iochannel.h"
 
 /* It is safe to destroy the calling socket_server object from the callback */
similarity index 99%
rename from polyp/sound-file.c
rename to src/polypcore/sound-file.c
index 0048ed7..a81c283 100644 (file)
@@ -29,7 +29,7 @@
 #include <sndfile.h>
 
 #include "sound-file.h"
-#include "sample.h"
+#include <polyp/sample.h>
 #include "log.h"
 
 #define MAX_FILE_SIZE (1024*1024)
similarity index 97%
rename from polyp/sound-file.h
rename to src/polypcore/sound-file.h
index e053427..f3003bb 100644 (file)
@@ -23,7 +23,7 @@
 ***/
 
 #include "memchunk.h"
-#include "sample.h"
+#include <polyp/sample.h>
 
 int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s);
 
similarity index 98%
rename from polyp/source-output.h
rename to src/polypcore/source-output.h
index f8e4b15..4b1cbf1 100644 (file)
@@ -27,7 +27,7 @@
 typedef struct pa_source_output pa_source_output;
 
 #include "source.h"
-#include "sample.h"
+#include <polyp/sample.h>
 #include "memblockq.h"
 #include "resampler.h"
 #include "module.h"
similarity index 100%
rename from polyp/source.c
rename to src/polypcore/source.c
similarity index 97%
rename from polyp/source.h
rename to src/polypcore/source.h
index 823a942..be2fb98 100644 (file)
@@ -26,12 +26,12 @@ typedef struct pa_source pa_source;
 
 #include <inttypes.h>
 #include "core.h"
-#include "sample.h"
+#include <polyp/sample.h>
 #include "idxset.h"
 #include "memblock.h"
 #include "memchunk.h"
 #include "sink.h"
-#include "channelmap.h"
+#include <polyp/channelmap.h>
 #include "module.h"
 
 #define PA_MAX_OUTPUTS_PER_SOURCE 16
similarity index 99%
rename from polyp/strbuf.c
rename to src/polypcore/strbuf.c
index aa20218..dcad5e7 100644 (file)
@@ -29,7 +29,8 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <xmalloc.h>
+
+#include <polypcore/xmalloc.h>
 
 #include "strbuf.h"
 
similarity index 100%
rename from polyp/strbuf.h
rename to src/polypcore/strbuf.h
similarity index 100%
rename from polyp/strlist.c
rename to src/polypcore/strlist.c
similarity index 100%
rename from polyp/strlist.h
rename to src/polypcore/strlist.h
similarity index 100%
rename from polyp/subscribe.c
rename to src/polypcore/subscribe.c
similarity index 100%
rename from polyp/subscribe.h
rename to src/polypcore/subscribe.h
similarity index 100%
rename from polyp/tagstruct.c
rename to src/polypcore/tagstruct.c
similarity index 97%
rename from polyp/tagstruct.h
rename to src/polypcore/tagstruct.h
index b41936f..59db67b 100644 (file)
@@ -27,9 +27,9 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "sample.h"
-#include "channelmap.h"
-#include "volume.h"
+#include <polyp/sample.h>
+#include <polyp/channelmap.h>
+#include <polyp/volume.h>
 
 typedef struct pa_tagstruct pa_tagstruct;
 
similarity index 100%
rename from polyp/tokenizer.c
rename to src/polypcore/tokenizer.c
similarity index 100%
rename from polyp/tokenizer.h
rename to src/polypcore/tokenizer.h
similarity index 100%
rename from polyp/util.c
rename to src/polypcore/util.c
similarity index 99%
rename from polyp/util.h
rename to src/polypcore/util.h
index 95e7b99..3dc6c94 100644 (file)
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 #include "gccmacro.h"
-#include "sample.h"
+#include <polyp/sample.h>
 
 struct timeval;
 
similarity index 100%
rename from polyp/winsock.h
rename to src/polypcore/winsock.h
similarity index 100%
rename from polyp/x11prop.c
rename to src/polypcore/x11prop.c
similarity index 100%
rename from polyp/x11prop.h
rename to src/polypcore/x11prop.h
similarity index 100%
rename from polyp/x11wrap.c
rename to src/polypcore/x11wrap.c
similarity index 100%
rename from polyp/x11wrap.h
rename to src/polypcore/x11wrap.h
similarity index 100%
rename from polyp/xmalloc.c
rename to src/polypcore/xmalloc.c
similarity index 100%
rename from polyp/xmalloc.h
rename to src/polypcore/xmalloc.h
similarity index 93%
rename from polyp/cpulimit-test.c
rename to src/tests/cpulimit-test.c
index 598b2dd..97a8a0d 100644 (file)
 #include <stdio.h>
 #include <signal.h>
 
-#include "cpulimit.h"
-#include "mainloop.h"
-#include "gccmacro.h"
+#include "../daemon/cpulimit.h"
+#include <polyp/mainloop.h>
+#include <polypcore/gccmacro.h>
 
 #ifdef TEST2
-#include "mainloop-signal.h"
+#include <polyp/mainloop-signal.h>
 #endif
 
 /* A simple example for testing the cpulimit subsystem */
similarity index 96%
rename from polyp/mainloop-test.c
rename to src/tests/mainloop-test.c
index ee0f871..f62c969 100644 (file)
 #include <sys/time.h>
 #include <assert.h>
 
-#include "util.h"
-#include "gccmacro.h"
+#include <polypcore/util.h>
+#include <polypcore/gccmacro.h>
 
 #ifdef GLIB_MAIN_LOOP
 
 #include <glib.h>
-#include "glib-mainloop.h"
+#include <polyp/glib-mainloop.h>
 
 static GMainLoop* glib_main_loop = NULL;
 
@@ -46,7 +46,7 @@ static GMainLoop* glib_main_loop = NULL;
 
 
 #else /* GLIB_MAIN_LOOP */
-#include "mainloop.h"
+#include <polyp/mainloop.h>
 #endif /* GLIB_MAIN_LOOP */
 
 static pa_defer_event *de;
similarity index 96%
rename from polyp/mcalign-test.c
rename to src/tests/mcalign-test.c
index c151d8f..861c38c 100644 (file)
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "util.h"
-#include "mcalign.h"
-#include "gccmacro.h"
+#include <polypcore/util.h>
+#include <polypcore/mcalign.h>
+#include <polypcore/gccmacro.h>
 
 /* A simple program for testing pa_mcalign */
 
similarity index 98%
rename from polyp/pacat-simple.c
rename to src/tests/pacat-simple.c
index 2825fee..8b3a7b2 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <polyp/polyplib-simple.h>
 #include <polyp/polyplib-error.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
 
 #define BUFSIZE 1024
 
similarity index 98%
rename from polyp/parec-simple.c
rename to src/tests/parec-simple.c
index 524cc4f..10eaea8 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <polyp/polyplib-simple.h>
 #include <polyp/polyplib-error.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
 
 #define BUFSIZE 1024
 
similarity index 89%
rename from polyp/strlist-test.c
rename to src/tests/strlist-test.c
index c670a10..1454311 100644 (file)
@@ -1,8 +1,8 @@
 #include <stdio.h>
 
-#include "strlist.h"
-#include "xmalloc.h"
-#include "gccmacro.h"
+#include <polypcore/strlist.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char* argv[]) {
     char *t, *u;
similarity index 94%
rename from polyp/voltest.c
rename to src/tests/voltest.c
index 917e04d..58f1da0 100644 (file)
@@ -3,7 +3,7 @@
 #include <stdio.h>
 
 #include <polyp/volume.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
     pa_volume_t v;
similarity index 100%
rename from polyp/pabrowse.c
rename to src/utils/pabrowse.c
similarity index 100%
rename from polyp/pacat.c
rename to src/utils/pacat.c
similarity index 98%
rename from polyp/pacmd.c
rename to src/utils/pacmd.c
index e6c0da6..4054bc2 100644 (file)
@@ -32,9 +32,9 @@
 #include <string.h>
 #include <sys/un.h>
 
-#include "util.h"
-#include "log.h"
-#include "pid.h"
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/pid.h>
 
 int main(PA_GCC_UNUSED int main, PA_GCC_UNUSED char*argv[]) {
     pid_t pid ;
similarity index 100%
rename from polyp/pactl.c
rename to src/utils/pactl.c
similarity index 100%
rename from polyp/paplay.c
rename to src/utils/paplay.c
similarity index 97%
rename from polyp/pax11publish.c
rename to src/utils/pax11publish.c
index 4294783..63ee482 100644 (file)
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include "util.h"
-#include "log.h"
-#include "authkey.h"
-#include "native-common.h"
-#include "client-conf.h"
-#include "x11prop.h"
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/authkey.h>
+#include <polypcore/native-common.h>
+#include <polyp/client-conf.h>
+#include <polypcore/x11prop.h>
 
 int main(int argc, char *argv[]) {
     const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;