From 5eda18bf608a325c136a450e58fa154eb0b270f4 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 17 Feb 2006 12:10:58 +0000 Subject: 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 --- src/daemon/caps.c | 1 + src/daemon/cmdline.c | 3 ++- src/daemon/cpulimit.c | 3 ++- src/daemon/daemon-conf.c | 3 ++- src/daemon/dumpmodules.c | 3 ++- src/daemon/main.c | 18 ++++++++------- src/modules/howl-wrap.c | 7 +++--- src/modules/howl-wrap.h | 2 +- src/modules/module-alsa-sink.c | 2 +- src/modules/module-alsa-source.c | 2 +- src/modules/module-oss.c | 2 +- src/modules/module-protocol-stub.c | 2 +- src/modules/module-zeroconf-publish.c | 8 ++++--- src/polyp/browser.c | 3 ++- src/polyp/browser.h | 1 - src/polyp/client-conf-x11.c | 3 ++- src/polyp/client-conf-x11.h | 2 +- src/polyp/client-conf.c | 2 +- src/polyp/client-conf.h | 2 +- src/polyp/context.c | 14 +++++++----- src/polyp/error.c | 3 ++- src/polyp/glib-mainloop.c | 5 +++-- src/polyp/glib12-mainloop.c | 3 ++- src/polyp/internal.h | 11 +++++----- src/polyp/introspect.c | 11 ++++++---- src/polyp/mainloop-api.c | 5 +++-- src/polyp/mainloop-signal.c | 3 ++- src/polyp/mainloop.c | 5 +++-- src/polyp/operation.c | 2 ++ src/polyp/scache.c | 6 +++-- src/polyp/simple.c | 8 ++++--- src/polyp/stream.c | 3 ++- src/polyp/subscribe.c | 8 ++++--- src/polyp/version.h.in | 2 ++ src/polypcore/authkey-prop.c | 7 +++--- src/polypcore/authkey-prop.h | 2 +- src/polypcore/authkey.c | 7 +++--- src/polypcore/autoload.c | 15 +++++++------ src/polypcore/autoload.h | 2 +- src/polypcore/cli-command.c | 39 +++++++++++++++++---------------- src/polypcore/cli-command.h | 4 ++-- src/polypcore/cli-text.c | 25 +++++++++++---------- src/polypcore/cli-text.h | 2 +- src/polypcore/cli.c | 29 +++++++++++++------------ src/polypcore/cli.h | 6 ++--- src/polypcore/client.c | 7 +++--- src/polypcore/client.h | 4 ++-- src/polypcore/conf-parser.c | 7 +++--- src/polypcore/core-scache.c | 21 +++++++++--------- src/polypcore/core-scache.h | 6 ++--- src/polypcore/core-subscribe.c | 7 +++--- src/polypcore/core-subscribe.h | 4 ++-- src/polypcore/core.c | 23 ++++++++++---------- src/polypcore/core.h | 12 +++++----- src/polypcore/dynarray.c | 3 ++- src/polypcore/hashmap.c | 7 +++--- src/polypcore/idxset.c | 3 ++- src/polypcore/iochannel.c | 7 +++--- src/polypcore/ioline.c | 5 +++-- src/polypcore/ioline.h | 4 ++-- src/polypcore/log.c | 5 +++-- src/polypcore/log.h | 2 +- src/polypcore/mcalign.c | 3 ++- src/polypcore/mcalign.h | 4 ++-- src/polypcore/memblock.c | 3 ++- src/polypcore/memblockq.c | 7 +++--- src/polypcore/memblockq.h | 4 ++-- src/polypcore/memchunk.c | 3 ++- src/polypcore/memchunk.h | 2 +- src/polypcore/modargs.c | 17 ++++++++------- src/polypcore/modargs.h | 2 +- src/polypcore/modinfo.c | 7 +++--- src/polypcore/module.c | 9 ++++---- src/polypcore/module.h | 4 ++-- src/polypcore/namereg.c | 13 ++++++----- src/polypcore/namereg.h | 2 +- src/polypcore/packet.c | 3 ++- src/polypcore/parseaddr.c | 5 +++-- src/polypcore/pdispatch.c | 11 +++++----- src/polypcore/pdispatch.h | 4 ++-- src/polypcore/pid.c | 5 +++-- src/polypcore/play-memchunk.c | 7 +++--- src/polypcore/play-memchunk.h | 4 ++-- src/polypcore/poll.c | 3 ++- src/polypcore/props.c | 5 +++-- src/polypcore/props.h | 4 ++-- src/polypcore/protocol-cli.c | 7 +++--- src/polypcore/protocol-cli.h | 8 +++---- src/polypcore/protocol-esound.c | 32 ++++++++++++++------------- src/polypcore/protocol-esound.h | 8 +++---- src/polypcore/protocol-http.c | 11 +++++----- src/polypcore/protocol-http.h | 8 +++---- src/polypcore/protocol-native.c | 41 ++++++++++++++++++----------------- src/polypcore/protocol-native.h | 8 +++---- src/polypcore/protocol-simple.c | 15 +++++++------ src/polypcore/protocol-simple.h | 8 +++---- src/polypcore/pstream-util.c | 3 ++- src/polypcore/pstream-util.h | 4 ++-- src/polypcore/pstream.c | 7 +++--- src/polypcore/pstream.h | 8 +++---- src/polypcore/queue.c | 3 ++- src/polypcore/random.c | 5 +++-- src/polypcore/resampler.c | 7 +++--- src/polypcore/resampler.h | 4 ++-- src/polypcore/sample-util.c | 3 ++- src/polypcore/sample-util.h | 4 ++-- src/polypcore/sconv-s16le.c | 6 +++-- src/polypcore/sconv.c | 7 +++--- src/polypcore/sink-input.c | 9 ++++---- src/polypcore/sink-input.h | 10 ++++----- src/polypcore/sink.c | 17 ++++++++------- src/polypcore/sink.h | 8 +++---- src/polypcore/sioman.c | 1 + src/polypcore/socket-client.c | 11 +++++----- src/polypcore/socket-client.h | 2 +- src/polypcore/socket-server.c | 9 ++++---- src/polypcore/socket-server.h | 2 +- src/polypcore/socket-util.c | 7 +++--- src/polypcore/sound-file-stream.c | 7 +++--- src/polypcore/sound-file-stream.h | 2 +- src/polypcore/sound-file.c | 5 +++-- src/polypcore/sound-file.h | 2 +- src/polypcore/source-output.c | 7 +++--- src/polypcore/source-output.h | 10 ++++----- src/polypcore/source.c | 11 +++++----- src/polypcore/source.h | 13 ++++++----- src/polypcore/strbuf.h | 2 +- src/polypcore/strlist.c | 7 +++--- src/polypcore/tagstruct.c | 3 ++- src/polypcore/tokenizer.c | 7 +++--- src/polypcore/util.c | 5 +++-- src/polypcore/util.h | 2 +- src/polypcore/x11wrap.c | 9 ++++---- src/polypcore/x11wrap.h | 2 +- src/polypcore/xmalloc.c | 7 +++--- src/tests/cpulimit-test.c | 3 ++- src/utils/pax11publish.c | 3 ++- 137 files changed, 523 insertions(+), 421 deletions(-) diff --git a/src/daemon/caps.c b/src/daemon/caps.c index 8d429459..e12d33fb 100644 --- a/src/daemon/caps.c +++ b/src/daemon/caps.c @@ -33,6 +33,7 @@ #endif #include + #include "caps.h" #ifdef HAVE_GETUID diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c index 0b5f9ec7..b6ab1283 100644 --- a/src/daemon/cmdline.c +++ b/src/daemon/cmdline.c @@ -30,11 +30,12 @@ #include #include -#include "cmdline.h" #include #include #include +#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 6887796f..d7a24b8e 100644 --- a/src/daemon/cpulimit.c +++ b/src/daemon/cpulimit.c @@ -23,10 +23,11 @@ #include #endif -#include "cpulimit.h" #include #include +#include "cpulimit.h" + #ifdef HAVE_SIGXCPU #include diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 8fe3c4cc..ecabce40 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -29,13 +29,14 @@ #include #include -#include "daemon-conf.h" #include #include #include #include #include +#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 8d8eb0b9..bf29a681 100644 --- a/src/daemon/dumpmodules.c +++ b/src/daemon/dumpmodules.c @@ -29,10 +29,11 @@ #include #include -#include "dumpmodules.h" #include #include +#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 6be83d8c..638c2f3f 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -47,26 +47,28 @@ #include #endif -#include +#include "../polypcore/winsock.h" + +#include +#include #include #include -#include #include -#include -#include "cmdline.h" #include +#include #include #include #include +#include +#include +#include + +#include "cmdline.h" #include "cpulimit.h" -#include #include "daemon-conf.h" #include "dumpmodules.h" #include "caps.h" -#include -#include -#include #ifdef HAVE_LIBWRAP /* Only one instance of these variables */ diff --git a/src/modules/howl-wrap.c b/src/modules/howl-wrap.c index 77d096ac..b3acde55 100644 --- a/src/modules/howl-wrap.c +++ b/src/modules/howl-wrap.c @@ -21,10 +21,11 @@ #include +#include +#include +#include + #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 a670b082..42c26ef2 100644 --- a/src/modules/howl-wrap.h +++ b/src/modules/howl-wrap.h @@ -24,7 +24,7 @@ #include -#include "core.h" +#include pa_howl_wrapper; diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index d3fe71a5..6ea1e137 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -44,8 +44,8 @@ #include #include -#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 9453f846..4f281aa7 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/module-alsa-source.c @@ -44,8 +44,8 @@ #include #include -#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 264e8792..fe43c45e 100644 --- a/src/modules/module-oss.c +++ b/src/modules/module-oss.c @@ -45,8 +45,8 @@ #include #include -#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 469ddcee..b69716cc 100644 --- a/src/modules/module-protocol-stub.c +++ b/src/modules/module-protocol-stub.c @@ -40,7 +40,7 @@ #include #endif -#include +#include "../polypcore/winsock.h" #include #include diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c index 45d566ae..d2858aac 100644 --- a/src/modules/module-zeroconf-publish.c +++ b/src/modules/module-zeroconf-publish.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -37,11 +36,14 @@ #include #include #include -#include +#include #include -#include #include +#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 80051d54..482bab81 100644 --- a/src/polyp/browser.c +++ b/src/polyp/browser.c @@ -22,11 +22,12 @@ #include #include -#include "browser.h" #include #include #include +#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 3bb0d264..043b818a 100644 --- a/src/polyp/browser.h +++ b/src/polyp/browser.h @@ -25,7 +25,6 @@ #include #include #include -#include PA_C_DECL_BEGIN diff --git a/src/polyp/client-conf-x11.c b/src/polyp/client-conf-x11.c index 83d0bd2e..9e863bc7 100644 --- a/src/polyp/client-conf-x11.c +++ b/src/polyp/client-conf-x11.c @@ -29,12 +29,13 @@ #include #include -#include "client-conf-x11.h" #include #include #include #include +#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 80841171..64459224 100644 --- a/src/polyp/client-conf-x11.h +++ b/src/polyp/client-conf-x11.h @@ -22,7 +22,7 @@ USA. ***/ -#include +#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 2df201ce..328d01c9 100644 --- a/src/polyp/client-conf.c +++ b/src/polyp/client-conf.c @@ -35,7 +35,7 @@ #include #include -#include +#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 2d8a019f..de3efae7 100644 --- a/src/polyp/client-conf.h +++ b/src/polyp/client-conf.h @@ -22,7 +22,7 @@ USA. ***/ -#include "../polypcore/native-common.h" +#include /* A structure containing configuration data for polypaudio clients. */ diff --git a/src/polyp/context.c b/src/polyp/context.c index 4ac11caa..b7f7eb99 100644 --- a/src/polyp/context.c +++ b/src/polyp/context.c @@ -45,11 +45,10 @@ #include #endif -#include +#include "../polypcore/winsock.h" + +#include -#include "internal.h" -#include "context.h" -#include "version.h" #include #include #include @@ -59,13 +58,18 @@ #include #include #include -#include #include +#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 a137ab49..ece77bf2 100644 --- a/src/polyp/error.c +++ b/src/polyp/error.c @@ -26,9 +26,10 @@ #include #include -#include "error.h" #include +#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 962eb574..3937a1a9 100644 --- a/src/polyp/glib-mainloop.c +++ b/src/polyp/glib-mainloop.c @@ -25,12 +25,13 @@ #include -#include #include #include -#include "glib.h" #include +#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 80a02b1c..5ad23adb 100644 --- a/src/polyp/glib12-mainloop.c +++ b/src/polyp/glib12-mainloop.c @@ -25,11 +25,12 @@ #include -#include #include #include #include +#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 bdfd5d8e..762688c9 100644 --- a/src/polyp/internal.h +++ b/src/polyp/internal.h @@ -23,20 +23,21 @@ ***/ #include +#include +#include +#include + #include #include #include #include - -#include "context.h" -#include "stream.h" -#include "operation.h" #include #include -#include #include #include +#include "client-conf.h" + #define DEFAULT_TIMEOUT (10) struct pa_context { diff --git a/src/polyp/introspect.c b/src/polyp/introspect.c index d89eb9ed..4af724b4 100644 --- a/src/polyp/introspect.c +++ b/src/polyp/introspect.c @@ -25,11 +25,14 @@ #include -#include "introspect.h" -#include "context.h" -#include "internal.h" -#include +#include + #include +#include + +#include "internal.h" + +#include "introspect.h" /*** Statistics ***/ diff --git a/src/polyp/mainloop-api.c b/src/polyp/mainloop-api.c index a3eaee9c..71f55c05 100644 --- a/src/polyp/mainloop-api.c +++ b/src/polyp/mainloop-api.c @@ -26,9 +26,10 @@ #include #include -#include "mainloop-api.h" -#include #include +#include + +#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 a03c9159..e474f461 100644 --- a/src/polyp/mainloop-signal.c +++ b/src/polyp/mainloop-signal.c @@ -36,12 +36,13 @@ #include #endif -#include #include #include #include #include +#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 3fa9245c..71ea9bc4 100644 --- a/src/polyp/mainloop.c +++ b/src/polyp/mainloop.c @@ -38,14 +38,15 @@ #include "poll.h" #endif -#include +#include "../polypcore/winsock.h" -#include "mainloop.h" #include #include #include #include +#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 0baa661b..5440cf9e 100644 --- a/src/polyp/operation.c +++ b/src/polyp/operation.c @@ -26,7 +26,9 @@ #include #include + #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 c274e359..393b069e 100644 --- a/src/polyp/scache.c +++ b/src/polyp/scache.c @@ -28,10 +28,12 @@ #include #include -#include "scache.h" -#include "internal.h" #include +#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 19c49c9b..e14cab2e 100644 --- a/src/polyp/simple.c +++ b/src/polyp/simple.c @@ -28,13 +28,15 @@ #include #include -#include "simple.h" -#include "polypaudio.h" -#include "mainloop.h" +#include +#include + #include #include #include +#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 007d5e24..6e5bc067 100644 --- a/src/polyp/stream.c +++ b/src/polyp/stream.c @@ -28,12 +28,13 @@ #include #include -#include "internal.h" #include #include #include #include +#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 c481f525..b90e0bf1 100644 --- a/src/polyp/subscribe.c +++ b/src/polyp/subscribe.c @@ -26,10 +26,12 @@ #include #include -#include "subscribe.h" -#include "internal.h" -#include #include +#include + +#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 c727381f..67b7495b 100644 --- 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 + /** \file * Define header version */ diff --git a/src/polypcore/authkey-prop.c b/src/polypcore/authkey-prop.c index 8657f5a5..3faf0ef1 100644 --- a/src/polypcore/authkey-prop.c +++ b/src/polypcore/authkey-prop.c @@ -22,10 +22,11 @@ #include #include -#include "xmalloc.h" +#include +#include +#include + #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 29b40bb2..63fde5d8 100644 --- a/src/polypcore/authkey-prop.h +++ b/src/polypcore/authkey-prop.h @@ -22,7 +22,7 @@ USA. ***/ -#include "core.h" +#include /* 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 969f09d9..e3fc9f60 100644 --- a/src/polypcore/authkey.c +++ b/src/polypcore/authkey.c @@ -35,10 +35,11 @@ #include #include +#include +#include +#include + #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 83df8ef7..8d2dca30 100644 --- a/src/polypcore/autoload.c +++ b/src/polypcore/autoload.c @@ -27,14 +27,15 @@ #include #include +#include +#include +#include +#include +#include +#include +#include + #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 7350c16a..a8931fc7 100644 --- a/src/polypcore/autoload.h +++ b/src/polypcore/autoload.h @@ -22,7 +22,7 @@ USA. ***/ -#include "namereg.h" +#include /* 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 dd4cbe46..6c9fc4b1 100644 --- a/src/polypcore/cli-command.c +++ b/src/polypcore/cli-command.c @@ -29,26 +29,27 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #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 78b8d5c6..e7c70ecf 100644 --- a/src/polypcore/cli-command.h +++ b/src/polypcore/cli-command.h @@ -22,8 +22,8 @@ USA. ***/ -#include "strbuf.h" -#include "core.h" +#include +#include /* 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 d8446b06..8bffd0a7 100644 --- a/src/polypcore/cli-text.c +++ b/src/polypcore/cli-text.c @@ -26,19 +26,20 @@ #include #include -#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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 7a1a0361..a8f40003 100644 --- a/src/polypcore/cli-text.h +++ b/src/polypcore/cli-text.h @@ -22,7 +22,7 @@ USA. ***/ -#include "core.h" +#include /* 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 bc0c285d..295ce625 100644 --- a/src/polypcore/cli.c +++ b/src/polypcore/cli.c @@ -28,21 +28,22 @@ #include #include -#include "ioline.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #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 03f31c22..12ffd848 100644 --- 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 +#include +#include typedef struct pa_cli pa_cli; diff --git a/src/polypcore/client.c b/src/polypcore/client.c index 9b256794..7fe5a9fc 100644 --- a/src/polypcore/client.c +++ b/src/polypcore/client.c @@ -28,10 +28,11 @@ #include #include +#include +#include +#include + #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 92430338..8ddc6d94 100644 --- a/src/polypcore/client.h +++ b/src/polypcore/client.h @@ -22,8 +22,8 @@ USA. ***/ -#include "core.h" -#include "module.h" +#include +#include /* 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 507f2bf1..7eeda02b 100644 --- a/src/polypcore/conf-parser.c +++ b/src/polypcore/conf-parser.c @@ -28,10 +28,11 @@ #include #include +#include +#include +#include + #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 0d926aba..69199a33 100644 --- a/src/polypcore/core-scache.c +++ b/src/polypcore/core-scache.c @@ -41,19 +41,20 @@ #include #endif -#include "core-scache.h" -#include "sink-input.h" #include -#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 #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "core-scache.h" #define UNLOAD_POLL_TIME 2 diff --git a/src/polypcore/core-scache.h b/src/polypcore/core-scache.h index 0918ebe4..a383e50a 100644 --- 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 +#include +#include typedef struct pa_scache_entry { pa_core *core; diff --git a/src/polypcore/core-subscribe.c b/src/polypcore/core-subscribe.c index 2a258604..4d792966 100644 --- a/src/polypcore/core-subscribe.c +++ b/src/polypcore/core-subscribe.c @@ -26,10 +26,11 @@ #include #include -#include "queue.h" +#include +#include +#include + #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 bc9dcba3..7c856954 100644 --- 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 +#include 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 9d040e68..0093aebd 100644 --- a/src/polypcore/core.c +++ b/src/polypcore/core.c @@ -28,18 +28,19 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #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 29329025..a323ae8e 100644 --- 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 +#include #include #include -#include "memblock.h" -#include "resampler.h" -#include "queue.h" -#include "core-subscribe.h" +#include +#include +#include +#include /* 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 435fd768..1aff7f51 100644 --- a/src/polypcore/dynarray.c +++ b/src/polypcore/dynarray.c @@ -27,8 +27,9 @@ #include #include +#include + #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 a37decb8..8861fd3d 100644 --- a/src/polypcore/hashmap.c +++ b/src/polypcore/hashmap.c @@ -27,10 +27,11 @@ #include #include +#include +#include +#include + #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 409d1fab..8d3a2370 100644 --- a/src/polypcore/idxset.c +++ b/src/polypcore/idxset.c @@ -28,8 +28,9 @@ #include #include +#include + #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 273d47e0..7fd09152 100644 --- a/src/polypcore/iochannel.c +++ b/src/polypcore/iochannel.c @@ -30,10 +30,11 @@ #include "winsock.h" +#include +#include +#include + #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 5b669f5c..3f2de5a2 100644 --- a/src/polypcore/ioline.c +++ b/src/polypcore/ioline.c @@ -29,9 +29,10 @@ #include #include +#include +#include + #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 84ccb47a..e2dadf55 100644 --- a/src/polypcore/ioline.h +++ b/src/polypcore/ioline.h @@ -22,8 +22,8 @@ USA. ***/ -#include "iochannel.h" -#include "util.h" +#include +#include /* 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 97406f79..c7bf7be9 100644 --- a/src/polypcore/log.c +++ b/src/polypcore/log.c @@ -31,9 +31,10 @@ #include #endif +#include +#include + #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 ce8aea98..c306acaf 100644 --- a/src/polypcore/log.h +++ b/src/polypcore/log.h @@ -23,7 +23,7 @@ ***/ #include -#include "gccmacro.h" +#include /* A simple logging subsystem */ diff --git a/src/polypcore/mcalign.c b/src/polypcore/mcalign.c index 4d765625..0f229e28 100644 --- a/src/polypcore/mcalign.c +++ b/src/polypcore/mcalign.c @@ -28,8 +28,9 @@ #include #include +#include + #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 5de75bc7..a9107e0e 100644 --- a/src/polypcore/mcalign.h +++ b/src/polypcore/mcalign.h @@ -22,8 +22,8 @@ USA. ***/ -#include "memblock.h" -#include "memchunk.h" +#include +#include /* 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 8da53525..2c0bef57 100644 --- a/src/polypcore/memblock.c +++ b/src/polypcore/memblock.c @@ -28,8 +28,9 @@ #include #include +#include + #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 ba6b76ea..4a0225e5 100644 --- a/src/polypcore/memblockq.c +++ b/src/polypcore/memblockq.c @@ -30,10 +30,11 @@ #include #include +#include +#include +#include + #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 1695daba..7bb25f90 100644 --- a/src/polypcore/memblockq.h +++ b/src/polypcore/memblockq.h @@ -24,8 +24,8 @@ #include -#include "memblock.h" -#include "memchunk.h" +#include +#include /* 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 bfd74f9e..d6856ab8 100644 --- a/src/polypcore/memchunk.c +++ b/src/polypcore/memchunk.c @@ -28,8 +28,9 @@ #include #include +#include + #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 4eefc8c1..3ddb28ee 100644 --- a/src/polypcore/memchunk.h +++ b/src/polypcore/memchunk.h @@ -22,7 +22,7 @@ USA. ***/ -#include "memblock.h" +#include /* 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 07062946..6bd13c3b 100644 --- a/src/polypcore/modargs.c +++ b/src/polypcore/modargs.c @@ -28,15 +28,16 @@ #include #include -#include "hashmap.h" +#include +#include +#include +#include +#include +#include +#include +#include + #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 678ea1a7..47e2d522 100644 --- a/src/polypcore/modargs.h +++ b/src/polypcore/modargs.h @@ -24,7 +24,7 @@ #include #include -#include "core.h" +#include typedef struct pa_modargs pa_modargs; diff --git a/src/polypcore/modinfo.c b/src/polypcore/modinfo.c index 53440612..4204bb34 100644 --- a/src/polypcore/modinfo.c +++ b/src/polypcore/modinfo.c @@ -26,10 +26,11 @@ #include #include -#include "xmalloc.h" -#include "util.h" +#include +#include +#include + #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 73ec5bd4..75385354 100644 --- a/src/polypcore/module.c +++ b/src/polypcore/module.c @@ -30,11 +30,12 @@ #include #include +#include +#include +#include +#include + #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 6f137c15..03b9bc87 100644 --- a/src/polypcore/module.h +++ b/src/polypcore/module.h @@ -25,8 +25,8 @@ #include #include -#include "core.h" -#include "modinfo.h" +#include +#include typedef struct pa_module pa_module; diff --git a/src/polypcore/namereg.c b/src/polypcore/namereg.c index ca03c455..d4dbd14b 100644 --- a/src/polypcore/namereg.c +++ b/src/polypcore/namereg.c @@ -29,13 +29,14 @@ #include #include +#include +#include +#include +#include +#include +#include + #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 961fd44b..a98295ff 100644 --- a/src/polypcore/namereg.h +++ b/src/polypcore/namereg.h @@ -22,7 +22,7 @@ USA. ***/ -#include "core.h" +#include typedef enum pa_namereg_type { PA_NAMEREG_SINK, diff --git a/src/polypcore/packet.c b/src/polypcore/packet.c index b3a2e074..41803cf9 100644 --- a/src/polypcore/packet.c +++ b/src/polypcore/packet.c @@ -26,8 +26,9 @@ #include #include +#include + #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 5e4c689c..c2b25c89 100644 --- a/src/polypcore/parseaddr.c +++ b/src/polypcore/parseaddr.c @@ -27,8 +27,9 @@ #include #include -#include "xmalloc.h" -#include "util.h" +#include +#include + #include "parseaddr.h" /* Parse addresses in one of the following forms: diff --git a/src/polypcore/pdispatch.c b/src/polypcore/pdispatch.c index 5a50a0d5..7941e4a8 100644 --- a/src/polypcore/pdispatch.c +++ b/src/polypcore/pdispatch.c @@ -27,12 +27,13 @@ #include #include +#include +#include +#include +#include +#include + #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 fdd4d7f5..57666259 100644 --- a/src/polypcore/pdispatch.h +++ b/src/polypcore/pdispatch.h @@ -23,9 +23,9 @@ ***/ #include -#include "tagstruct.h" -#include "packet.h" #include +#include +#include typedef struct pa_pdispatch pa_pdispatch; diff --git a/src/polypcore/pid.c b/src/polypcore/pid.c index ae3dc7f5..3f33365a 100644 --- a/src/polypcore/pid.c +++ b/src/polypcore/pid.c @@ -39,9 +39,10 @@ #include #endif +#include +#include + #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 e24d4427..ec79254b 100644 --- a/src/polypcore/play-memchunk.c +++ b/src/polypcore/play-memchunk.c @@ -28,10 +28,11 @@ #include #include +#include +#include +#include + #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 fc0654a6..72aeda95 100644 --- a/src/polypcore/play-memchunk.h +++ b/src/polypcore/play-memchunk.h @@ -22,8 +22,8 @@ USA. ***/ -#include "sink.h" -#include "memchunk.h" +#include +#include int pa_play_memchunk( pa_sink *sink, diff --git a/src/polypcore/poll.c b/src/polypcore/poll.c index 193fc812..6a29a953 100644 --- a/src/polypcore/poll.c +++ b/src/polypcore/poll.c @@ -42,7 +42,8 @@ #ifndef HAVE_SYS_POLL_H -#include "util.h" +#include + #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 df748c1e..96cdc4f2 100644 --- a/src/polypcore/props.c +++ b/src/polypcore/props.c @@ -21,9 +21,10 @@ #include -#include "xmalloc.h" +#include +#include + #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 5abf8787..9430db5e 100644 --- a/src/polypcore/props.h +++ b/src/polypcore/props.h @@ -22,8 +22,8 @@ USA. ***/ -#include "core.h" -#include "strbuf.h" +#include +#include /* 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 d2d73550..cb7e8f6f 100644 --- a/src/polypcore/protocol-cli.c +++ b/src/polypcore/protocol-cli.c @@ -26,10 +26,11 @@ #include #include +#include +#include +#include + #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 aed733c1..c47b14d6 100644 --- 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 +#include +#include +#include typedef struct pa_protocol_cli pa_protocol_cli; diff --git a/src/polypcore/protocol-esound.c b/src/polypcore/protocol-esound.c index d2c0f354..a16ac280 100644 --- a/src/polypcore/protocol-esound.c +++ b/src/polypcore/protocol-esound.c @@ -30,24 +30,26 @@ #include #include -#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 -#include "core-scache.h" -#include "sample-util.h" -#include "authkey.h" -#include "namereg.h" -#include "xmalloc.h" -#include "log.h" -#include "util.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #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 71d58464..a94d1c72 100644 --- 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 +#include +#include +#include typedef struct pa_protocol_esound pa_protocol_esound; diff --git a/src/polypcore/protocol-http.c b/src/polypcore/protocol-http.c index 3e55df03..f0b78124 100644 --- a/src/polypcore/protocol-http.c +++ b/src/polypcore/protocol-http.c @@ -28,12 +28,13 @@ #include #include +#include +#include +#include +#include +#include + #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 0a1855e9..10dd656b 100644 --- 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 +#include +#include +#include typedef struct pa_protocol_http pa_protocol_http; diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c index 31983bc2..1362fdf2 100644 --- a/src/polypcore/protocol-native.c +++ b/src/polypcore/protocol-native.c @@ -28,27 +28,28 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #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 12e85d0b..88aa8494 100644 --- 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 +#include +#include +#include typedef struct pa_protocol_native pa_protocol_native; diff --git a/src/polypcore/protocol-simple.c b/src/polypcore/protocol-simple.c index 113919b3..4d3f8e1d 100644 --- a/src/polypcore/protocol-simple.c +++ b/src/polypcore/protocol-simple.c @@ -30,14 +30,15 @@ #include #include -#include "sink-input.h" -#include "source-output.h" +#include +#include +#include +#include +#include +#include +#include + #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 63455a53..f11c7759 100644 --- 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 +#include +#include +#include typedef struct pa_protocol_simple pa_protocol_simple; diff --git a/src/polypcore/pstream-util.c b/src/polypcore/pstream-util.c index ecd63d15..62986456 100644 --- a/src/polypcore/pstream-util.c +++ b/src/polypcore/pstream-util.c @@ -25,7 +25,8 @@ #include -#include "native-common.h" +#include + #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 601a9e99..c400c6d8 100644 --- a/src/polypcore/pstream-util.h +++ b/src/polypcore/pstream-util.h @@ -23,8 +23,8 @@ ***/ #include -#include "pstream.h" -#include "tagstruct.h" +#include +#include /* 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 bd00ba4f..eec93a0f 100644 --- a/src/polypcore/pstream.c +++ b/src/polypcore/pstream.c @@ -34,10 +34,11 @@ #include "winsock.h" +#include +#include +#include + #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 ec63a98e..10ce58f6 100644 --- a/src/polypcore/pstream.h +++ b/src/polypcore/pstream.h @@ -24,11 +24,11 @@ #include -#include "packet.h" -#include "memblock.h" -#include "iochannel.h" #include -#include "memchunk.h" +#include +#include +#include +#include typedef struct pa_pstream pa_pstream; diff --git a/src/polypcore/queue.c b/src/polypcore/queue.c index 80ec0068..77ca1ed3 100644 --- a/src/polypcore/queue.c +++ b/src/polypcore/queue.c @@ -26,8 +26,9 @@ #include #include +#include + #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 12f27bfd..756c3218 100644 --- a/src/polypcore/random.c +++ b/src/polypcore/random.c @@ -31,9 +31,10 @@ #include #include +#include +#include + #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 0417e44e..c1740bf1 100644 --- a/src/polypcore/resampler.c +++ b/src/polypcore/resampler.c @@ -30,10 +30,11 @@ #include #include +#include +#include +#include + #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 cad48be5..2f4d3cbe 100644 --- a/src/polypcore/resampler.h +++ b/src/polypcore/resampler.h @@ -25,9 +25,9 @@ #include #include -#include "memblock.h" -#include "memchunk.h" #include +#include +#include typedef struct pa_resampler pa_resampler; diff --git a/src/polypcore/sample-util.c b/src/polypcore/sample-util.c index 52974c46..e3bb4aa6 100644 --- a/src/polypcore/sample-util.c +++ b/src/polypcore/sample-util.c @@ -30,7 +30,8 @@ #include -#include "log.h" +#include + #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 d0efbcc4..486d284b 100644 --- a/src/polypcore/sample-util.h +++ b/src/polypcore/sample-util.h @@ -23,9 +23,9 @@ ***/ #include -#include "memblock.h" -#include "memchunk.h" #include +#include +#include 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 e47c5e8e..0814c35b 100644 --- a/src/polypcore/sconv-s16le.c +++ b/src/polypcore/sconv-s16le.c @@ -28,10 +28,12 @@ #include +#include +#include + #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 1fcb5a0c..c557be67 100644 --- a/src/polypcore/sconv.c +++ b/src/polypcore/sconv.c @@ -30,13 +30,14 @@ #include #include -#include "endianmacros.h" -#include "sconv.h" -#include "g711.h" +#include +#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 696c47a4..1dc7df0f 100644 --- a/src/polypcore/sink-input.c +++ b/src/polypcore/sink-input.c @@ -28,11 +28,12 @@ #include #include +#include +#include +#include +#include + #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 a5ad1958..e4b8bda4 100644 --- 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 -#include "memblockq.h" -#include "resampler.h" -#include "module.h" -#include "client.h" +#include +#include +#include +#include +#include typedef enum pa_sink_input_state { PA_SINK_INPUT_RUNNING, diff --git a/src/polypcore/sink.c b/src/polypcore/sink.c index 6c143463..9bc478c3 100644 --- a/src/polypcore/sink.c +++ b/src/polypcore/sink.c @@ -28,15 +28,16 @@ #include #include -#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 +#include +#include +#include +#include +#include +#include +#include + +#include "sink.h" #define MAX_MIX_CHANNELS 32 diff --git a/src/polypcore/sink.h b/src/polypcore/sink.h index 268461ef..5fd9784f 100644 --- a/src/polypcore/sink.h +++ b/src/polypcore/sink.h @@ -26,13 +26,13 @@ typedef struct pa_sink pa_sink; -#include "core.h" #include -#include "idxset.h" -#include "source.h" #include -#include "module.h" #include +#include +#include +#include +#include #define PA_MAX_INPUTS_PER_SINK 6 diff --git a/src/polypcore/sioman.c b/src/polypcore/sioman.c index 8d7b136c..b389ecee 100644 --- a/src/polypcore/sioman.c +++ b/src/polypcore/sioman.c @@ -24,6 +24,7 @@ #endif #include + #include "sioman.h" static int stdio_inuse = 0; diff --git a/src/polypcore/socket-client.c b/src/polypcore/socket-client.c index 29c9775e..3662e89c 100644 --- a/src/polypcore/socket-client.c +++ b/src/polypcore/socket-client.c @@ -54,12 +54,13 @@ #include "winsock.h" +#include +#include +#include +#include +#include + #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 624880d7..d0005331 100644 --- a/src/polypcore/socket-client.h +++ b/src/polypcore/socket-client.h @@ -25,7 +25,7 @@ #include #include -#include "iochannel.h" +#include struct sockaddr; diff --git a/src/polypcore/socket-server.c b/src/polypcore/socket-server.c index 262b32a7..d1646984 100644 --- a/src/polypcore/socket-server.c +++ b/src/polypcore/socket-server.c @@ -58,11 +58,12 @@ #include "winsock.h" +#include +#include +#include +#include + #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 4d8bfad5..6bb83427 100644 --- a/src/polypcore/socket-server.h +++ b/src/polypcore/socket-server.h @@ -24,7 +24,7 @@ #include #include -#include "iochannel.h" +#include /* 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 032a3c91..5ffe5302 100644 --- a/src/polypcore/socket-util.c +++ b/src/polypcore/socket-util.c @@ -59,10 +59,11 @@ #include "winsock.h" +#include +#include +#include + #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 881e3077..644e578f 100644 --- a/src/polypcore/sound-file-stream.c +++ b/src/polypcore/sound-file-stream.c @@ -30,10 +30,11 @@ #include +#include +#include +#include + #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 2e56ef49..5effc7f0 100644 --- a/src/polypcore/sound-file-stream.h +++ b/src/polypcore/sound-file-stream.h @@ -22,7 +22,7 @@ USA. ***/ -#include "sink.h" +#include 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 a81c283a..cf23e0ac 100644 --- a/src/polypcore/sound-file.c +++ b/src/polypcore/sound-file.c @@ -28,9 +28,10 @@ #include -#include "sound-file.h" #include -#include "log.h" +#include + +#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 f3003bb9..ffa551b5 100644 --- a/src/polypcore/sound-file.h +++ b/src/polypcore/sound-file.h @@ -22,8 +22,8 @@ USA. ***/ -#include "memchunk.h" #include +#include 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 9b75a8b0..d6201b4d 100644 --- a/src/polypcore/source-output.c +++ b/src/polypcore/source-output.c @@ -28,10 +28,11 @@ #include #include +#include +#include +#include + #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 4b1cbf15..98f6ab0c 100644 --- 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 -#include "memblockq.h" -#include "resampler.h" -#include "module.h" -#include "client.h" +#include +#include +#include +#include +#include typedef enum { PA_SOURCE_OUTPUT_RUNNING, diff --git a/src/polypcore/source.c b/src/polypcore/source.c index c64f7b99..b70cb129 100644 --- a/src/polypcore/source.c +++ b/src/polypcore/source.c @@ -28,12 +28,13 @@ #include #include +#include +#include +#include +#include +#include + #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 be2fb985..a267e73c 100644 --- a/src/polypcore/source.h +++ b/src/polypcore/source.h @@ -25,14 +25,15 @@ typedef struct pa_source pa_source; #include -#include "core.h" + #include -#include "idxset.h" -#include "memblock.h" -#include "memchunk.h" -#include "sink.h" #include -#include "module.h" +#include +#include +#include +#include +#include +#include #define PA_MAX_OUTPUTS_PER_SOURCE 16 diff --git a/src/polypcore/strbuf.h b/src/polypcore/strbuf.h index a88f5190..4b06a7e6 100644 --- a/src/polypcore/strbuf.h +++ b/src/polypcore/strbuf.h @@ -22,7 +22,7 @@ USA. ***/ -#include "gccmacro.h" +#include typedef struct pa_strbuf pa_strbuf; diff --git a/src/polypcore/strlist.c b/src/polypcore/strlist.c index 09eb0c8a..e165aefd 100644 --- a/src/polypcore/strlist.c +++ b/src/polypcore/strlist.c @@ -26,10 +26,11 @@ #include #include +#include +#include +#include + #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 676f67de..1f5f370b 100644 --- a/src/polypcore/tagstruct.c +++ b/src/polypcore/tagstruct.c @@ -36,8 +36,9 @@ #include "winsock.h" +#include + #include "tagstruct.h" -#include "xmalloc.h" struct pa_tagstruct { diff --git a/src/polypcore/tokenizer.c b/src/polypcore/tokenizer.c index 5e0c1b16..556a190a 100644 --- a/src/polypcore/tokenizer.c +++ b/src/polypcore/tokenizer.c @@ -27,10 +27,11 @@ #include #include +#include +#include +#include + #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 4b6edb97..a53c36bc 100644 --- a/src/polypcore/util.c +++ b/src/polypcore/util.c @@ -70,9 +70,10 @@ #include "winsock.h" +#include +#include + #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 3dc6c945..14f763a3 100644 --- a/src/polypcore/util.h +++ b/src/polypcore/util.h @@ -27,8 +27,8 @@ #include #include -#include "gccmacro.h" #include +#include struct timeval; diff --git a/src/polypcore/x11wrap.c b/src/polypcore/x11wrap.c index e20a50a6..9414fbdf 100644 --- a/src/polypcore/x11wrap.c +++ b/src/polypcore/x11wrap.c @@ -22,11 +22,12 @@ #include #include -#include "llist.h" +#include +#include +#include +#include + #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 15645168..15969869 100644 --- a/src/polypcore/x11wrap.h +++ b/src/polypcore/x11wrap.h @@ -24,7 +24,7 @@ #include -#include "core.h" +#include typedef struct pa_x11_wrapper pa_x11_wrapper; diff --git a/src/polypcore/xmalloc.c b/src/polypcore/xmalloc.c index bf366347..4c8689a6 100644 --- a/src/polypcore/xmalloc.c +++ b/src/polypcore/xmalloc.c @@ -27,11 +27,12 @@ #include #include #include +#include + +#include +#include -#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 97a8a0dd..b51014c8 100644 --- a/src/tests/cpulimit-test.c +++ b/src/tests/cpulimit-test.c @@ -29,7 +29,6 @@ #include #include -#include "../daemon/cpulimit.h" #include #include @@ -37,6 +36,8 @@ #include #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 908a3507..56b62d37 100644 --- a/src/utils/pax11publish.c +++ b/src/utils/pax11publish.c @@ -36,7 +36,8 @@ #include #include #include -#include + +#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; -- cgit