[polypaudio-commits] r500 - in /trunk/src: daemon/ modules/ polyp/ polypcore/ tests/ utils/
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Fri Feb 17 04:11:03 PST 2006
Author: ossman
Date: Fri Feb 17 13:10:58 2006
New Revision: 500
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=500&root=polypaudio&view=rev
Log:
Cleaned up the includes after the restructuring. Indicate which headers are
public and which are internal through <> vs "".
Modified:
trunk/src/daemon/caps.c
trunk/src/daemon/cmdline.c
trunk/src/daemon/cpulimit.c
trunk/src/daemon/daemon-conf.c
trunk/src/daemon/dumpmodules.c
trunk/src/daemon/main.c
trunk/src/modules/howl-wrap.c
trunk/src/modules/howl-wrap.h
trunk/src/modules/module-alsa-sink.c
trunk/src/modules/module-alsa-source.c
trunk/src/modules/module-oss.c
trunk/src/modules/module-protocol-stub.c
trunk/src/modules/module-zeroconf-publish.c
trunk/src/polyp/browser.c
trunk/src/polyp/browser.h
trunk/src/polyp/client-conf-x11.c
trunk/src/polyp/client-conf-x11.h
trunk/src/polyp/client-conf.c
trunk/src/polyp/client-conf.h
trunk/src/polyp/context.c
trunk/src/polyp/error.c
trunk/src/polyp/glib-mainloop.c
trunk/src/polyp/glib12-mainloop.c
trunk/src/polyp/internal.h
trunk/src/polyp/introspect.c
trunk/src/polyp/mainloop-api.c
trunk/src/polyp/mainloop-signal.c
trunk/src/polyp/mainloop.c
trunk/src/polyp/operation.c
trunk/src/polyp/scache.c
trunk/src/polyp/simple.c
trunk/src/polyp/stream.c
trunk/src/polyp/subscribe.c
trunk/src/polyp/version.h.in
trunk/src/polypcore/authkey-prop.c
trunk/src/polypcore/authkey-prop.h
trunk/src/polypcore/authkey.c
trunk/src/polypcore/autoload.c
trunk/src/polypcore/autoload.h
trunk/src/polypcore/cli-command.c
trunk/src/polypcore/cli-command.h
trunk/src/polypcore/cli-text.c
trunk/src/polypcore/cli-text.h
trunk/src/polypcore/cli.c
trunk/src/polypcore/cli.h
trunk/src/polypcore/client.c
trunk/src/polypcore/client.h
trunk/src/polypcore/conf-parser.c
trunk/src/polypcore/core-scache.c
trunk/src/polypcore/core-scache.h
trunk/src/polypcore/core-subscribe.c
trunk/src/polypcore/core-subscribe.h
trunk/src/polypcore/core.c
trunk/src/polypcore/core.h
trunk/src/polypcore/dynarray.c
trunk/src/polypcore/hashmap.c
trunk/src/polypcore/idxset.c
trunk/src/polypcore/iochannel.c
trunk/src/polypcore/ioline.c
trunk/src/polypcore/ioline.h
trunk/src/polypcore/log.c
trunk/src/polypcore/log.h
trunk/src/polypcore/mcalign.c
trunk/src/polypcore/mcalign.h
trunk/src/polypcore/memblock.c
trunk/src/polypcore/memblockq.c
trunk/src/polypcore/memblockq.h
trunk/src/polypcore/memchunk.c
trunk/src/polypcore/memchunk.h
trunk/src/polypcore/modargs.c
trunk/src/polypcore/modargs.h
trunk/src/polypcore/modinfo.c
trunk/src/polypcore/module.c
trunk/src/polypcore/module.h
trunk/src/polypcore/namereg.c
trunk/src/polypcore/namereg.h
trunk/src/polypcore/packet.c
trunk/src/polypcore/parseaddr.c
trunk/src/polypcore/pdispatch.c
trunk/src/polypcore/pdispatch.h
trunk/src/polypcore/pid.c
trunk/src/polypcore/play-memchunk.c
trunk/src/polypcore/play-memchunk.h
trunk/src/polypcore/poll.c
trunk/src/polypcore/props.c
trunk/src/polypcore/props.h
trunk/src/polypcore/protocol-cli.c
trunk/src/polypcore/protocol-cli.h
trunk/src/polypcore/protocol-esound.c
trunk/src/polypcore/protocol-esound.h
trunk/src/polypcore/protocol-http.c
trunk/src/polypcore/protocol-http.h
trunk/src/polypcore/protocol-native.c
trunk/src/polypcore/protocol-native.h
trunk/src/polypcore/protocol-simple.c
trunk/src/polypcore/protocol-simple.h
trunk/src/polypcore/pstream-util.c
trunk/src/polypcore/pstream-util.h
trunk/src/polypcore/pstream.c
trunk/src/polypcore/pstream.h
trunk/src/polypcore/queue.c
trunk/src/polypcore/random.c
trunk/src/polypcore/resampler.c
trunk/src/polypcore/resampler.h
trunk/src/polypcore/sample-util.c
trunk/src/polypcore/sample-util.h
trunk/src/polypcore/sconv-s16le.c
trunk/src/polypcore/sconv.c
trunk/src/polypcore/sink-input.c
trunk/src/polypcore/sink-input.h
trunk/src/polypcore/sink.c
trunk/src/polypcore/sink.h
trunk/src/polypcore/sioman.c
trunk/src/polypcore/socket-client.c
trunk/src/polypcore/socket-client.h
trunk/src/polypcore/socket-server.c
trunk/src/polypcore/socket-server.h
trunk/src/polypcore/socket-util.c
trunk/src/polypcore/sound-file-stream.c
trunk/src/polypcore/sound-file-stream.h
trunk/src/polypcore/sound-file.c
trunk/src/polypcore/sound-file.h
trunk/src/polypcore/source-output.c
trunk/src/polypcore/source-output.h
trunk/src/polypcore/source.c
trunk/src/polypcore/source.h
trunk/src/polypcore/strbuf.h
trunk/src/polypcore/strlist.c
trunk/src/polypcore/tagstruct.c
trunk/src/polypcore/tokenizer.c
trunk/src/polypcore/util.c
trunk/src/polypcore/util.h
trunk/src/polypcore/x11wrap.c
trunk/src/polypcore/x11wrap.h
trunk/src/polypcore/xmalloc.c
trunk/src/tests/cpulimit-test.c
trunk/src/utils/pax11publish.c
Modified: trunk/src/daemon/caps.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/caps.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/daemon/caps.c (original)
+++ trunk/src/daemon/caps.c Fri Feb 17 13:10:58 2006
@@ -33,6 +33,7 @@
#endif
#include <polypcore/log.h>
+
#include "caps.h"
#ifdef HAVE_GETUID
Modified: trunk/src/daemon/cmdline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cmdline.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/daemon/cmdline.c (original)
+++ trunk/src/daemon/cmdline.c Fri Feb 17 13:10:58 2006
@@ -30,10 +30,11 @@
#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 {
Modified: trunk/src/daemon/cpulimit.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/cpulimit.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/daemon/cpulimit.c (original)
+++ trunk/src/daemon/cpulimit.c Fri Feb 17 13:10:58 2006
@@ -23,9 +23,10 @@
#include <config.h>
#endif
-#include "cpulimit.h"
#include <polypcore/util.h>
#include <polypcore/log.h>
+
+#include "cpulimit.h"
#ifdef HAVE_SIGXCPU
Modified: trunk/src/daemon/daemon-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/daemon/daemon-conf.c (original)
+++ trunk/src/daemon/daemon-conf.c Fri Feb 17 13:10:58 2006
@@ -29,12 +29,13 @@
#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
Modified: trunk/src/daemon/dumpmodules.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/dumpmodules.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/daemon/dumpmodules.c (original)
+++ trunk/src/daemon/dumpmodules.c Fri Feb 17 13:10:58 2006
@@ -29,9 +29,10 @@
#include <stdio.h>
#include <ltdl.h>
-#include "dumpmodules.h"
#include <polypcore/modinfo.h>
#include <polypcore/util.h>
+
+#include "dumpmodules.h"
#define PREFIX "module-"
Modified: trunk/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/main.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/daemon/main.c (original)
+++ trunk/src/daemon/main.c Fri Feb 17 13:10:58 2006
@@ -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 */
Modified: trunk/src/modules/howl-wrap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/howl-wrap.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/modules/howl-wrap.c (original)
+++ trunk/src/modules/howl-wrap.c Fri Feb 17 13:10:58 2006
@@ -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"
Modified: trunk/src/modules/howl-wrap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/howl-wrap.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/modules/howl-wrap.h (original)
+++ trunk/src/modules/howl-wrap.h Fri Feb 17 13:10:58 2006
@@ -24,7 +24,7 @@
#include <howl.h>
-#include "core.h"
+#include <polypcore/core.h>
pa_howl_wrapper;
Modified: trunk/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-sink.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-sink.c (original)
+++ trunk/src/modules/module-alsa-sink.c Fri Feb 17 13:10:58 2006
@@ -44,8 +44,8 @@
#include <polypcore/xmalloc.h>
#include <polypcore/log.h>
+#include "alsa-util.h"
#include "module-alsa-sink-symdef.h"
-#include "alsa-util.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("ALSA Sink")
Modified: trunk/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-source.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-source.c (original)
+++ trunk/src/modules/module-alsa-source.c Fri Feb 17 13:10:58 2006
@@ -44,8 +44,8 @@
#include <polypcore/xmalloc.h>
#include <polypcore/log.h>
+#include "alsa-util.h"
#include "module-alsa-source-symdef.h"
-#include "alsa-util.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("ALSA Source")
Modified: trunk/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/modules/module-oss.c (original)
+++ trunk/src/modules/module-oss.c Fri Feb 17 13:10:58 2006
@@ -45,8 +45,8 @@
#include <polypcore/xmalloc.h>
#include <polypcore/log.h>
+#include "oss-util.h"
#include "module-oss-symdef.h"
-#include "oss-util.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("OSS Sink/Source")
Modified: trunk/src/modules/module-protocol-stub.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-protocol-stub.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/modules/module-protocol-stub.c (original)
+++ trunk/src/modules/module-protocol-stub.c Fri Feb 17 13:10:58 2006
@@ -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>
Modified: trunk/src/modules/module-zeroconf-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-zeroconf-publish.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/modules/module-zeroconf-publish.c (original)
+++ trunk/src/modules/module-zeroconf-publish.c Fri Feb 17 13:10:58 2006
@@ -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,10 +36,13 @@
#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"
Modified: trunk/src/polyp/browser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/browser.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/browser.c (original)
+++ trunk/src/polyp/browser.c Fri Feb 17 13:10:58 2006
@@ -22,10 +22,11 @@
#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."
Modified: trunk/src/polyp/browser.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/browser.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/browser.h (original)
+++ trunk/src/polyp/browser.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polyp/client-conf-x11.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/client-conf-x11.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/client-conf-x11.c (original)
+++ trunk/src/polyp/client-conf-x11.c Fri Feb 17 13:10:58 2006
@@ -29,11 +29,12 @@
#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;
Modified: trunk/src/polyp/client-conf-x11.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/client-conf-x11.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/client-conf-x11.h (original)
+++ trunk/src/polyp/client-conf-x11.h Fri Feb 17 13:10:58 2006
@@ -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 */
Modified: trunk/src/polyp/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/client-conf.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/client-conf.c (original)
+++ trunk/src/polyp/client-conf.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polyp/client-conf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/client-conf.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/client-conf.h (original)
+++ trunk/src/polyp/client-conf.h Fri Feb 17 13:10:58 2006
@@ -22,7 +22,7 @@
USA.
***/
-#include "../polypcore/native-common.h"
+#include <polypcore/native-common.h>
/* A structure containing configuration data for polypaudio clients. */
Modified: trunk/src/polyp/context.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/context.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/context.c (original)
+++ trunk/src/polyp/context.c Fri Feb 17 13:10:58 2006
@@ -45,11 +45,10 @@
#include <netdb.h>
#endif
-#include <polypcore/winsock.h>
-
-#include "internal.h"
-#include "context.h"
-#include "version.h"
+#include "../polypcore/winsock.h"
+
+#include <polyp/version.h>
+
#include <polypcore/native-common.h>
#include <polypcore/pdispatch.h>
#include <polypcore/pstream.h>
@@ -59,12 +58,17 @@
#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"
Modified: trunk/src/polyp/error.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/error.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/error.c (original)
+++ trunk/src/polyp/error.c Fri Feb 17 13:10:58 2006
@@ -26,8 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
+#include <polypcore/native-common.h>
+
#include "error.h"
-#include <polypcore/native-common.h>
static const char* const errortab[PA_ERROR_MAX] = {
[PA_ERROR_OK] = "OK",
Modified: trunk/src/polyp/glib-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/glib-mainloop.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/glib-mainloop.c (original)
+++ trunk/src/polyp/glib-mainloop.c Fri Feb 17 13:10:58 2006
@@ -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.h"
-#include <polypcore/util.h>
+#include "glib-mainloop.h"
struct pa_io_event {
pa_glib_mainloop *mainloop;
Modified: trunk/src/polyp/glib12-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/glib12-mainloop.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/glib12-mainloop.c (original)
+++ trunk/src/polyp/glib12-mainloop.c Fri Feb 17 13:10:58 2006
@@ -25,10 +25,11 @@
#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 */
Modified: trunk/src/polyp/internal.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/internal.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/internal.h (original)
+++ trunk/src/polyp/internal.h Fri Feb 17 13:10:58 2006
@@ -23,19 +23,20 @@
***/
#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)
Modified: trunk/src/polyp/introspect.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/introspect.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/introspect.c (original)
+++ trunk/src/polyp/introspect.c Fri Feb 17 13:10:58 2006
@@ -25,11 +25,14 @@
#include <assert.h>
+#include <polyp/context.h>
+
+#include <polypcore/gccmacro.h>
+#include <polypcore/pstream-util.h>
+
+#include "internal.h"
+
#include "introspect.h"
-#include "context.h"
-#include "internal.h"
-#include <polypcore/pstream-util.h>
-#include <polypcore/gccmacro.h>
/*** Statistics ***/
Modified: trunk/src/polyp/mainloop-api.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/mainloop-api.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/mainloop-api.c (original)
+++ trunk/src/polyp/mainloop-api.c Fri Feb 17 13:10:58 2006
@@ -26,9 +26,10 @@
#include <assert.h>
#include <stdlib.h>
+#include <polypcore/gccmacro.h>
+#include <polypcore/xmalloc.h>
+
#include "mainloop-api.h"
-#include <polypcore/xmalloc.h>
-#include <polypcore/gccmacro.h>
struct once_info {
void (*callback)(pa_mainloop_api*m, void *userdata);
Modified: trunk/src/polyp/mainloop-signal.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/mainloop-signal.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/mainloop-signal.c (original)
+++ trunk/src/polyp/mainloop-signal.c Fri Feb 17 13:10:58 2006
@@ -36,11 +36,12 @@
#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;
Modified: trunk/src/polyp/mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/mainloop.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/mainloop.c (original)
+++ trunk/src/polyp/mainloop.c Fri Feb 17 13:10:58 2006
@@ -38,13 +38,14 @@
#include "poll.h"
#endif
-#include <polypcore/winsock.h>
-
-#include "mainloop.h"
+#include "../polypcore/winsock.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;
Modified: trunk/src/polyp/operation.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/operation.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/operation.c (original)
+++ trunk/src/polyp/operation.c Fri Feb 17 13:10:58 2006
@@ -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) {
Modified: trunk/src/polyp/scache.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/scache.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/scache.c (original)
+++ trunk/src/polyp/scache.c Fri Feb 17 13:10:58 2006
@@ -28,9 +28,11 @@
#include <stdio.h>
#include <string.h>
+#include <polypcore/pstream-util.h>
+
+#include "internal.h"
+
#include "scache.h"
-#include "internal.h"
-#include <polypcore/pstream-util.h>
void pa_stream_connect_upload(pa_stream *s, size_t length) {
pa_tagstruct *t;
Modified: trunk/src/polyp/simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/simple.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/simple.c (original)
+++ trunk/src/polyp/simple.c Fri Feb 17 13:10:58 2006
@@ -28,12 +28,14 @@
#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;
Modified: trunk/src/polyp/stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/stream.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/stream.c (original)
+++ trunk/src/polyp/stream.c Fri Feb 17 13:10:58 2006
@@ -28,11 +28,12 @@
#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)
Modified: trunk/src/polyp/subscribe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/subscribe.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/subscribe.c (original)
+++ trunk/src/polyp/subscribe.c Fri Feb 17 13:10:58 2006
@@ -26,10 +26,12 @@
#include <assert.h>
#include <stdio.h>
+#include <polypcore/gccmacro.h>
+#include <polypcore/pstream-util.h>
+
+#include "internal.h"
+
#include "subscribe.h"
-#include "internal.h"
-#include <polypcore/pstream-util.h>
-#include <polypcore/gccmacro.h>
void pa_command_subscribe_event(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_context *c = userdata;
Modified: trunk/src/polyp/version.h.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/version.h.in?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polyp/version.h.in (original)
+++ trunk/src/polyp/version.h.in Fri Feb 17 13:10:58 2006
@@ -24,6 +24,8 @@
/* WARNING: Make sure to edit the real source file version.h.in! */
+#include <polyp/cdecl.h>
+
/** \file
* Define header version */
Modified: trunk/src/polypcore/authkey-prop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/authkey-prop.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/authkey-prop.c (original)
+++ trunk/src/polypcore/authkey-prop.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/authkey-prop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/authkey-prop.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/authkey-prop.h (original)
+++ trunk/src/polypcore/authkey-prop.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/authkey.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/authkey.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/authkey.c (original)
+++ trunk/src/polypcore/authkey.c Fri Feb 17 13:10:58 2006
@@ -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) {
Modified: trunk/src/polypcore/autoload.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/autoload.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/autoload.c (original)
+++ trunk/src/polypcore/autoload.c Fri Feb 17 13:10:58 2006
@@ -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);
Modified: trunk/src/polypcore/autoload.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/autoload.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/autoload.h (original)
+++ trunk/src/polypcore/autoload.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/cli-command.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli-command.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/cli-command.c (original)
+++ trunk/src/polypcore/cli-command.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/cli-command.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli-command.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/cli-command.h (original)
+++ trunk/src/polypcore/cli-command.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/cli-text.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli-text.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/cli-text.c (original)
+++ trunk/src/polypcore/cli-text.c Fri Feb 17 13:10:58 2006
@@ -26,19 +26,20 @@
#include <assert.h>
#include <string.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"
-#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>
char *pa_module_list_to_string(pa_core *c) {
pa_strbuf *s;
Modified: trunk/src/polypcore/cli-text.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli-text.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/cli-text.h (original)
+++ trunk/src/polypcore/cli-text.h Fri Feb 17 13:10:58 2006
@@ -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. */
Modified: trunk/src/polypcore/cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/cli.c (original)
+++ trunk/src/polypcore/cli.c Fri Feb 17 13:10:58 2006
@@ -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 ">>> "
Modified: trunk/src/polypcore/cli.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/cli.h (original)
+++ trunk/src/polypcore/cli.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/client.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/client.c (original)
+++ trunk/src/polypcore/client.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/client.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/client.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/client.h (original)
+++ trunk/src/polypcore/client.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/conf-parser.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/conf-parser.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/conf-parser.c (original)
+++ trunk/src/polypcore/conf-parser.c Fri Feb 17 13:10:58 2006
@@ -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"
Modified: trunk/src/polypcore/core-scache.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-scache.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/core-scache.c (original)
+++ trunk/src/polypcore/core-scache.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/core-scache.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-scache.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/core-scache.h (original)
+++ trunk/src/polypcore/core-scache.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/core-subscribe.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-subscribe.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/core-subscribe.c (original)
+++ trunk/src/polypcore/core-subscribe.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/core-subscribe.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-subscribe.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/core-subscribe.h (original)
+++ trunk/src/polypcore/core-subscribe.h Fri Feb 17 13:10:58 2006
@@ -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);
Modified: trunk/src/polypcore/core.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/core.c (original)
+++ trunk/src/polypcore/core.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/core.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/core.h (original)
+++ trunk/src/polypcore/core.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/dynarray.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/dynarray.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/dynarray.c (original)
+++ trunk/src/polypcore/dynarray.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/hashmap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/hashmap.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/hashmap.c (original)
+++ trunk/src/polypcore/hashmap.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/idxset.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/idxset.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/idxset.c (original)
+++ trunk/src/polypcore/idxset.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/iochannel.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/iochannel.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/iochannel.c (original)
+++ trunk/src/polypcore/iochannel.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/ioline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/ioline.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/ioline.c (original)
+++ trunk/src/polypcore/ioline.c Fri Feb 17 13:10:58 2006
@@ -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)
Modified: trunk/src/polypcore/ioline.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/ioline.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/ioline.h (original)
+++ trunk/src/polypcore/ioline.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/log.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/log.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/log.c (original)
+++ trunk/src/polypcore/log.c Fri Feb 17 13:10:58 2006
@@ -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"
Modified: trunk/src/polypcore/log.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/log.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/log.h (original)
+++ trunk/src/polypcore/log.h Fri Feb 17 13:10:58 2006
@@ -23,7 +23,7 @@
***/
#include <stdarg.h>
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
/* A simple logging subsystem */
Modified: trunk/src/polypcore/mcalign.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/mcalign.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/mcalign.c (original)
+++ trunk/src/polypcore/mcalign.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/mcalign.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/mcalign.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/mcalign.h (original)
+++ trunk/src/polypcore/mcalign.h Fri Feb 17 13:10:58 2006
@@ -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. */
Modified: trunk/src/polypcore/memblock.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/memblock.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/memblock.c (original)
+++ trunk/src/polypcore/memblock.c Fri Feb 17 13:10:58 2006
@@ -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);
Modified: trunk/src/polypcore/memblockq.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/memblockq.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/memblockq.c (original)
+++ trunk/src/polypcore/memblockq.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/memblockq.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/memblockq.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/memblockq.h (original)
+++ trunk/src/polypcore/memblockq.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/memchunk.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/memchunk.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/memchunk.c (original)
+++ trunk/src/polypcore/memchunk.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/memchunk.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/memchunk.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/memchunk.h (original)
+++ trunk/src/polypcore/memchunk.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/modargs.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/modargs.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/modargs.c (original)
+++ trunk/src/polypcore/modargs.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/modargs.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/modargs.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/modargs.h (original)
+++ trunk/src/polypcore/modargs.h Fri Feb 17 13:10:58 2006
@@ -24,7 +24,7 @@
#include <inttypes.h>
#include <polyp/sample.h>
-#include "core.h"
+#include <polypcore/core.h>
typedef struct pa_modargs pa_modargs;
Modified: trunk/src/polypcore/modinfo.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/modinfo.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/modinfo.c (original)
+++ trunk/src/polypcore/modinfo.c Fri Feb 17 13:10:58 2006
@@ -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"
Modified: trunk/src/polypcore/module.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/module.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/module.c (original)
+++ trunk/src/polypcore/module.c Fri Feb 17 13:10:58 2006
@@ -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"
Modified: trunk/src/polypcore/module.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/module.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/module.h (original)
+++ trunk/src/polypcore/module.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/namereg.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/namereg.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/namereg.c (original)
+++ trunk/src/polypcore/namereg.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/namereg.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/namereg.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/namereg.h (original)
+++ trunk/src/polypcore/namereg.h Fri Feb 17 13:10:58 2006
@@ -22,7 +22,7 @@
USA.
***/
-#include "core.h"
+#include <polypcore/core.h>
typedef enum pa_namereg_type {
PA_NAMEREG_SINK,
Modified: trunk/src/polypcore/packet.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/packet.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/packet.c (original)
+++ trunk/src/polypcore/packet.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/parseaddr.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/parseaddr.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/parseaddr.c (original)
+++ trunk/src/polypcore/parseaddr.c Fri Feb 17 13:10:58 2006
@@ -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:
Modified: trunk/src/polypcore/pdispatch.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pdispatch.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/pdispatch.c (original)
+++ trunk/src/polypcore/pdispatch.c Fri Feb 17 13:10:58 2006
@@ -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 */
Modified: trunk/src/polypcore/pdispatch.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pdispatch.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/pdispatch.h (original)
+++ trunk/src/polypcore/pdispatch.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/pid.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pid.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/pid.c (original)
+++ trunk/src/polypcore/pid.c Fri Feb 17 13:10:58 2006
@@ -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 */
Modified: trunk/src/polypcore/play-memchunk.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/play-memchunk.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/play-memchunk.c (original)
+++ trunk/src/polypcore/play-memchunk.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/play-memchunk.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/play-memchunk.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/play-memchunk.h (original)
+++ trunk/src/polypcore/play-memchunk.h Fri Feb 17 13:10:58 2006
@@ -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,
Modified: trunk/src/polypcore/poll.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/poll.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/poll.c (original)
+++ trunk/src/polypcore/poll.c Fri Feb 17 13:10:58 2006
@@ -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) {
Modified: trunk/src/polypcore/props.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/props.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/props.c (original)
+++ trunk/src/polypcore/props.c Fri Feb 17 13:10:58 2006
@@ -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 */
Modified: trunk/src/polypcore/props.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/props.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/props.h (original)
+++ trunk/src/polypcore/props.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/protocol-cli.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-cli.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-cli.c (original)
+++ trunk/src/polypcore/protocol-cli.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/protocol-cli.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-cli.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-cli.h (original)
+++ trunk/src/polypcore/protocol-cli.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/protocol-esound.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-esound.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-esound.c (original)
+++ trunk/src/polypcore/protocol-esound.c Fri Feb 17 13:10:58 2006
@@ -30,23 +30,25 @@
#include <stdlib.h>
#include <limits.h>
+#include <polyp/sample.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"
-#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 "endianmacros.h"
/* Don't accept more connection than this */
#define MAX_CONNECTIONS 10
Modified: trunk/src/polypcore/protocol-esound.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-esound.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-esound.h (original)
+++ trunk/src/polypcore/protocol-esound.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/protocol-http.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-http.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-http.c (original)
+++ trunk/src/polypcore/protocol-http.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/protocol-http.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-http.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-http.h (original)
+++ trunk/src/polypcore/protocol-http.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-native.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-native.c (original)
+++ trunk/src/polypcore/protocol-native.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/protocol-native.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-native.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-native.h (original)
+++ trunk/src/polypcore/protocol-native.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/protocol-simple.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-simple.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-simple.c (original)
+++ trunk/src/polypcore/protocol-simple.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/protocol-simple.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-simple.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-simple.h (original)
+++ trunk/src/polypcore/protocol-simple.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/pstream-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pstream-util.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/pstream-util.c (original)
+++ trunk/src/polypcore/pstream-util.c Fri Feb 17 13:10:58 2006
@@ -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) {
Modified: trunk/src/polypcore/pstream-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pstream-util.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/pstream-util.h (original)
+++ trunk/src/polypcore/pstream-util.h Fri Feb 17 13:10:58 2006
@@ -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);
Modified: trunk/src/polypcore/pstream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pstream.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/pstream.c (original)
+++ trunk/src/polypcore/pstream.c Fri Feb 17 13:10:58 2006
@@ -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,
Modified: trunk/src/polypcore/pstream.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/pstream.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/pstream.h (original)
+++ trunk/src/polypcore/pstream.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/queue.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/queue.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/queue.c (original)
+++ trunk/src/polypcore/queue.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/random.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/random.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/random.c (original)
+++ trunk/src/polypcore/random.c Fri Feb 17 13:10:58 2006
@@ -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"
Modified: trunk/src/polypcore/resampler.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/resampler.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/resampler.c (original)
+++ trunk/src/polypcore/resampler.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/resampler.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/resampler.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/resampler.h (original)
+++ trunk/src/polypcore/resampler.h Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/sample-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sample-util.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sample-util.c (original)
+++ trunk/src/polypcore/sample-util.c Fri Feb 17 13:10:58 2006
@@ -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) {
Modified: trunk/src/polypcore/sample-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sample-util.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sample-util.h (original)
+++ trunk/src/polypcore/sample-util.h Fri Feb 17 13:10:58 2006
@@ -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);
Modified: trunk/src/polypcore/sconv-s16le.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sconv-s16le.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sconv-s16le.c (original)
+++ trunk/src/polypcore/sconv-s16le.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/sconv.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sconv.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sconv.c (original)
+++ trunk/src/polypcore/sconv.c Fri Feb 17 13:10:58 2006
@@ -30,12 +30,13 @@
#include <liboil/liboilfuncs.h>
#include <liboil/liboil.h>
+#include <polypcore/g711.h>
+
#include "endianmacros.h"
-#include "sconv.h"
-#include "g711.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;
Modified: trunk/src/polypcore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink-input.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sink-input.c (original)
+++ trunk/src/polypcore/sink-input.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/sink-input.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink-input.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sink-input.h (original)
+++ trunk/src/polypcore/sink-input.h Fri Feb 17 13:10:58 2006
@@ -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,
Modified: trunk/src/polypcore/sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sink.c (original)
+++ trunk/src/polypcore/sink.c Fri Feb 17 13:10:58 2006
@@ -28,15 +28,16 @@
#include <string.h>
#include <stdio.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"
-#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>
#define MAX_MIX_CHANNELS 32
Modified: trunk/src/polypcore/sink.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sink.h (original)
+++ trunk/src/polypcore/sink.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/sioman.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sioman.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sioman.c (original)
+++ trunk/src/polypcore/sioman.c Fri Feb 17 13:10:58 2006
@@ -24,6 +24,7 @@
#endif
#include <assert.h>
+
#include "sioman.h"
static int stdio_inuse = 0;
Modified: trunk/src/polypcore/socket-client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/socket-client.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/socket-client.c (original)
+++ trunk/src/polypcore/socket-client.c Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/socket-client.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/socket-client.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/socket-client.h (original)
+++ trunk/src/polypcore/socket-client.h Fri Feb 17 13:10:58 2006
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include <polyp/mainloop-api.h>
-#include "iochannel.h"
+#include <polypcore/iochannel.h>
struct sockaddr;
Modified: trunk/src/polypcore/socket-server.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/socket-server.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/socket-server.c (original)
+++ trunk/src/polypcore/socket-server.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/socket-server.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/socket-server.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/socket-server.h (original)
+++ trunk/src/polypcore/socket-server.h Fri Feb 17 13:10:58 2006
@@ -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 */
Modified: trunk/src/polypcore/socket-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/socket-util.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/socket-util.c (original)
+++ trunk/src/polypcore/socket-util.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/sound-file-stream.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sound-file-stream.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sound-file-stream.c (original)
+++ trunk/src/polypcore/sound-file-stream.c Fri Feb 17 13:10:58 2006
@@ -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)
Modified: trunk/src/polypcore/sound-file-stream.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sound-file-stream.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sound-file-stream.h (original)
+++ trunk/src/polypcore/sound-file-stream.h Fri Feb 17 13:10:58 2006
@@ -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);
Modified: trunk/src/polypcore/sound-file.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sound-file.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sound-file.c (original)
+++ trunk/src/polypcore/sound-file.c Fri Feb 17 13:10:58 2006
@@ -28,9 +28,10 @@
#include <sndfile.h>
+#include <polyp/sample.h>
+#include <polypcore/log.h>
+
#include "sound-file.h"
-#include <polyp/sample.h>
-#include "log.h"
#define MAX_FILE_SIZE (1024*1024)
Modified: trunk/src/polypcore/sound-file.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sound-file.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/sound-file.h (original)
+++ trunk/src/polypcore/sound-file.h Fri Feb 17 13:10:58 2006
@@ -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);
Modified: trunk/src/polypcore/source-output.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/source-output.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/source-output.c (original)
+++ trunk/src/polypcore/source-output.c Fri Feb 17 13:10:58 2006
@@ -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,
Modified: trunk/src/polypcore/source-output.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/source-output.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/source-output.h (original)
+++ trunk/src/polypcore/source-output.h Fri Feb 17 13:10:58 2006
@@ -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,
Modified: trunk/src/polypcore/source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/source.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/source.c (original)
+++ trunk/src/polypcore/source.c Fri Feb 17 13:10:58 2006
@@ -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,
Modified: trunk/src/polypcore/source.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/source.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/source.h (original)
+++ trunk/src/polypcore/source.h Fri Feb 17 13:10:58 2006
@@ -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
Modified: trunk/src/polypcore/strbuf.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/strbuf.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/strbuf.h (original)
+++ trunk/src/polypcore/strbuf.h Fri Feb 17 13:10:58 2006
@@ -22,7 +22,7 @@
USA.
***/
-#include "gccmacro.h"
+#include <polypcore/gccmacro.h>
typedef struct pa_strbuf pa_strbuf;
Modified: trunk/src/polypcore/strlist.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/strlist.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/strlist.c (original)
+++ trunk/src/polypcore/strlist.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/tagstruct.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/tagstruct.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/tagstruct.c (original)
+++ trunk/src/polypcore/tagstruct.c Fri Feb 17 13:10:58 2006
@@ -36,8 +36,9 @@
#include "winsock.h"
+#include <polypcore/xmalloc.h>
+
#include "tagstruct.h"
-#include "xmalloc.h"
struct pa_tagstruct {
Modified: trunk/src/polypcore/tokenizer.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/tokenizer.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/tokenizer.c (original)
+++ trunk/src/polypcore/tokenizer.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/util.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/util.c (original)
+++ trunk/src/polypcore/util.c Fri Feb 17 13:10:58 2006
@@ -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-"
Modified: trunk/src/polypcore/util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/util.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/util.h (original)
+++ trunk/src/polypcore/util.h Fri Feb 17 13:10:58 2006
@@ -27,8 +27,8 @@
#include <stdarg.h>
#include <stdio.h>
-#include "gccmacro.h"
#include <polyp/sample.h>
+#include <polypcore/gccmacro.h>
struct timeval;
Modified: trunk/src/polypcore/x11wrap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/x11wrap.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/x11wrap.c (original)
+++ trunk/src/polypcore/x11wrap.c Fri Feb 17 13:10:58 2006
@@ -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;
Modified: trunk/src/polypcore/x11wrap.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/x11wrap.h?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/x11wrap.h (original)
+++ trunk/src/polypcore/x11wrap.h Fri Feb 17 13:10:58 2006
@@ -24,7 +24,7 @@
#include <X11/Xlib.h>
-#include "core.h"
+#include <polypcore/core.h>
typedef struct pa_x11_wrapper pa_x11_wrapper;
Modified: trunk/src/polypcore/xmalloc.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/xmalloc.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/polypcore/xmalloc.c (original)
+++ trunk/src/polypcore/xmalloc.c Fri Feb 17 13:10:58 2006
@@ -27,11 +27,12 @@
#include <signal.h>
#include <assert.h>
#include <unistd.h>
+#include <string.h>
-#include "memory.h"
-#include "util.h"
+#include <polypcore/util.h>
+#include <polypcore/gccmacro.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 */
Modified: trunk/src/tests/cpulimit-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/cpulimit-test.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/tests/cpulimit-test.c (original)
+++ trunk/src/tests/cpulimit-test.c Fri Feb 17 13:10:58 2006
@@ -29,13 +29,14 @@
#include <stdio.h>
#include <signal.h>
-#include "../daemon/cpulimit.h"
#include <polyp/mainloop.h>
#include <polypcore/gccmacro.h>
#ifdef TEST2
#include <polyp/mainloop-signal.h>
#endif
+
+#include "../daemon/cpulimit.h"
/* A simple example for testing the cpulimit subsystem */
Modified: trunk/src/utils/pax11publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pax11publish.c?rev=500&root=polypaudio&r1=499&r2=500&view=diff
==============================================================================
--- trunk/src/utils/pax11publish.c (original)
+++ trunk/src/utils/pax11publish.c Fri Feb 17 13:10:58 2006
@@ -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;
More information about the pulseaudio-commits
mailing list