Cleaned up the includes after the restructuring. Indicate which headers are

public and which are internal through <> vs "".

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

diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 8d42945949cfc13b0ecad0cca18cc29bc52729ff..e12d33fb04badddd262aec30d368e5e92c48bda0 100644 (file)
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -33,6 +33,7 @@
 #endif
 
 #include <polypcore/log.h>
+
 #include "caps.h"
 
 #ifdef HAVE_GETUID

diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 0b5f9ec758d67f78cf4356ec53c13873654af5c3..b6ab1283a7ec0e7772e5b2f0c2912a7a9863e671 100644 (file)
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -30,11 +30,12 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include "cmdline.h"
 #include <polypcore/util.h>
 #include <polypcore/strbuf.h>
 #include <polypcore/xmalloc.h>
 
+#include "cmdline.h"
+
 /* Argument codes for getopt_long() */
 enum {
     ARG_HELP = 256,

diff --git a/src/daemon/cpulimit.c b/src/daemon/cpulimit.c
index 6887796f2e5c73d30b6aecf7e642e9925cc9ce19..d7a24b8e9f012432a94e30bd48e8a2c8ba22904c 100644 (file)
--- a/src/daemon/cpulimit.c
+++ b/src/daemon/cpulimit.c
@@ -23,10 +23,11 @@
 #include <config.h>
 #endif
 
-#include "cpulimit.h"
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 
+#include "cpulimit.h"
+
 #ifdef HAVE_SIGXCPU
 
 #include <errno.h>

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 8fe3c4cc5d1b4c3c2250ffb2efb0fcd0844d5be2..ecabce4015ab8a6720baa36a633c31499d94ba17 100644 (file)
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -29,13 +29,14 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include "daemon-conf.h"
 #include <polypcore/util.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/strbuf.h>
 #include <polypcore/conf-parser.h>
 #include <polypcore/resampler.h>
 
+#include "daemon-conf.h"
+
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
 #  define DEFAULT_CONFIG_DIR "/etc/polypaudio"

diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c
index 8d8eb0b9f51914acb08b89c380439d3a70f0b770..bf29a68166079ed2b38bd6a26cc74681c7134518 100644 (file)
--- a/src/daemon/dumpmodules.c
+++ b/src/daemon/dumpmodules.c
@@ -29,10 +29,11 @@
 #include <stdio.h>
 #include <ltdl.h>
 
-#include "dumpmodules.h"
 #include <polypcore/modinfo.h>
 #include <polypcore/util.h>
 
+#include "dumpmodules.h"
+
 #define PREFIX "module-"
 
 static void short_info(const char *name, PA_GCC_UNUSED const char *path, pa_modinfo *i) {

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 6be83d8c196ed7b8297737c1f78395dcb2de79bc..638c2f3fd199ee4470bcd1edf602486deea9c5d8 100644 (file)
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -47,26 +47,28 @@
 #include <tcpd.h>
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
+
+#include <polyp/mainloop.h>
+#include <polyp/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 <polypcore/cli-command.h>
+#include <polypcore/log.h>
 #include <polypcore/util.h>
 #include <polypcore/sioman.h>
 #include <polypcore/xmalloc.h>
+#include <polypcore/cli-text.h>
+#include <polypcore/pid.h>
+#include <polypcore/namereg.h>
+
+#include "cmdline.h"
 #include "cpulimit.h"
-#include <polypcore/log.h>
 #include "daemon-conf.h"
 #include "dumpmodules.h"
 #include "caps.h"
-#include <polypcore/cli-text.h>
-#include <polypcore/pid.h>
-#include <polypcore/namereg.h>
 
 #ifdef HAVE_LIBWRAP
 /* Only one instance of these variables */

diff --git a/src/modules/howl-wrap.c b/src/modules/howl-wrap.c
index 77d096ac250db6272632b4680fb48b84ad3bb44b..b3acde55a84ba565989649902581539a502adfaf 100644 (file)
--- a/src/modules/howl-wrap.c
+++ b/src/modules/howl-wrap.c
@@ -21,10 +21,11 @@
 
 #include <assert.h>
 
+#include <polypcore/log.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/props.h>
+
 #include "howl-wrap.h"
-#include "log.h"
-#include "xmalloc.h"
-#include "props.h"
 
 #define HOWL_PROPERTY "howl"
 

diff --git a/src/modules/howl-wrap.h b/src/modules/howl-wrap.h
index a670b082b43a371064aaacfcd58bf073bbd0eefe..42c26ef2fbc9e7ab80be5acc1ac3f6a8f321126f 100644 (file)
--- a/src/modules/howl-wrap.h
+++ b/src/modules/howl-wrap.h
@@ -24,7 +24,7 @@
 
 #include <howl.h>
 
-#include "core.h"
+#include <polypcore/core.h>
 
 pa_howl_wrapper;
 

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index d3fe71a575d8c9751dbf0f6e0f6d1627db715c1b..6ea1e1372475836ebda7f0fd8941181b97a731bc 100644 (file)
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -44,8 +44,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-alsa-sink-symdef.h"
 #include "alsa-util.h"
+#include "module-alsa-sink-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ALSA Sink")

diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 9453f846194ebf78c7a3e70db65406d3fe46c5ff..4f281aa76866f7ea92b49990925a4597520bc217 100644 (file)
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -44,8 +44,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-alsa-source-symdef.h"
 #include "alsa-util.h"
+#include "module-alsa-source-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ALSA Source")

diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 264e8792ed324eb1dad68ed4962782204fa3734f..fe43c45e59446c7633df7204b9263be61185f32b 100644 (file)
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -45,8 +45,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-oss-symdef.h"
 #include "oss-util.h"
+#include "module-oss-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("OSS Sink/Source")

diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index 469ddceea8ac624a2d97941639291c00e387bfab..b69716cc73280270e3dd1a08457435a749e8c8d7 100644 (file)
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -40,7 +40,7 @@
 #include <netinet/in.h>
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
 
 #include <polypcore/module.h>
 #include <polypcore/socket-server.h>

diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index 45d566aeed6e5135aa28463b393b303736370588..d2858aac0e54c39ba040c868818f7b69ef465b87 100644 (file)
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <polypcore/howl-wrap.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/autoload.h>
 #include <polypcore/sink.h>
@@ -37,11 +36,14 @@
 #include <polypcore/native-common.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/subscribe.h>
+#include <polypcore/core-subscribe.h>
 #include <polypcore/dynarray.h>
-#include <polypcore/endianmacros.h>
 #include <polypcore/modargs.h>
 
+#include "../polypcore/endianmacros.h"
+
+#include "howl-wrap.h"
+
 #include "module-zeroconf-publish-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")

diff --git a/src/polyp/browser.c b/src/polyp/browser.c
index 80051d5458d157ddfebd991344016374504de20b..482bab81e8d4b3b599357f158afa9bf37014f365 100644 (file)
--- a/src/polyp/browser.c
+++ b/src/polyp/browser.c
@@ -22,11 +22,12 @@
 #include <assert.h>
 #include <howl.h>
 
-#include "browser.h"
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 
+#include "browser.h"
+
 #define SERVICE_NAME_SINK "_polypaudio-sink._tcp."
 #define SERVICE_NAME_SOURCE "_polypaudio-source._tcp."
 #define SERVICE_NAME_SERVER "_polypaudio-server._tcp."

diff --git a/src/polyp/browser.h b/src/polyp/browser.h
index 3bb0d2649314be2bf07ba3e119cb209c34904d74..043b818af72ad64e94c553996aae75120731573e 100644 (file)
--- a/src/polyp/browser.h
+++ b/src/polyp/browser.h
@@ -25,7 +25,6 @@
 #include <polyp/mainloop-api.h>
 #include <polyp/sample.h>
 #include <polyp/cdecl.h>
-#include <polyp/typeid.h>
 
 PA_C_DECL_BEGIN
 

diff --git a/src/polyp/client-conf-x11.c b/src/polyp/client-conf-x11.c
index 83d0bd2e4f65ba8c54061d1ad128183dd4674f30..9e863bc785af871dd3044a2626bcbc6971844bab 100644 (file)
--- a/src/polyp/client-conf-x11.c
+++ b/src/polyp/client-conf-x11.c
@@ -29,12 +29,13 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include "client-conf-x11.h"
 #include <polypcore/x11prop.h>
 #include <polypcore/log.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
+#include "client-conf-x11.h"
+
 int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
     Display *d = NULL;
     int ret = -1;

diff --git a/src/polyp/client-conf-x11.h b/src/polyp/client-conf-x11.h
index 80841171be987277810904b8d1f0e10c843bd8ff..64459224f4bf3eeb5083108b324d95a027d86cfa 100644 (file)
--- a/src/polyp/client-conf-x11.h
+++ b/src/polyp/client-conf-x11.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include <polyp/client-conf.h>
+#include "client-conf.h"
 
 /* Load client configuration data from the specified X11 display,
  * overwriting the current settings in *c */

diff --git a/src/polyp/client-conf.c b/src/polyp/client-conf.c
index 2df201ceeb564c5d69e55c69307c8498b69be486..328d01c98423497b821b58b07e71f4ac8a91985d 100644 (file)
--- a/src/polyp/client-conf.c
+++ b/src/polyp/client-conf.c
@@ -35,7 +35,7 @@
 #include <polypcore/util.h>
 #include <polypcore/authkey.h>
 
-#include <polyp/client-conf.h>
+#include "client-conf.h"
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32

diff --git a/src/polyp/client-conf.h b/src/polyp/client-conf.h
index 2d8a019f42abdceef0cef926da0949ec9c382a41..de3efae7078d1fa6fd4b152eff816845232817b2 100644 (file)
--- a/src/polyp/client-conf.h
+++ b/src/polyp/client-conf.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "../polypcore/native-common.h"
+#include <polypcore/native-common.h>
 
 /* A structure containing configuration data for polypaudio clients. */
 

diff --git a/src/polyp/context.c b/src/polyp/context.c
index 4ac11caa4ee654d7346cfb0cced4a56cef847345..b7f7eb9974c090546e7c8ac67b8922be27e60dc2 100644 (file)
--- a/src/polyp/context.c
+++ b/src/polyp/context.c
@@ -45,11 +45,10 @@
 #include <netdb.h>
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
+
+#include <polyp/version.h>
 
-#include "internal.h"
-#include "context.h"
-#include "version.h"
 #include <polypcore/native-common.h>
 #include <polypcore/pdispatch.h>
 #include <polypcore/pstream.h>
@@ -59,13 +58,18 @@
 #include <polypcore/util.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
-#include <polyp/client-conf.h>
 #include <polypcore/socket-util.h>
 
+#include "internal.h"
+
+#include "client-conf.h"
+
 #ifdef HAVE_X11
 #include "client-conf-x11.h"
 #endif
 
+#include "context.h"
+
 #define AUTOSPAWN_LOCK "autospawn.lock"
 
 static const pa_pdispatch_callback command_table[PA_COMMAND_MAX] = {

diff --git a/src/polyp/error.c b/src/polyp/error.c
index a137ab494c06c24c7f03b9e030095e353e4a1234..ece77bf2c07b62e6c0aff6be3aac3068423e0358 100644 (file)
--- a/src/polyp/error.c
+++ b/src/polyp/error.c
@@ -26,9 +26,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "error.h"
 #include <polypcore/native-common.h>
 
+#include "error.h"
+
 static const char* const errortab[PA_ERROR_MAX] = {
     [PA_ERROR_OK] = "OK",
     [PA_ERROR_ACCESS] = "Access denied",

diff --git a/src/polyp/glib-mainloop.c b/src/polyp/glib-mainloop.c
index 962eb57424992829cc6569cdc08d98c5c1ded552..3937a1a9fd529e96f250a9fb1da4f67043303658 100644 (file)
--- a/src/polyp/glib-mainloop.c
+++ b/src/polyp/glib-mainloop.c
@@ -25,12 +25,13 @@
 
 #include <assert.h>
 
-#include <polyp/glib-mainloop.h>
 #include <polypcore/idxset.h>
 #include <polypcore/xmalloc.h>
-#include "glib.h"
 #include <polypcore/util.h>
 
+#include "glib.h"
+#include "glib-mainloop.h"
+
 struct pa_io_event  {
     pa_glib_mainloop *mainloop;
     int dead;

diff --git a/src/polyp/glib12-mainloop.c b/src/polyp/glib12-mainloop.c
index 80a02b1c2333c0bd1885d05536a553cbd5d5dd10..5ad23adbaf8d859e236e8c86340c943f69bb40ba 100644 (file)
--- a/src/polyp/glib12-mainloop.c
+++ b/src/polyp/glib12-mainloop.c
@@ -25,11 +25,12 @@
 
 #include <assert.h>
 
-#include <polyp/glib-mainloop.h>
 #include <polypcore/idxset.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
+#include "glib-mainloop.h"
+
 /* A mainloop implementation based on GLIB 1.2 */
 
 struct pa_io_event {

diff --git a/src/polyp/internal.h b/src/polyp/internal.h
index bdfd5d8ec1dc95fee74bb511450285249b73c02b..762688c98d12027bef070ed1fec17a9f824a2151 100644 (file)
--- a/src/polyp/internal.h
+++ b/src/polyp/internal.h
@@ -23,20 +23,21 @@
 ***/
 
 #include <polyp/mainloop-api.h>
+#include <polyp/context.h>
+#include <polyp/stream.h>
+#include <polyp/operation.h>
+
 #include <polypcore/socket-client.h>
 #include <polypcore/pstream.h>
 #include <polypcore/pdispatch.h>
 #include <polypcore/dynarray.h>
-
-#include "context.h"
-#include "stream.h"
-#include "operation.h"
 #include <polypcore/llist.h>
 #include <polypcore/native-common.h>
-#include <polyp/client-conf.h>
 #include <polypcore/strlist.h>
 #include <polypcore/mcalign.h>
 
+#include "client-conf.h"
+
 #define DEFAULT_TIMEOUT (10)
 
 struct pa_context {

diff --git a/src/polyp/introspect.c b/src/polyp/introspect.c
index d89eb9edeabac4f059735120ead2ba57d373f232..4af724b432c1684ef6d6d4345274012fc04c377a 100644 (file)
--- a/src/polyp/introspect.c
+++ b/src/polyp/introspect.c
@@ -25,11 +25,14 @@
 
 #include <assert.h>
 
-#include "introspect.h"
-#include "context.h"
-#include "internal.h"
-#include <polypcore/pstream-util.h>
+#include <polyp/context.h>
+
 #include <polypcore/gccmacro.h>
+#include <polypcore/pstream-util.h>
+
+#include "internal.h"
+
+#include "introspect.h"
 
 /*** Statistics ***/
 

diff --git a/src/polyp/mainloop-api.c b/src/polyp/mainloop-api.c
index a3eaee9c6c97c6126820f2500680cb84fe092159..71f55c05dd6e1630ec42fc96bb8c3e6c8c9b20d0 100644 (file)
--- a/src/polyp/mainloop-api.c
+++ b/src/polyp/mainloop-api.c
@@ -26,9 +26,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "mainloop-api.h"
-#include <polypcore/xmalloc.h>
 #include <polypcore/gccmacro.h>
+#include <polypcore/xmalloc.h>
+
+#include "mainloop-api.h"
 
 struct once_info {
     void (*callback)(pa_mainloop_api*m, void *userdata);

diff --git a/src/polyp/mainloop-signal.c b/src/polyp/mainloop-signal.c
index a03c915969d5a482a995e0db78661a8780d21d83..e474f46170b97f113168bbabe94f70addfa23db1 100644 (file)
--- a/src/polyp/mainloop-signal.c
+++ b/src/polyp/mainloop-signal.c
@@ -36,12 +36,13 @@
 #include <windows.h>
 #endif
 
-#include <polyp/mainloop-signal.h>
 #include <polypcore/util.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/gccmacro.h>
 
+#include "mainloop-signal.h"
+
 struct pa_signal_event {
     int sig;
 #ifdef HAVE_SIGACTION

diff --git a/src/polyp/mainloop.c b/src/polyp/mainloop.c
index 3fa9245cab98cfd7be318eb354699b0933a7c3a0..71ea9bc41da5a8e3ea3980d3fd83abaf6a1f618e 100644 (file)
--- a/src/polyp/mainloop.c
+++ b/src/polyp/mainloop.c
@@ -38,14 +38,15 @@
 #include "poll.h"
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
 
-#include "mainloop.h"
 #include <polypcore/util.h>
 #include <polypcore/idxset.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
+#include "mainloop.h"
+
 struct pa_io_event {
     pa_mainloop *mainloop;
     int dead;

diff --git a/src/polyp/operation.c b/src/polyp/operation.c
index 0baa661b5bb0c9b4c65c38cbc9260455e89aa012..5440cf9ea2d9956b782de3602d8a1cc916878982 100644 (file)
--- a/src/polyp/operation.c
+++ b/src/polyp/operation.c
@@ -26,7 +26,9 @@
 #include <assert.h>
 
 #include <polypcore/xmalloc.h>
+
 #include "internal.h"
+
 #include "operation.h"
 
 pa_operation *pa_operation_new(pa_context *c, pa_stream *s) {

diff --git a/src/polyp/scache.c b/src/polyp/scache.c
index c274e35973af9e17b75e41096ef9342c3826baeb..393b069e615aeb054e4861acfbc536722aed3b03 100644 (file)
--- a/src/polyp/scache.c
+++ b/src/polyp/scache.c
@@ -28,10 +28,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "scache.h"
-#include "internal.h"
 #include <polypcore/pstream-util.h>
 
+#include "internal.h"
+
+#include "scache.h"
+
 void pa_stream_connect_upload(pa_stream *s, size_t length) {
     pa_tagstruct *t;
     uint32_t tag;

diff --git a/src/polyp/simple.c b/src/polyp/simple.c
index 19c49c9b98cc462347d138e5c56631d3194e0b37..e14cab2ebb57faead1ffd6b4c328c6c1d6ed83f8 100644 (file)
--- a/src/polyp/simple.c
+++ b/src/polyp/simple.c
@@ -28,13 +28,15 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "simple.h"
-#include "polypaudio.h"
-#include "mainloop.h"
+#include <polyp/polypaudio.h>
+#include <polyp/mainloop.h>
+
 #include <polypcore/native-common.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
+#include "simple.h"
+
 struct pa_simple {
     pa_mainloop *mainloop;
     pa_context *context;

diff --git a/src/polyp/stream.c b/src/polyp/stream.c
index 007d5e24ff320f9803685db16bd9c557bc151b7f..6e5bc06719447dc24186325ed9aeea37a549029c 100644 (file)
--- a/src/polyp/stream.c
+++ b/src/polyp/stream.c
@@ -28,12 +28,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "internal.h"
 #include <polypcore/xmalloc.h>
 #include <polypcore/pstream-util.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 
+#include "internal.h"
+
 #define LATENCY_IPOL_INTERVAL_USEC (10000L)
 
 pa_stream *pa_stream_new(pa_context *c, const char *name, const pa_sample_spec *ss, const pa_channel_map *map) {

diff --git a/src/polyp/subscribe.c b/src/polyp/subscribe.c
index c481f52558c0bf6bb80548549c462acfaeb579b3..b90e0bf1db739ffe7ff6bf169adef7a897edfbcc 100644 (file)
--- a/src/polyp/subscribe.c
+++ b/src/polyp/subscribe.c
@@ -26,10 +26,12 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "subscribe.h"
-#include "internal.h"
-#include <polypcore/pstream-util.h>
 #include <polypcore/gccmacro.h>
+#include <polypcore/pstream-util.h>
+
+#include "internal.h"
+
+#include "subscribe.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;

diff --git a/src/polyp/version.h.in b/src/polyp/version.h.in
index c727381f33ef2ec3794511ee3d80fc887ee1efc1..67b7495b8224be17d6df74d50f18e5ecde7718cd 100644 (file)
--- a/src/polyp/version.h.in
+++ b/src/polyp/version.h.in
@@ -24,6 +24,8 @@
 
 /* WARNING: Make sure to edit the real source file version.h.in! */
 
+#include <polyp/cdecl.h>
+
 /** \file
  * Define header version */
 

diff --git a/src/polypcore/authkey-prop.c b/src/polypcore/authkey-prop.c
index 8657f5a50be59e616444295bc737ae9a0776c406..3faf0ef1f5c115c701e1286c82e46fa9dc312184 100644 (file)
--- a/src/polypcore/authkey-prop.c
+++ b/src/polypcore/authkey-prop.c
@@ -22,10 +22,11 @@
 #include <assert.h>
 #include <string.h>
 
-#include "xmalloc.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/props.h>
+#include <polypcore/log.h>
+
 #include "authkey-prop.h"
-#include "props.h"
-#include "log.h"
 
 struct authkey_data {
     int ref;

diff --git a/src/polypcore/authkey-prop.h b/src/polypcore/authkey-prop.h
index 29b40bb23b8b40a6ec7044e88ce6e1d18309e431..63fde5d8dfc1002dea57534a6d00949010f9cd55 100644 (file)
--- a/src/polypcore/authkey-prop.h
+++ b/src/polypcore/authkey-prop.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "core.h"
+#include <polypcore/core.h>
 
 /* The authkey-prop uses a central property to store a previously
  * loaded cookie in memory. Useful for sharing the same cookie between

diff --git a/src/polypcore/authkey.c b/src/polypcore/authkey.c
index 969f09d906852bb92e9a0036b906fe420d56c8b9..e3fc9f6076eaed4b820a93448cdc7ab03dde80fb 100644 (file)
--- a/src/polypcore/authkey.c
+++ b/src/polypcore/authkey.c
@@ -35,10 +35,11 @@
 #include <limits.h>
 #include <sys/stat.h>
 
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+#include <polypcore/random.h>
+
 #include "authkey.h"
-#include "util.h"
-#include "log.h"
-#include "random.h"
 
 /* Generate a new authorization key, store it in file fd and return it in *data  */
 static int generate(int fd, void *ret_data, size_t length) {

diff --git a/src/polypcore/autoload.c b/src/polypcore/autoload.c
index 83df8ef7f40e49629d20d31687597312758adcf7..8d2dca30f105e8a6819ae276f28b542026eb48f2 100644 (file)
--- a/src/polypcore/autoload.c
+++ b/src/polypcore/autoload.c
@@ -27,14 +27,15 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/module.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sound-file.h>
+#include <polypcore/log.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/core-subscribe.h>
+
 #include "autoload.h"
-#include "module.h"
-#include "xmalloc.h"
-#include "memchunk.h"
-#include "sound-file.h"
-#include "log.h"
-#include "core-scache.h"
-#include "core-subscribe.h"
 
 static void entry_free(pa_autoload_entry *e) {
     assert(e);

diff --git a/src/polypcore/autoload.h b/src/polypcore/autoload.h
index 7350c16a9505c992a3f349ff8e295440d18c65ef..a8931fc7e1fe7a3047dcb75b0971f82371102cce 100644 (file)
--- a/src/polypcore/autoload.h
+++ b/src/polypcore/autoload.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "namereg.h"
+#include <polypcore/namereg.h>
 
 /* Using the autoloading facility, modules by be loaded on-demand and
  * synchronously. The user may register a "ghost sink" or "ghost

diff --git a/src/polypcore/cli-command.c b/src/polypcore/cli-command.c
index dd4cbe463a04a5095783321c3ee62cc50c3557a1..6c9fc4b14aca56ba48474e6319b0941bbeee23df 100644 (file)
--- a/src/polypcore/cli-command.c
+++ b/src/polypcore/cli-command.c
@@ -29,26 +29,27 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <polypcore/module.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/client.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/source-output.h>
+#include <polypcore/tokenizer.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/namereg.h>
+#include <polypcore/cli-text.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/sound-file.h>
+#include <polypcore/play-memchunk.h>
+#include <polypcore/autoload.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/sound-file-stream.h>
+#include <polypcore/props.h>
+#include <polypcore/util.h>
+
 #include "cli-command.h"
-#include "module.h"
-#include "sink.h"
-#include "source.h"
-#include "client.h"
-#include "sink-input.h"
-#include "source-output.h"
-#include "tokenizer.h"
-#include "strbuf.h"
-#include "namereg.h"
-#include "cli-text.h"
-#include "core-scache.h"
-#include "sample-util.h"
-#include "sound-file.h"
-#include "play-memchunk.h"
-#include "autoload.h"
-#include "xmalloc.h"
-#include "sound-file-stream.h"
-#include "props.h"
-#include "util.h"
 
 struct command {
     const char *name;

diff --git a/src/polypcore/cli-command.h b/src/polypcore/cli-command.h
index 78b8d5c6da1c93e75e3cc4e067ffb40d963d5c9e..e7c70ecfe06e795d67164220dfbb055375157ac2 100644 (file)
--- a/src/polypcore/cli-command.h
+++ b/src/polypcore/cli-command.h
@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "strbuf.h"
-#include "core.h"
+#include <polypcore/strbuf.h>
+#include <polypcore/core.h>
 
 /* Execute a single CLI command. Write the results to the string
  * buffer *buf. If *fail is non-zero the function will return -1 when

diff --git a/src/polypcore/cli-text.c b/src/polypcore/cli-text.c
index d8446b0674a7b301f07205e7f573808958f42fee..8bffd0a731fd115834aa844a82e8bc5e39ce189e 100644 (file)
--- a/src/polypcore/cli-text.c
+++ b/src/polypcore/cli-text.c
@@ -26,19 +26,20 @@
 #include <assert.h>
 #include <string.h>
 
-#include "cli-text.h"
-#include "module.h"
-#include "client.h"
-#include "sink.h"
-#include "source.h"
-#include "sink-input.h"
-#include "source-output.h"
-#include "strbuf.h"
-#include "sample-util.h"
-#include "core-scache.h"
-#include "autoload.h"
-#include "xmalloc.h"
 #include <polyp/volume.h>
+#include <polypcore/module.h>
+#include <polypcore/client.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/source-output.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/autoload.h>
+#include <polypcore/xmalloc.h>
+
+#include "cli-text.h"
 
 char *pa_module_list_to_string(pa_core *c) {
     pa_strbuf *s;

diff --git a/src/polypcore/cli-text.h b/src/polypcore/cli-text.h
index 7a1a036103b25ae88784259f2a52dd6a2a93ccb5..a8f400035b67efb7e7a6b8bffd81c948e3a070f8 100644 (file)
--- a/src/polypcore/cli-text.h
+++ b/src/polypcore/cli-text.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "core.h"
+#include <polypcore/core.h>
 
 /* Some functions to generate pretty formatted listings of
  * entities. The returned strings have to be freed manually. */

diff --git a/src/polypcore/cli.c b/src/polypcore/cli.c
index bc0c285d386bfbdcf76d830841562a8044951dcb..295ce625d47340e50fd9058c9a6e8765808c7c58 100644 (file)
--- a/src/polypcore/cli.c
+++ b/src/polypcore/cli.c
@@ -28,21 +28,22 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "ioline.h"
+#include <polypcore/ioline.h>
+#include <polypcore/module.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/client.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/source-output.h>
+#include <polypcore/tokenizer.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/namereg.h>
+#include <polypcore/cli-text.h>
+#include <polypcore/cli-command.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "cli.h"
-#include "module.h"
-#include "sink.h"
-#include "source.h"
-#include "client.h"
-#include "sink-input.h"
-#include "source-output.h"
-#include "tokenizer.h"
-#include "strbuf.h"
-#include "namereg.h"
-#include "cli-text.h"
-#include "cli-command.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define PROMPT ">>> "
 

diff --git a/src/polypcore/cli.h b/src/polypcore/cli.h
index 03f31c22cd9eab76da322ea483dd71bdaa84dc2c..12ffd848fd2483cb2f80e333a66d7206f224be51 100644 (file)
--- a/src/polypcore/cli.h
+++ b/src/polypcore/cli.h
@@ -22,9 +22,9 @@
   USA.
 ***/
 
-#include "iochannel.h"
-#include "core.h"
-#include "module.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/core.h>
+#include <polypcore/module.h>
 
 typedef struct pa_cli pa_cli;
 

diff --git a/src/polypcore/client.c b/src/polypcore/client.c
index 9b256794211113c51bc1290bafeae3d1238ce32c..7fe5a9fc3d5591003d80dd9a5c0aef86a108606b 100644 (file)
--- a/src/polypcore/client.c
+++ b/src/polypcore/client.c
@@ -28,10 +28,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
 #include "client.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 
 pa_client *pa_client_new(pa_core *core, const char *name, const char *driver) {
     pa_client *c;

diff --git a/src/polypcore/client.h b/src/polypcore/client.h
index 92430338f3e76f63116c38c0f4b475e16c40051b..8ddc6d9423ca7b224526a3c2c94c1765ea63004e 100644 (file)
--- a/src/polypcore/client.h
+++ b/src/polypcore/client.h
@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "core.h"
-#include "module.h"
+#include <polypcore/core.h>
+#include <polypcore/module.h>
 
 /* Every connection to the server should have a pa_client
  * attached. That way the user may generate a listing of all connected

diff --git a/src/polypcore/conf-parser.c b/src/polypcore/conf-parser.c
index 507f2bf19c42cab4f121bc29afaaf9bb9982acd8..7eeda02b629907ba086759d33fe492b09cc99eab 100644 (file)
--- a/src/polypcore/conf-parser.c
+++ b/src/polypcore/conf-parser.c
@@ -28,10 +28,11 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+
 #include "conf-parser.h"
-#include "log.h"
-#include "util.h"
-#include "xmalloc.h"
 
 #define WHITESPACE " \t\n"
 #define COMMENTS "#;\n"

diff --git a/src/polypcore/core-scache.c b/src/polypcore/core-scache.c
index 0d926abafa8c00b78d8c9d9257e0bcebfbc9c5d0..69199a33cf363bffb5a7c3fa67fdb6e90d48fb94 100644 (file)
--- a/src/polypcore/core-scache.c
+++ b/src/polypcore/core-scache.c
@@ -41,19 +41,20 @@
 #include <windows.h>
 #endif
 
-#include "core-scache.h"
-#include "sink-input.h"
 #include <polyp/mainloop.h>
-#include "sample-util.h"
-#include "play-memchunk.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "namereg.h"
-#include "sound-file.h"
-#include "util.h"
-#include "log.h"
 #include <polyp/channelmap.h>
 #include <polyp/volume.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/play-memchunk.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/namereg.h>
+#include <polypcore/sound-file.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
+#include "core-scache.h"
 
 #define UNLOAD_POLL_TIME 2
 

diff --git a/src/polypcore/core-scache.h b/src/polypcore/core-scache.h
index 0918ebe47e118279f786da6f9220de0341740aeb..a383e50ac39275e4d6ccf6c80cd10a71c2fdd57c 100644 (file)
--- a/src/polypcore/core-scache.h
+++ b/src/polypcore/core-scache.h
@@ -22,9 +22,9 @@
   USA.
 ***/
 
-#include "core.h"
-#include "memchunk.h"
-#include "sink.h"
+#include <polypcore/core.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
 
 typedef struct pa_scache_entry {
     pa_core *core;

diff --git a/src/polypcore/core-subscribe.c b/src/polypcore/core-subscribe.c
index 2a258604d71ed402fcc85ea396ed416c3a399e00..4d792966e70e2fe2fe1e168089da09953a258f08 100644 (file)
--- a/src/polypcore/core-subscribe.c
+++ b/src/polypcore/core-subscribe.c
@@ -26,10 +26,11 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "queue.h"
+#include <polypcore/queue.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "core-subscribe.h"
-#include "xmalloc.h"
-#include "log.h"
 
 /* The subscription subsystem may be used to be notified whenever an
  * entity (sink, source, ...) is created or deleted. Modules may

diff --git a/src/polypcore/core-subscribe.h b/src/polypcore/core-subscribe.h
index bc9dcba3d0bd528bad476ce86b08073752e75358..7c8569542489275f5d4b68154f6688fe86c676e9 100644 (file)
--- a/src/polypcore/core-subscribe.h
+++ b/src/polypcore/core-subscribe.h
@@ -25,8 +25,8 @@
 typedef struct pa_subscription pa_subscription;
 typedef struct pa_subscription_event pa_subscription_event;
 
-#include "core.h"
-#include "native-common.h"
+#include <polypcore/core.h>
+#include <polypcore/native-common.h>
 
 pa_subscription* pa_subscription_new(pa_core *c, pa_subscription_mask_t m,  void (*callback)(pa_core *c, pa_subscription_event_type_t t, uint32_t index, void *userdata), void *userdata);
 void pa_subscription_free(pa_subscription*s);

diff --git a/src/polypcore/core.c b/src/polypcore/core.c
index 9d040e687dfdf28d3540a0a754f803ed895774ad..0093aebd790fd336e54b9f5ae174471054f3470b 100644 (file)
--- a/src/polypcore/core.c
+++ b/src/polypcore/core.c
@@ -28,18 +28,19 @@
 #include <stdio.h>
 #include <signal.h>
 
+#include <polypcore/module.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/namereg.h>
+#include <polypcore/util.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/autoload.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/props.h>
+#include <polypcore/random.h>
+
 #include "core.h"
-#include "module.h"
-#include "sink.h"
-#include "source.h"
-#include "namereg.h"
-#include "util.h"
-#include "core-scache.h"
-#include "autoload.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "props.h"
-#include "random.h"
 
 pa_core* pa_core_new(pa_mainloop_api *m) {
     pa_core* c;

diff --git a/src/polypcore/core.h b/src/polypcore/core.h
index 29329025456e70a85de927483d79c32fad54f74c..a323ae8e1f12f72fcd285dc3f304c6deaced92ab 100644 (file)
--- a/src/polypcore/core.h
+++ b/src/polypcore/core.h
@@ -24,14 +24,14 @@
 
 typedef struct pa_core pa_core;
 
-#include "idxset.h"
-#include "hashmap.h"
+#include <polypcore/idxset.h>
+#include <polypcore/hashmap.h>
 #include <polyp/mainloop-api.h>
 #include <polyp/sample.h>
-#include "memblock.h"
-#include "resampler.h"
-#include "queue.h"
-#include "core-subscribe.h"
+#include <polypcore/memblock.h>
+#include <polypcore/resampler.h>
+#include <polypcore/queue.h>
+#include <polypcore/core-subscribe.h>
 
 /* The core structure of polypaudio. Every polypaudio daemon contains
  * exactly one of these. It is used for storing kind of global

diff --git a/src/polypcore/dynarray.c b/src/polypcore/dynarray.c
index 435fd7686e23e0f75959052ca55c21c9fe11000d..1aff7f5113d0788c8e282190441f6e5fd311cd82 100644 (file)
--- a/src/polypcore/dynarray.c
+++ b/src/polypcore/dynarray.c
@@ -27,8 +27,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "dynarray.h"
-#include "xmalloc.h"
 
 /* If the array becomes to small, increase its size by 100 entries */
 #define INCREASE_BY 100

diff --git a/src/polypcore/hashmap.c b/src/polypcore/hashmap.c
index a37decb8cf5e89ebdf3d99d4a919f3425f356dc6..8861fd3df0a0c112d55ecbe4d93519860cca4bce 100644 (file)
--- a/src/polypcore/hashmap.c
+++ b/src/polypcore/hashmap.c
@@ -27,10 +27,11 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polypcore/idxset.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "hashmap.h"
-#include "idxset.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define BUCKETS 1023
 

diff --git a/src/polypcore/idxset.c b/src/polypcore/idxset.c
index 409d1fab9cffc06809d408ed526f397188253da1..8d3a2370d8fa32ed23bac1b117c9dec8f400b5c2 100644 (file)
--- a/src/polypcore/idxset.c
+++ b/src/polypcore/idxset.c
@@ -28,8 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "idxset.h"
-#include "xmalloc.h"
 
 typedef struct idxset_entry {
     void *data;

diff --git a/src/polypcore/iochannel.c b/src/polypcore/iochannel.c
index 273d47e0da085bef2e83d6fb9fb3b71293b6fc75..7fd091523af569478d2f64d19bede813f1a638c7 100644 (file)
--- a/src/polypcore/iochannel.c
+++ b/src/polypcore/iochannel.c
@@ -30,10 +30,11 @@
 
 #include "winsock.h"
 
+#include <polypcore/util.h>
+#include <polypcore/socket-util.h>
+#include <polypcore/xmalloc.h>
+
 #include "iochannel.h"
-#include "util.h"
-#include "socket-util.h"
-#include "xmalloc.h"
 
 struct pa_iochannel {
     int ifd, ofd;

diff --git a/src/polypcore/ioline.c b/src/polypcore/ioline.c
index 5b669f5c55967e48c807fac8d1adeb37ef51633c..3f2de5a2e5aacf45793dd2a0eeec8f8e0a8692be 100644 (file)
--- a/src/polypcore/ioline.c
+++ b/src/polypcore/ioline.c
@@ -29,9 +29,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "ioline.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define BUFFER_LIMIT (64*1024)
 #define READ_SIZE (1024)

diff --git a/src/polypcore/ioline.h b/src/polypcore/ioline.h
index 84ccb47a6b197987494b5ea7b9947f2225acde6c..e2dadf557ceaf3d258d88706c5a5d43540a9eab2 100644 (file)
--- a/src/polypcore/ioline.h
+++ b/src/polypcore/ioline.h
@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "iochannel.h"
-#include "util.h"
+#include <polypcore/iochannel.h>
+#include <polypcore/util.h>
 
 /* An ioline wraps an iochannel for line based communication. A
  * callback function is called whenever a new line has been recieved

diff --git a/src/polypcore/log.c b/src/polypcore/log.c
index 97406f7995f14828a0ebc34aa2f2462b304b5632..c7bf7be9eed91ff9d72f1560fccf8eb9f78e7db8 100644 (file)
--- a/src/polypcore/log.c
+++ b/src/polypcore/log.c
@@ -31,9 +31,10 @@
 #include <syslog.h>
 #endif
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+
 #include "log.h"
-#include "xmalloc.h"
-#include "util.h"
 
 #define ENV_LOGLEVEL "POLYP_LOG"
 

diff --git a/src/polypcore/log.h b/src/polypcore/log.h
index ce8aea9860ea9b1517899b3cd49f4c67dcedc1bd..c306acaffef139295ae50c9281bf55252fb1cba5 100644 (file)
--- a/src/polypcore/log.h
+++ b/src/polypcore/log.h
@@ -23,7 +23,7 @@
 ***/
 
 #include <stdarg.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
 
 /* A simple logging subsystem */
 

diff --git a/src/polypcore/mcalign.c b/src/polypcore/mcalign.c
index 4d7656250d469667cde7ac0e3b49faf2e47acb53..0f229e282e45fc2985d75bd569d065a4e12b0431 100644 (file)
--- a/src/polypcore/mcalign.c
+++ b/src/polypcore/mcalign.c
@@ -28,8 +28,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "mcalign.h"
-#include "xmalloc.h"
 
 struct pa_mcalign {
     size_t base;

diff --git a/src/polypcore/mcalign.h b/src/polypcore/mcalign.h
index 5de75bc7cdff6ef68a9b778a209a3c897a50ed46..a9107e0e48f2ed9df17738b2a373fe46f85b3f90 100644 (file)
--- a/src/polypcore/mcalign.h
+++ b/src/polypcore/mcalign.h
@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "memblock.h"
-#include "memchunk.h"
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
 
 /* An alignment object, used for aligning memchunks to multiples of
  * the frame size. */

diff --git a/src/polypcore/memblock.c b/src/polypcore/memblock.c
index 8da5352527d12d43a9609992a146f87f9a21c312..2c0bef57c4ad53bd316a4f86673c1b7e0df47e52 100644 (file)
--- a/src/polypcore/memblock.c
+++ b/src/polypcore/memblock.c
@@ -28,8 +28,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "memblock.h"
-#include "xmalloc.h"
 
 static void stat_add(pa_memblock*m, pa_memblock_stat *s) {
     assert(m);

diff --git a/src/polypcore/memblockq.c b/src/polypcore/memblockq.c
index ba6b76eaaade1e0597a751eddd1c85acd29bd554..4a0225e58381d74aaac62399ba681fbc003248aa 100644 (file)
--- a/src/polypcore/memblockq.c
+++ b/src/polypcore/memblockq.c
@@ -30,10 +30,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/mcalign.h>
+
 #include "memblockq.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "mcalign.h"
 
 struct memblock_list {
     struct memblock_list *next, *prev;

diff --git a/src/polypcore/memblockq.h b/src/polypcore/memblockq.h
index 1695dabad94106022b7473b915e778213a25bb95..7bb25f9081540a19b9b29a89c7d1369efac7e7c8 100644 (file)
--- a/src/polypcore/memblockq.h
+++ b/src/polypcore/memblockq.h
@@ -24,8 +24,8 @@
 
 #include <sys/types.h>
 
-#include "memblock.h"
-#include "memchunk.h"
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
 
 /* A memblockq is a queue of pa_memchunks (yepp, the name is not
  * perfect). It is similar to the ring buffers used by most other

diff --git a/src/polypcore/memchunk.c b/src/polypcore/memchunk.c
index bfd74f9e4db364c6cf2841b5e23804025a014684..d6856ab8368844b66eaa0e2330dd72a91564aa75 100644 (file)
--- a/src/polypcore/memchunk.c
+++ b/src/polypcore/memchunk.c
@@ -28,8 +28,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "memchunk.h"
-#include "xmalloc.h"
 
 void pa_memchunk_make_writable(pa_memchunk *c, pa_memblock_stat *s, size_t min) {
     pa_memblock *n;

diff --git a/src/polypcore/memchunk.h b/src/polypcore/memchunk.h
index 4eefc8c100e918caf6810239a80a9830f005df7e..3ddb28eeb39a7d980a779502e02027a56fc7b354 100644 (file)
--- a/src/polypcore/memchunk.h
+++ b/src/polypcore/memchunk.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "memblock.h"
+#include <polypcore/memblock.h>
 
 /* A memchunk describes a part of a memblock. In contrast to the memblock, a
  * memchunk is not allocated dynamically or reference counted, instead

diff --git a/src/polypcore/modargs.c b/src/polypcore/modargs.c
index 0706294673c8d3b58bdb010718567259eb9715ec..6bd13c3b7a1f00bb4122eb88610d9caf4da7d839 100644 (file)
--- a/src/polypcore/modargs.c
+++ b/src/polypcore/modargs.c
@@ -28,15 +28,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "hashmap.h"
+#include <polypcore/hashmap.h>
+#include <polypcore/idxset.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/namereg.h>
+#include <polypcore/sink.h>
+#include <polypcore/source.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+
 #include "modargs.h"
-#include "idxset.h"
-#include "sample-util.h"
-#include "namereg.h"
-#include "sink.h"
-#include "source.h"
-#include "xmalloc.h"
-#include "util.h"
 
 struct entry {
     char *key, *value;

diff --git a/src/polypcore/modargs.h b/src/polypcore/modargs.h
index 678ea1a740b29d2b7c0f8771c6a7e49755c797bd..47e2d522efb8bc41d9c2f608ee7194a9a9f4fcab 100644 (file)
--- a/src/polypcore/modargs.h
+++ b/src/polypcore/modargs.h
@@ -24,7 +24,7 @@
 
 #include <inttypes.h>
 #include <polyp/sample.h>
-#include "core.h"
+#include <polypcore/core.h>
 
 typedef struct pa_modargs pa_modargs;
 

diff --git a/src/polypcore/modinfo.c b/src/polypcore/modinfo.c
index 534406127710cf952754ac4ffd96a743096dc223..4204bb34a499c36b0bc82f224037b7155226faa7 100644 (file)
--- a/src/polypcore/modinfo.c
+++ b/src/polypcore/modinfo.c
@@ -26,10 +26,11 @@
 #include <ltdl.h>
 #include <assert.h>
 
-#include "xmalloc.h"
-#include "util.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "modinfo.h"
-#include "log.h"
 
 #define PA_SYMBOL_AUTHOR "pa__get_author"
 #define PA_SYMBOL_DESCRIPTION "pa__get_description"

diff --git a/src/polypcore/module.c b/src/polypcore/module.c
index 73ec5bd401b35f270230a49e34239fe7734f53f3..75385354217558ecb86f6ee668df74610fe5b49c 100644 (file)
--- a/src/polypcore/module.c
+++ b/src/polypcore/module.c
@@ -30,11 +30,12 @@
 #include <string.h>
 #include <errno.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+
 #include "module.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
-#include "util.h"
 
 #define PA_SYMBOL_INIT "pa__init"
 #define PA_SYMBOL_DONE "pa__done"

diff --git a/src/polypcore/module.h b/src/polypcore/module.h
index 6f137c1573534ee18c8a660710e7c15916eb7ef0..03b9bc8779021f7d9c7e0a3cca392ef924683cb3 100644 (file)
--- a/src/polypcore/module.h
+++ b/src/polypcore/module.h
@@ -25,8 +25,8 @@
 #include <inttypes.h>
 #include <ltdl.h>
 
-#include "core.h"
-#include "modinfo.h"
+#include <polypcore/core.h>
+#include <polypcore/modinfo.h>
 
 typedef struct pa_module pa_module;
 

diff --git a/src/polypcore/namereg.c b/src/polypcore/namereg.c
index ca03c455dca8a86c1ae36036389eae232f5bb232..d4dbd14bba5e2393f04170ccfd4693aef941a716 100644 (file)
--- a/src/polypcore/namereg.c
+++ b/src/polypcore/namereg.c
@@ -29,13 +29,14 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <polypcore/autoload.h>
+#include <polypcore/source.h>
+#include <polypcore/sink.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/util.h>
+
 #include "namereg.h"
-#include "autoload.h"
-#include "source.h"
-#include "sink.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "util.h"
 
 struct namereg_entry {
     pa_namereg_type_t type;

diff --git a/src/polypcore/namereg.h b/src/polypcore/namereg.h
index 961fd44b560f6f3b57a167b596dca80274ab9f2d..a98295ff99c5d849be8e108284deb6a666725c23 100644 (file)
--- a/src/polypcore/namereg.h
+++ b/src/polypcore/namereg.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "core.h"
+#include <polypcore/core.h>
 
 typedef enum pa_namereg_type {
     PA_NAMEREG_SINK,

diff --git a/src/polypcore/packet.c b/src/polypcore/packet.c
index b3a2e074284bc4c42f263750b0c5e3b2af534d5f..41803cf99a851522b82dfbbbd88ce09ea6502e1f 100644 (file)
--- a/src/polypcore/packet.c
+++ b/src/polypcore/packet.c
@@ -26,8 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "packet.h"
-#include "xmalloc.h"
 
 pa_packet* pa_packet_new(size_t length) {
     pa_packet *p;

diff --git a/src/polypcore/parseaddr.c b/src/polypcore/parseaddr.c
index 5e4c689ca2c58c373917358fbdb9c22c85f0d056..c2b25c8960bbc970d4338a05264c50e860ee1bd2 100644 (file)
--- a/src/polypcore/parseaddr.c
+++ b/src/polypcore/parseaddr.c
@@ -27,8 +27,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "xmalloc.h"
-#include "util.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+
 #include "parseaddr.h"
 
 /* Parse addresses in one of the following forms:

diff --git a/src/polypcore/pdispatch.c b/src/polypcore/pdispatch.c
index 5a50a0d57794f6f58709de79ece907e0dae6ad55..7941e4a82d7b14c61e3ae3784db0306112960c7e 100644 (file)
--- a/src/polypcore/pdispatch.c
+++ b/src/polypcore/pdispatch.c
@@ -27,12 +27,13 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include <polypcore/native-common.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/llist.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+
 #include "pdispatch.h"
-#include "native-common.h"
-#include "xmalloc.h"
-#include "llist.h"
-#include "log.h"
-#include "util.h"
 
 /*#define DEBUG_OPCODES */
 

diff --git a/src/polypcore/pdispatch.h b/src/polypcore/pdispatch.h
index fdd4d7f54e34a7c4ff14d996896d96f90b28572b..57666259ca95683818b528405eeefd571fe08568 100644 (file)
--- a/src/polypcore/pdispatch.h
+++ b/src/polypcore/pdispatch.h
@@ -23,9 +23,9 @@
 ***/
 
 #include <inttypes.h>
-#include "tagstruct.h"
-#include "packet.h"
 #include <polyp/mainloop-api.h>
+#include <polypcore/tagstruct.h>
+#include <polypcore/packet.h>
 
 typedef struct pa_pdispatch pa_pdispatch;
 

diff --git a/src/polypcore/pid.c b/src/polypcore/pid.c
index ae3dc7f517020f6e64aaa47833cae38ff0771e20..3f33365ac65a3d9ec144dbb432f37f90126de8ca 100644 (file)
--- a/src/polypcore/pid.c
+++ b/src/polypcore/pid.c
@@ -39,9 +39,10 @@
 #include <windows.h>
 #endif
 
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "pid.h"
-#include "util.h"
-#include "log.h"
 
 /* Read the PID data from the file descriptor fd, and return it. If no
  * pid could be read, return 0, on failure (pid_t) -1 */

diff --git a/src/polypcore/play-memchunk.c b/src/polypcore/play-memchunk.c
index e24d4427306bc2d141e9823efe94c5dccbcdbc6d..ec79254b1bd0a8b081cf5b11efb60a14c6bfcb3f 100644 (file)
--- a/src/polypcore/play-memchunk.c
+++ b/src/polypcore/play-memchunk.c
@@ -28,10 +28,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polypcore/sink-input.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
+
 #include "play-memchunk.h"
-#include "sink-input.h"
-#include "xmalloc.h"
-#include "gccmacro.h"
 
 static void sink_input_kill(pa_sink_input *i) {
     pa_memchunk *c;

diff --git a/src/polypcore/play-memchunk.h b/src/polypcore/play-memchunk.h
index fc0654a6f1bd2d1efe9d2b620814a8872923d46f..72aeda9555fb8a7aced9a66c81f325b30d7d4b90 100644 (file)
--- a/src/polypcore/play-memchunk.h
+++ b/src/polypcore/play-memchunk.h
@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "sink.h"
-#include "memchunk.h"
+#include <polypcore/sink.h>
+#include <polypcore/memchunk.h>
 
 int pa_play_memchunk(
     pa_sink *sink,

diff --git a/src/polypcore/poll.c b/src/polypcore/poll.c
index 193fc8128e4ae6596383cf5e3ec601d7ba32a8e7..6a29a95306f5e74f6f61bf2b1ebcc064b2b409d0 100644 (file)
--- a/src/polypcore/poll.c
+++ b/src/polypcore/poll.c
@@ -42,7 +42,8 @@
 
 #ifndef HAVE_SYS_POLL_H
 
-#include "util.h"
+#include <polypcore/util.h>
+
 #include "poll.h"
 
 int poll (struct pollfd *fds, unsigned long int nfds, int timeout) {

diff --git a/src/polypcore/props.c b/src/polypcore/props.c
index df748c1ea2f2d07095f736a74f937d4f13e7d852..96cdc4f2d7a837e5e5a5a39c1c56ffbab89b7646 100644 (file)
--- a/src/polypcore/props.c
+++ b/src/polypcore/props.c
@@ -21,9 +21,10 @@
 
 #include <assert.h>
 
-#include "xmalloc.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "props.h"
-#include "log.h"
 
 typedef struct pa_property {
     char *name;  /* Points to memory allocated by the property subsystem */

diff --git a/src/polypcore/props.h b/src/polypcore/props.h
index 5abf8787cf3f801ffac3d4a35acc60311cfa210d..9430db5ebe4d0d6949646b57d9620ebbee3948ac 100644 (file)
--- a/src/polypcore/props.h
+++ b/src/polypcore/props.h
@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "core.h"
-#include "strbuf.h"
+#include <polypcore/core.h>
+#include <polypcore/strbuf.h>
 
 /* The property subsystem is to be used to share data between
  * modules. Consider them to be kind of "global" variables for a

diff --git a/src/polypcore/protocol-cli.c b/src/polypcore/protocol-cli.c
index d2d73550bd09890f87c6bc163413ecbc7d838db2..cb7e8f6f1a51e16cbfc29b95cc7f2c8ce7c22ff5 100644 (file)
--- a/src/polypcore/protocol-cli.c
+++ b/src/polypcore/protocol-cli.c
@@ -26,10 +26,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/cli.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "protocol-cli.h"
-#include "cli.h"
-#include "xmalloc.h"
-#include "log.h"
 
 /* Don't allow more than this many concurrent connections */
 #define MAX_CONNECTIONS 25

diff --git a/src/polypcore/protocol-cli.h b/src/polypcore/protocol-cli.h
index aed733c130c7cddaba0b8448e1bcbb6142c54445..c47b14d61288fa31b8a116977f472bc288868eac 100644 (file)
--- a/src/polypcore/protocol-cli.h
+++ b/src/polypcore/protocol-cli.h
@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "core.h"
-#include "socket-server.h"
-#include "module.h"
-#include "modargs.h"
+#include <polypcore/core.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_cli pa_protocol_cli;
 

diff --git a/src/polypcore/protocol-esound.c b/src/polypcore/protocol-esound.c
index d2c0f3546038e2ef019f18fb46be1c42151c4b55..a16ac280875554580be6891743202fba33366cd2 100644 (file)
--- a/src/polypcore/protocol-esound.c
+++ b/src/polypcore/protocol-esound.c
@@ -30,24 +30,26 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include "protocol-esound.h"
-#include "esound.h"
-#include "memblock.h"
-#include "client.h"
-#include "sink-input.h"
-#include "sink.h"
-#include "source-output.h"
-#include "source.h"
 #include <polyp/sample.h>
-#include "core-scache.h"
-#include "sample-util.h"
-#include "authkey.h"
-#include "namereg.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "util.h"
+#include <polypcore/esound.h>
+#include <polypcore/memblock.h>
+#include <polypcore/client.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/sink.h>
+#include <polypcore/source-output.h>
+#include <polypcore/source.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/authkey.h>
+#include <polypcore/namereg.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+
 #include "endianmacros.h"
 
+#include "protocol-esound.h"
+
 /* Don't accept more connection than this */
 #define MAX_CONNECTIONS 10
 

diff --git a/src/polypcore/protocol-esound.h b/src/polypcore/protocol-esound.h
index 71d58464e12fd77e157e3a70b327a5b30628a370..a94d1c7243ed14215f64e9c25ffd985f4b2f9c17 100644 (file)
--- a/src/polypcore/protocol-esound.h
+++ b/src/polypcore/protocol-esound.h
@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "core.h"
-#include "socket-server.h"
-#include "module.h"
-#include "modargs.h"
+#include <polypcore/core.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_esound pa_protocol_esound;
 

diff --git a/src/polypcore/protocol-http.c b/src/polypcore/protocol-http.c
index 3e55df03a7cc5f1258e31b5eefbb9c6bbc90c7e0..f0b78124befdeade79c55c8c7a594853f3d34cbd 100644 (file)
--- a/src/polypcore/protocol-http.c
+++ b/src/polypcore/protocol-http.c
@@ -28,12 +28,13 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polypcore/ioline.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/namereg.h>
+#include <polypcore/cli-text.h>
+
 #include "protocol-http.h"
-#include "ioline.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "namereg.h"
-#include "cli-text.h"
 
 /* Don't allow more than this many concurrent connections */
 #define MAX_CONNECTIONS 10

diff --git a/src/polypcore/protocol-http.h b/src/polypcore/protocol-http.h
index 0a1855e9b70e27dbfbb73ead175802f28cf204c2..10dd656b6b99bd35b346a7e6d327e9911e00b367 100644 (file)
--- a/src/polypcore/protocol-http.h
+++ b/src/polypcore/protocol-http.h
@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "core.h"
-#include "socket-server.h"
-#include "module.h"
-#include "modargs.h"
+#include <polypcore/core.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_http pa_protocol_http;
 

diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index 31983bc260912cc7c9207759fbb0b2845c00ef97..1362fdf2eda43cb1ab4d17849a1c8d79cacaee22 100644 (file)
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -28,27 +28,28 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/native-common.h>
+#include <polypcore/packet.h>
+#include <polypcore/client.h>
+#include <polypcore/source-output.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/pstream.h>
+#include <polypcore/tagstruct.h>
+#include <polypcore/pdispatch.h>
+#include <polypcore/pstream-util.h>
+#include <polypcore/authkey.h>
+#include <polypcore/namereg.h>
+#include <polypcore/core-scache.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+#include <polypcore/autoload.h>
+#include <polypcore/authkey-prop.h>
+#include <polypcore/strlist.h>
+#include <polypcore/props.h>
+
 #include "protocol-native.h"
-#include "native-common.h"
-#include "packet.h"
-#include "client.h"
-#include "source-output.h"
-#include "sink-input.h"
-#include "pstream.h"
-#include "tagstruct.h"
-#include "pdispatch.h"
-#include "pstream-util.h"
-#include "authkey.h"
-#include "namereg.h"
-#include "core-scache.h"
-#include "xmalloc.h"
-#include "util.h"
-#include "core-subscribe.h"
-#include "log.h"
-#include "autoload.h"
-#include "authkey-prop.h"
-#include "strlist.h"
-#include "props.h"
 
 /* Kick a client if it doesn't authenticate within this time */
 #define AUTH_TIMEOUT 5

diff --git a/src/polypcore/protocol-native.h b/src/polypcore/protocol-native.h
index 12e85d0b72d284dcc7953f84f348f1353dad2fb4..88aa8494fc243cc2143b5a799707fe15de3dd9b9 100644 (file)
--- a/src/polypcore/protocol-native.h
+++ b/src/polypcore/protocol-native.h
@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "core.h"
-#include "socket-server.h"
-#include "module.h"
-#include "modargs.h"
+#include <polypcore/core.h>
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_native pa_protocol_native;
 

diff --git a/src/polypcore/protocol-simple.c b/src/polypcore/protocol-simple.c
index 113919b3591f4b82d82470338e792ed859ae3a4b..4d3f8e1d9b8603c7d4dfcebd85e4690f2458f818 100644 (file)
--- a/src/polypcore/protocol-simple.c
+++ b/src/polypcore/protocol-simple.c
@@ -30,14 +30,15 @@
 #include <errno.h>
 #include <string.h>
 
-#include "sink-input.h"
-#include "source-output.h"
+#include <polypcore/sink-input.h>
+#include <polypcore/source-output.h>
+#include <polypcore/client.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/namereg.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "protocol-simple.h"
-#include "client.h"
-#include "sample-util.h"
-#include "namereg.h"
-#include "xmalloc.h"
-#include "log.h"
 
 /* Don't allow more than this many concurrent connections */
 #define MAX_CONNECTIONS 10

diff --git a/src/polypcore/protocol-simple.h b/src/polypcore/protocol-simple.h
index 63455a53e400d5f0699ba3ac931aff5f6d8d25b1..f11c775923c8a2c08e943e5cfec9269f518dfa0f 100644 (file)
--- a/src/polypcore/protocol-simple.h
+++ b/src/polypcore/protocol-simple.h
@@ -22,10 +22,10 @@
   USA.
 ***/
 
-#include "socket-server.h"
-#include "module.h"
-#include "core.h"
-#include "modargs.h"
+#include <polypcore/socket-server.h>
+#include <polypcore/module.h>
+#include <polypcore/core.h>
+#include <polypcore/modargs.h>
 
 typedef struct pa_protocol_simple pa_protocol_simple;
 

diff --git a/src/polypcore/pstream-util.c b/src/polypcore/pstream-util.c
index ecd63d15ff182ffebfe05d23631b34e893299e9f..62986456e4c11cd380f027ef3ef14b7e8c6bfbfc 100644 (file)
--- a/src/polypcore/pstream-util.c
+++ b/src/polypcore/pstream-util.c
@@ -25,7 +25,8 @@
 
 #include <assert.h>
 
-#include "native-common.h"
+#include <polypcore/native-common.h>
+
 #include "pstream-util.h"
 
 void pa_pstream_send_tagstruct(pa_pstream *p, pa_tagstruct *t) {

diff --git a/src/polypcore/pstream-util.h b/src/polypcore/pstream-util.h
index 601a9e99a55610f8822018ad804a5b25f7b24750..c400c6d8a7164e10871f98a51eee273cc5f57cdf 100644 (file)
--- a/src/polypcore/pstream-util.h
+++ b/src/polypcore/pstream-util.h
@@ -23,8 +23,8 @@
 ***/
 
 #include <inttypes.h>
-#include "pstream.h"
-#include "tagstruct.h"
+#include <polypcore/pstream.h>
+#include <polypcore/tagstruct.h>
 
 /* The tagstruct is freed!*/
 void pa_pstream_send_tagstruct(pa_pstream *p, pa_tagstruct *t);

diff --git a/src/polypcore/pstream.c b/src/polypcore/pstream.c
index bd00ba4f928f390a340ccfb2ef34214fdb21f923..eec93a0f785943722c3f841626da24da4cb26258 100644 (file)
--- a/src/polypcore/pstream.c
+++ b/src/polypcore/pstream.c
@@ -34,10 +34,11 @@
 
 #include "winsock.h"
 
+#include <polypcore/queue.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "pstream.h"
-#include "queue.h"
-#include "xmalloc.h"
-#include "log.h"
 
 typedef enum pa_pstream_descriptor_index {
     PA_PSTREAM_DESCRIPTOR_LENGTH,

diff --git a/src/polypcore/pstream.h b/src/polypcore/pstream.h
index ec63a98e8efcd06223bdb12fe33e6385a541e80a..10ce58f60b47e08f9970eba3820d680b3392060a 100644 (file)
--- a/src/polypcore/pstream.h
+++ b/src/polypcore/pstream.h
@@ -24,11 +24,11 @@
 
 #include <inttypes.h>
 
-#include "packet.h"
-#include "memblock.h"
-#include "iochannel.h"
 #include <polyp/mainloop-api.h>
-#include "memchunk.h"
+#include <polypcore/packet.h>
+#include <polypcore/memblock.h>
+#include <polypcore/iochannel.h>
+#include <polypcore/memchunk.h>
 
 typedef struct pa_pstream pa_pstream;
 

diff --git a/src/polypcore/queue.c b/src/polypcore/queue.c
index 80ec00685a047a13f80a0fe34f61513ddb6e9af2..77ca1ed39cd6778f34b5a1e1839a496e3e484ca5 100644 (file)
--- a/src/polypcore/queue.c
+++ b/src/polypcore/queue.c
@@ -26,8 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/xmalloc.h>
+
 #include "queue.h"
-#include "xmalloc.h"
 
 struct queue_entry {
     struct queue_entry *next;

diff --git a/src/polypcore/random.c b/src/polypcore/random.c
index 12f27bfd6bb3906fa3c1468363a19d6230db1329..756c3218c1ce0ab4aeba6c7c24b9104ef7a6c27c 100644 (file)
--- a/src/polypcore/random.c
+++ b/src/polypcore/random.c
@@ -31,9 +31,10 @@
 #include <assert.h>
 #include <time.h>
 
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "random.h"
-#include "util.h"
-#include "log.h"
 
 #ifndef OS_IS_WIN32
 #define RANDOM_DEVICE "/dev/urandom"

diff --git a/src/polypcore/resampler.c b/src/polypcore/resampler.c
index 0417e44efe658c2c268cd7a62d6d8e4edf5fb051..c1740bf1d8432b11f5963d5fe2ce1253923b888a 100644 (file)
--- a/src/polypcore/resampler.c
+++ b/src/polypcore/resampler.c
@@ -30,10 +30,11 @@
 #include <liboil/liboilfuncs.h>
 #include <liboil/liboil.h>
 
+#include <polypcore/sconv.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "resampler.h"
-#include "sconv.h"
-#include "xmalloc.h"
-#include "log.h"
 
 struct pa_resampler {
     pa_resample_method_t resample_method;

diff --git a/src/polypcore/resampler.h b/src/polypcore/resampler.h
index cad48be5047b3b240aebc8b867792736fb673344..2f4d3cbe8d87b708a3f01e9953db908b355fe0d1 100644 (file)
--- a/src/polypcore/resampler.h
+++ b/src/polypcore/resampler.h
@@ -25,9 +25,9 @@
 #include <samplerate.h>
 
 #include <polyp/sample.h>
-#include "memblock.h"
-#include "memchunk.h"
 #include <polyp/channelmap.h>
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
 
 typedef struct pa_resampler pa_resampler;
 

diff --git a/src/polypcore/sample-util.c b/src/polypcore/sample-util.c
index 52974c46a7930746cb133560a37742ef83d43b0b..e3bb4aa6c202e85a4821850023993edb8c71d414 100644 (file)
--- a/src/polypcore/sample-util.c
+++ b/src/polypcore/sample-util.c
@@ -30,7 +30,8 @@
 
 #include <liboil/liboilfuncs.h>
 
-#include "log.h"
+#include <polypcore/log.h>
+
 #include "sample-util.h"
 
 pa_memblock *pa_silence_memblock(pa_memblock* b, const pa_sample_spec *spec) {

diff --git a/src/polypcore/sample-util.h b/src/polypcore/sample-util.h
index d0efbcc4371d66683727ffa0d3d0800bdb0b215c..486d284ba0d1f44d9897e3872ecdf9908fdf75c0 100644 (file)
--- a/src/polypcore/sample-util.h
+++ b/src/polypcore/sample-util.h
@@ -23,9 +23,9 @@
 ***/
 
 #include <polyp/sample.h>
-#include "memblock.h"
-#include "memchunk.h"
 #include <polyp/volume.h>
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.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);

diff --git a/src/polypcore/sconv-s16le.c b/src/polypcore/sconv-s16le.c
index e47c5e8e8557d45ceb30d9b7429abb46f2d604c2..0814c35b5f4f2e5c8fc846be0f66322b1f58c284 100644 (file)
--- a/src/polypcore/sconv-s16le.c
+++ b/src/polypcore/sconv-s16le.c
@@ -28,10 +28,12 @@
 
 #include <liboil/liboilfuncs.h>
 
+#include <polypcore/sconv.h>
+#include <polypcore/log.h>
+
 #include "endianmacros.h"
-#include "sconv.h"
+
 #include "sconv-s16le.h"
-#include "log.h"
 
 #ifndef INT16_FROM
 #define INT16_FROM INT16_FROM_LE

diff --git a/src/polypcore/sconv.c b/src/polypcore/sconv.c
index 1fcb5a0c810be4b544b572f5ff01928b51e496ff..c557be67bae113bb63cfb889aacd538a7e70838b 100644 (file)
--- a/src/polypcore/sconv.c
+++ b/src/polypcore/sconv.c
@@ -30,13 +30,14 @@
 #include <liboil/liboilfuncs.h>
 #include <liboil/liboil.h>
 
-#include "endianmacros.h"
-#include "sconv.h"
-#include "g711.h"
+#include <polypcore/g711.h>
 
+#include "endianmacros.h"
 #include "sconv-s16le.h"
 #include "sconv-s16be.h"
 
+#include "sconv.h"
+
 static void u8_to_float32ne(unsigned n, const void *a, float *b) {
     const uint8_t *ca = a;
     static const double add = -128.0/127.0, factor = 1.0/127.0;

diff --git a/src/polypcore/sink-input.c b/src/polypcore/sink-input.c
index 696c47a4d5c9725840faf14db67323e8724edcf3..1dc7df0f20be87fac8d11908fa2b45007934cc35 100644 (file)
--- a/src/polypcore/sink-input.c
+++ b/src/polypcore/sink-input.c
@@ -28,11 +28,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/sample-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
 #include "sink-input.h"
-#include "sample-util.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 
 #define CONVERT_BUFFER_LENGTH 4096
 

diff --git a/src/polypcore/sink-input.h b/src/polypcore/sink-input.h
index a5ad1958425525a65ab6cf0624befa926e6a90c7..e4b8bda475036d865b29fe1d1581a3ad17b46152 100644 (file)
--- a/src/polypcore/sink-input.h
+++ b/src/polypcore/sink-input.h
@@ -26,12 +26,12 @@
 
 typedef struct pa_sink_input pa_sink_input;
 
-#include "sink.h"
 #include <polyp/sample.h>
-#include "memblockq.h"
-#include "resampler.h"
-#include "module.h"
-#include "client.h"
+#include <polypcore/sink.h>
+#include <polypcore/memblockq.h>
+#include <polypcore/resampler.h>
+#include <polypcore/module.h>
+#include <polypcore/client.h>
 
 typedef enum pa_sink_input_state {
     PA_SINK_INPUT_RUNNING,

diff --git a/src/polypcore/sink.c b/src/polypcore/sink.c
index 6c143463b355ebdfb048f5abec43a0a4c86c3971..9bc478c3c8f418096abefbfbff3b9342d8716635 100644 (file)
--- a/src/polypcore/sink.c
+++ b/src/polypcore/sink.c
@@ -28,15 +28,16 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "sink.h"
-#include "sink-input.h"
-#include "namereg.h"
-#include "util.h"
-#include "sample-util.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 #include <polyp/introspect.h>
+#include <polypcore/sink-input.h>
+#include <polypcore/namereg.h>
+#include <polypcore/util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
+#include "sink.h"
 
 #define MAX_MIX_CHANNELS 32
 

diff --git a/src/polypcore/sink.h b/src/polypcore/sink.h
index 268461effc296b5ba85e59d53e7e25016b09916b..5fd9784f9110535d65694c9de0db9733313e1bef 100644 (file)
--- a/src/polypcore/sink.h
+++ b/src/polypcore/sink.h
@@ -26,13 +26,13 @@
 
 typedef struct pa_sink pa_sink;
 
-#include "core.h"
 #include <polyp/sample.h>
-#include "idxset.h"
-#include "source.h"
 #include <polyp/channelmap.h>
-#include "module.h"
 #include <polyp/volume.h>
+#include <polypcore/core.h>
+#include <polypcore/idxset.h>
+#include <polypcore/source.h>
+#include <polypcore/module.h>
 
 #define PA_MAX_INPUTS_PER_SINK 6
 

diff --git a/src/polypcore/sioman.c b/src/polypcore/sioman.c
index 8d7b136c855085b8599364e1a5f70260f5a6524b..b389eceef82bb42ad70ff3454094fa1bee0578f5 100644 (file)
--- a/src/polypcore/sioman.c
+++ b/src/polypcore/sioman.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <assert.h>
+
 #include "sioman.h"
 
 static int stdio_inuse = 0;

diff --git a/src/polypcore/socket-client.c b/src/polypcore/socket-client.c
index 29c9775ef3585dc23ba45c6c3a8fb875d6310ae5..3662e89c75443f0d59989fafd6403b646d87f209 100644 (file)
--- a/src/polypcore/socket-client.c
+++ b/src/polypcore/socket-client.c
@@ -54,12 +54,13 @@
 
 #include "winsock.h"
 
+#include <polypcore/socket-util.h>
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/parseaddr.h>
+
 #include "socket-client.h"
-#include "socket-util.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "parseaddr.h"
 
 #define CONNECT_TIMEOUT 5
 

diff --git a/src/polypcore/socket-client.h b/src/polypcore/socket-client.h
index 624880d7d58a56c6206801417f873bce417ef57b..d000533104688a54d8e3ffbafdc6dc342bb0482c 100644 (file)
--- a/src/polypcore/socket-client.h
+++ b/src/polypcore/socket-client.h
@@ -25,7 +25,7 @@
 #include <inttypes.h>
 
 #include <polyp/mainloop-api.h>
-#include "iochannel.h"
+#include <polypcore/iochannel.h>
 
 struct sockaddr;
 

diff --git a/src/polypcore/socket-server.c b/src/polypcore/socket-server.c
index 262b32a76249aef117aa22383d178a351809a170..d1646984c0af5436aa1e980d1579396b98a1f3e8 100644 (file)
--- a/src/polypcore/socket-server.c
+++ b/src/polypcore/socket-server.c
@@ -58,11 +58,12 @@
 
 #include "winsock.h"
 
+#include <polypcore/socket-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/util.h>
+#include <polypcore/log.h>
+
 #include "socket-server.h"
-#include "socket-util.h"
-#include "xmalloc.h"
-#include "util.h"
-#include "log.h"
 
 struct pa_socket_server {
     int ref;

diff --git a/src/polypcore/socket-server.h b/src/polypcore/socket-server.h
index 4d8bfad569d1cda1a08fa5d2245259a34f707c5d..6bb834276a3e759d12f39372630a08ca78e3bb71 100644 (file)
--- a/src/polypcore/socket-server.h
+++ b/src/polypcore/socket-server.h
@@ -24,7 +24,7 @@
 
 #include <inttypes.h>
 #include <polyp/mainloop-api.h>
-#include "iochannel.h"
+#include <polypcore/iochannel.h>
 
 /* It is safe to destroy the calling socket_server object from the callback */
 

diff --git a/src/polypcore/socket-util.c b/src/polypcore/socket-util.c
index 032a3c91412d0aafbd2e2c145910581adf208f90..5ffe5302b8c7eb944ef26e761d8da96303f6d6ce 100644 (file)
--- a/src/polypcore/socket-util.c
+++ b/src/polypcore/socket-util.c
@@ -59,10 +59,11 @@
 
 #include "winsock.h"
 
+#include <polypcore/util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "socket-util.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "log.h"
 
 void pa_socket_peer_to_string(int fd, char *c, size_t l) {
     struct stat st;

diff --git a/src/polypcore/sound-file-stream.c b/src/polypcore/sound-file-stream.c
index 881e30772fef8f1e50fd315af8f1fe2892f98d8d..644e578f76132b08ef47474b310686b3ad0ceedf 100644 (file)
--- a/src/polypcore/sound-file-stream.c
+++ b/src/polypcore/sound-file-stream.c
@@ -30,10 +30,11 @@
 
 #include <sndfile.h>
 
+#include <polypcore/sink-input.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "sound-file-stream.h"
-#include "sink-input.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #define BUF_SIZE (1024*10)
 

diff --git a/src/polypcore/sound-file-stream.h b/src/polypcore/sound-file-stream.h
index 2e56ef49b6fbe80d2d87f2194c97a4dee0a1c693..5effc7f03356976330310dfb542f452082c45ce0 100644 (file)
--- a/src/polypcore/sound-file-stream.h
+++ b/src/polypcore/sound-file-stream.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "sink.h"
+#include <polypcore/sink.h>
 
 int pa_play_file(pa_sink *sink, const char *fname, const pa_cvolume *volume);
 

diff --git a/src/polypcore/sound-file.c b/src/polypcore/sound-file.c
index a81c283a0aa1ddb7b822c9dc63d87f044e4f77af..cf23e0acde447238edc3dd2dbb020d8f705b5247 100644 (file)
--- a/src/polypcore/sound-file.c
+++ b/src/polypcore/sound-file.c
@@ -28,9 +28,10 @@
 
 #include <sndfile.h>
 
-#include "sound-file.h"
 #include <polyp/sample.h>
-#include "log.h"
+#include <polypcore/log.h>
+
+#include "sound-file.h"
 
 #define MAX_FILE_SIZE (1024*1024)
 

diff --git a/src/polypcore/sound-file.h b/src/polypcore/sound-file.h
index f3003bb9e5de3d1db3166cfe2e3acbd394d715bc..ffa551b528f54159a6d9cd0339fa525276c4007f 100644 (file)
--- a/src/polypcore/sound-file.h
+++ b/src/polypcore/sound-file.h
@@ -22,8 +22,8 @@
   USA.
 ***/
 
-#include "memchunk.h"
 #include <polyp/sample.h>
+#include <polypcore/memchunk.h>
 
 int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s);
 

diff --git a/src/polypcore/source-output.c b/src/polypcore/source-output.c
index 9b75a8b0d1c45cdda04db5e2a3b5c88e8f20b14f..d6201b4dce844150747e5f26da6d9078e5c31d15 100644 (file)
--- a/src/polypcore/source-output.c
+++ b/src/polypcore/source-output.c
@@ -28,10 +28,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
 #include "source-output.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 
 pa_source_output* pa_source_output_new(
     pa_source *s,

diff --git a/src/polypcore/source-output.h b/src/polypcore/source-output.h
index 4b1cbf15289e4a8a95d66be34227bdff8620ea21..98f6ab0c0f79ac7f85f30acc6f0292845ecacce4 100644 (file)
--- a/src/polypcore/source-output.h
+++ b/src/polypcore/source-output.h
@@ -26,12 +26,12 @@
 
 typedef struct pa_source_output pa_source_output;
 
-#include "source.h"
 #include <polyp/sample.h>
-#include "memblockq.h"
-#include "resampler.h"
-#include "module.h"
-#include "client.h"
+#include <polypcore/source.h>
+#include <polypcore/memblockq.h>
+#include <polypcore/resampler.h>
+#include <polypcore/module.h>
+#include <polypcore/client.h>
 
 typedef enum {
     PA_SOURCE_OUTPUT_RUNNING,

diff --git a/src/polypcore/source.c b/src/polypcore/source.c
index c64f7b990f71ad67ad7597f0c57def6c7e6963a4..b70cb1293de2e2d9cb7be8782afbc9a118936c30 100644 (file)
--- a/src/polypcore/source.c
+++ b/src/polypcore/source.c
@@ -28,12 +28,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polypcore/source-output.h>
+#include <polypcore/namereg.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/core-subscribe.h>
+#include <polypcore/log.h>
+
 #include "source.h"
-#include "source-output.h"
-#include "namereg.h"
-#include "xmalloc.h"
-#include "core-subscribe.h"
-#include "log.h"
 
 pa_source* pa_source_new(
     pa_core *core,

diff --git a/src/polypcore/source.h b/src/polypcore/source.h
index be2fb985699de7a353ce370fb2993871eef797a2..a267e73c133c8dbc0fc611f88d18f08debf02e48 100644 (file)
--- a/src/polypcore/source.h
+++ b/src/polypcore/source.h
@@ -25,14 +25,15 @@
 typedef struct pa_source pa_source;
 
 #include <inttypes.h>
-#include "core.h"
+
 #include <polyp/sample.h>
-#include "idxset.h"
-#include "memblock.h"
-#include "memchunk.h"
-#include "sink.h"
 #include <polyp/channelmap.h>
-#include "module.h"
+#include <polypcore/core.h>
+#include <polypcore/idxset.h>
+#include <polypcore/memblock.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
+#include <polypcore/module.h>
 
 #define PA_MAX_OUTPUTS_PER_SOURCE 16
 

diff --git a/src/polypcore/strbuf.h b/src/polypcore/strbuf.h
index a88f5190c443e2bd3ff34c3145baf2d52e377b39..4b06a7e60dc00c2b03794e7fa73afed2054fb48b 100644 (file)
--- a/src/polypcore/strbuf.h
+++ b/src/polypcore/strbuf.h
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
 
 typedef struct pa_strbuf pa_strbuf;
 

diff --git a/src/polypcore/strlist.c b/src/polypcore/strlist.c
index 09eb0c8aa057cba244c8e5ad136de0a46de5615d..e165aefddd1fa3f75960018018afcc63c008d14a 100644 (file)
--- a/src/polypcore/strlist.c
+++ b/src/polypcore/strlist.c
@@ -26,10 +26,11 @@
 #include <string.h>
 #include <assert.h>
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/strbuf.h>
+#include <polypcore/util.h>
+
 #include "strlist.h"
-#include "xmalloc.h"
-#include "strbuf.h"
-#include "util.h"
 
 struct pa_strlist {
     pa_strlist *next;

diff --git a/src/polypcore/tagstruct.c b/src/polypcore/tagstruct.c
index 676f67ded6043fd607a6a5381b4bb19d9d629492..1f5f370bf57590244b8d83730d0adc6d80db855d 100644 (file)
--- a/src/polypcore/tagstruct.c
+++ b/src/polypcore/tagstruct.c
@@ -36,8 +36,9 @@
 
 #include "winsock.h"
 
+#include <polypcore/xmalloc.h>
+
 #include "tagstruct.h"
-#include "xmalloc.h"
 
 
 struct pa_tagstruct {

diff --git a/src/polypcore/tokenizer.c b/src/polypcore/tokenizer.c
index 5e0c1b166e9e0c51df82cc15db68a4a9a22e0f80..556a190a01ee4d5fbd9ea0ccfb7ac0d216a789b0 100644 (file)
--- a/src/polypcore/tokenizer.c
+++ b/src/polypcore/tokenizer.c
@@ -27,10 +27,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polypcore/dynarray.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/gccmacro.h>
+
 #include "tokenizer.h"
-#include "dynarray.h"
-#include "xmalloc.h"
-#include "gccmacro.h"
 
 struct pa_tokenizer {
     pa_dynarray *dynarray;

diff --git a/src/polypcore/util.c b/src/polypcore/util.c
index 4b6edb97fc5c7b42f107cce1d77675f9e30a7b63..a53c36bc682e55bf2c5fdfda24b404f56f3d67fb 100644 (file)
--- a/src/polypcore/util.c
+++ b/src/polypcore/util.c
@@ -70,9 +70,10 @@
 
 #include "winsock.h"
 
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
 #include "util.h"
-#include "xmalloc.h"
-#include "log.h"
 
 #ifndef OS_IS_WIN32
 #define PA_RUNTIME_PATH_PREFIX "/tmp/polypaudio-"

diff --git a/src/polypcore/util.h b/src/polypcore/util.h
index 3dc6c945c2f63bf9bb9e02694ae6fabbae382c55..14f763a3ff54a0f92e8ad92cd9fbe9d391753b20 100644 (file)
--- a/src/polypcore/util.h
+++ b/src/polypcore/util.h
@@ -27,8 +27,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "gccmacro.h"
 #include <polyp/sample.h>
+#include <polypcore/gccmacro.h>
 
 struct timeval;
 

diff --git a/src/polypcore/x11wrap.c b/src/polypcore/x11wrap.c
index e20a50a63376522eeae72b0411891001ec7cf82f..9414fbdfdf990015db9cdba4588a68211488bfff 100644 (file)
--- a/src/polypcore/x11wrap.c
+++ b/src/polypcore/x11wrap.c
@@ -22,11 +22,12 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "llist.h"
+#include <polypcore/llist.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/props.h>
+
 #include "x11wrap.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "props.h"
 
 typedef struct pa_x11_internal pa_x11_internal;
 

diff --git a/src/polypcore/x11wrap.h b/src/polypcore/x11wrap.h
index 15645168e80fc0fc52a96ffd4b387830a46e6729..15969869d460cac89968e7424197bf51b22e5e4b 100644 (file)
--- a/src/polypcore/x11wrap.h
+++ b/src/polypcore/x11wrap.h
@@ -24,7 +24,7 @@
 
 #include <X11/Xlib.h>
 
-#include "core.h"
+#include <polypcore/core.h>
 
 typedef struct pa_x11_wrapper pa_x11_wrapper;
 

diff --git a/src/polypcore/xmalloc.c b/src/polypcore/xmalloc.c
index bf366347071b675588d6948598f0972475b05af7..4c8689a6c5708cee60005951f856fdcb43420e3d 100644 (file)
--- a/src/polypcore/xmalloc.c
+++ b/src/polypcore/xmalloc.c
@@ -27,11 +27,12 @@
 #include <signal.h>
 #include <assert.h>
 #include <unistd.h>
+#include <string.h>
+
+#include <polypcore/util.h>
+#include <polypcore/gccmacro.h>
 
-#include "memory.h"
-#include "util.h"
 #include "xmalloc.h"
-#include "gccmacro.h"
 
 /* Make sure not to allocate more than this much memory. */
 #define MAX_ALLOC_SIZE (1024*1024*20) /* 20MB */

diff --git a/src/tests/cpulimit-test.c b/src/tests/cpulimit-test.c
index 97a8a0dd936d1aa80ea1ad65ffd0b76da746f803..b51014c853c1219ebbd1de4ab167583ea0bd6ec2 100644 (file)
--- a/src/tests/cpulimit-test.c
+++ b/src/tests/cpulimit-test.c
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <signal.h>
 
-#include "../daemon/cpulimit.h"
 #include <polyp/mainloop.h>
 #include <polypcore/gccmacro.h>
 
@@ -37,6 +36,8 @@
 #include <polyp/mainloop-signal.h>
 #endif
 
+#include "../daemon/cpulimit.h"
+
 /* A simple example for testing the cpulimit subsystem */
 
 static time_t start;

diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index 908a35072c331cba50c4a289d40ad502c4436456..56b62d3726f85b5052ed0c0ab6ee7e048fc01fd4 100644 (file)
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -36,7 +36,8 @@
 #include <polypcore/authkey.h>
 #include <polypcore/native-common.h>
 #include <polypcore/x11prop.h>
-#include <polyp/client-conf.h>
+
+#include "../polyp/client-conf.h"
 
 int main(int argc, char *argv[]) {
     const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;