summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/modules/module-match.c2
-rw-r--r--src/modules/module-tunnel.c2
-rw-r--r--src/modules/module-x11-bell.c2
-rw-r--r--src/modules/module-x11-publish.c2
-rw-r--r--src/polypcore/autoload.c4
-rw-r--r--src/polypcore/cli-command.c2
-rw-r--r--src/polypcore/cli-text.c2
-rw-r--r--src/polypcore/client.c2
-rw-r--r--src/polypcore/core-scache.c (renamed from src/polypcore/scache.c)4
-rw-r--r--src/polypcore/core-scache.h (renamed from src/polypcore/scache.h)4
-rw-r--r--src/polypcore/core-subscribe.c (renamed from src/polypcore/subscribe.c)2
-rw-r--r--src/polypcore/core-subscribe.h (renamed from src/polypcore/subscribe.h)4
-rw-r--r--src/polypcore/core.c4
-rw-r--r--src/polypcore/core.h2
-rw-r--r--src/polypcore/module.c2
-rw-r--r--src/polypcore/namereg.c2
-rw-r--r--src/polypcore/protocol-esound.c2
-rw-r--r--src/polypcore/protocol-native.c4
-rw-r--r--src/polypcore/sink-input.c2
-rw-r--r--src/polypcore/sink.c2
-rw-r--r--src/polypcore/source-output.c2
-rw-r--r--src/polypcore/source.c2
23 files changed, 30 insertions, 30 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index cfd4b751..7d87a119 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -479,7 +479,7 @@ libpolypcore_la_SOURCES += \
polypcore/random.c polypcore/random.h \
polypcore/resampler.c polypcore/resampler.h \
polypcore/sample-util.c polypcore/sample-util.h \
- polypcore/scache.c polypcore/scache.h \
+ polypcore/core-scache.c polypcore/core-scache.h \
polypcore/sconv.c polypcore/sconv.h \
polypcore/sconv-s16be.c polypcore/sconv-s16be.h \
polypcore/sconv-s16le.c polypcore/sconv-s16le.h \
@@ -491,7 +491,7 @@ libpolypcore_la_SOURCES += \
polypcore/source.c polypcore/source.h \
polypcore/source-output.c polypcore/source-output.h \
polypcore/strbuf.c polypcore/strbuf.h \
- polypcore/subscribe.c polypcore/subscribe.h \
+ polypcore/core-subscribe.c polypcore/core-subscribe.h \
polypcore/tokenizer.c polypcore/tokenizer.h \
polypcore/util.c polypcore/util.h \
polypcore/winsock.h \
diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 10ceb75e..1fb7233c 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -36,7 +36,7 @@
#include <polypcore/util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
-#include <polypcore/subscribe.h>
+#include <polypcore/core-subscribe.h>
#include <polypcore/xmalloc.h>
#include <polypcore/sink-input.h>
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 5ee10fda..61b9bb3b 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -35,7 +35,7 @@
#include <polypcore/util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
-#include <polypcore/subscribe.h>
+#include <polypcore/core-subscribe.h>
#include <polypcore/xmalloc.h>
#include <polypcore/sink-input.h>
#include <polypcore/pdispatch.h>
diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index d722b732..d59f3f59 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -33,7 +33,7 @@
#include <polypcore/iochannel.h>
#include <polypcore/sink.h>
-#include <polypcore/scache.h>
+#include <polypcore/core-scache.h>
#include <polypcore/modargs.h>
#include <polypcore/xmalloc.h>
#include <polypcore/namereg.h>
diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c
index dca5d049..6d9036f5 100644
--- a/src/modules/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -34,7 +34,7 @@
#include <polypcore/module.h>
#include <polypcore/sink.h>
-#include <polypcore/scache.h>
+#include <polypcore/core-scache.h>
#include <polypcore/modargs.h>
#include <polypcore/xmalloc.h>
#include <polypcore/namereg.h>
diff --git a/src/polypcore/autoload.c b/src/polypcore/autoload.c
index ff2916cb..83df8ef7 100644
--- a/src/polypcore/autoload.c
+++ b/src/polypcore/autoload.c
@@ -33,8 +33,8 @@
#include "memchunk.h"
#include "sound-file.h"
#include "log.h"
-#include "scache.h"
-#include "subscribe.h"
+#include "core-scache.h"
+#include "core-subscribe.h"
static void entry_free(pa_autoload_entry *e) {
assert(e);
diff --git a/src/polypcore/cli-command.c b/src/polypcore/cli-command.c
index f6192bf8..dd4cbe46 100644
--- a/src/polypcore/cli-command.c
+++ b/src/polypcore/cli-command.c
@@ -40,7 +40,7 @@
#include "strbuf.h"
#include "namereg.h"
#include "cli-text.h"
-#include "scache.h"
+#include "core-scache.h"
#include "sample-util.h"
#include "sound-file.h"
#include "play-memchunk.h"
diff --git a/src/polypcore/cli-text.c b/src/polypcore/cli-text.c
index 58248d8e..d8446b06 100644
--- a/src/polypcore/cli-text.c
+++ b/src/polypcore/cli-text.c
@@ -35,7 +35,7 @@
#include "source-output.h"
#include "strbuf.h"
#include "sample-util.h"
-#include "scache.h"
+#include "core-scache.h"
#include "autoload.h"
#include "xmalloc.h"
#include <polyp/volume.h>
diff --git a/src/polypcore/client.c b/src/polypcore/client.c
index 3c2084bf..9b256794 100644
--- a/src/polypcore/client.c
+++ b/src/polypcore/client.c
@@ -30,7 +30,7 @@
#include "client.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "log.h"
pa_client *pa_client_new(pa_core *core, const char *name, const char *driver) {
diff --git a/src/polypcore/scache.c b/src/polypcore/core-scache.c
index 02c7d34f..0d926aba 100644
--- a/src/polypcore/scache.c
+++ b/src/polypcore/core-scache.c
@@ -41,13 +41,13 @@
#include <windows.h>
#endif
-#include "scache.h"
+#include "core-scache.h"
#include "sink-input.h"
#include <polyp/mainloop.h>
#include "sample-util.h"
#include "play-memchunk.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "namereg.h"
#include "sound-file.h"
#include "util.h"
diff --git a/src/polypcore/scache.h b/src/polypcore/core-scache.h
index d667ae60..0918ebe4 100644
--- a/src/polypcore/scache.h
+++ b/src/polypcore/core-scache.h
@@ -1,5 +1,5 @@
-#ifndef fooscachehfoo
-#define fooscachehfoo
+#ifndef foocorescachehfoo
+#define foocorescachehfoo
/* $Id$ */
diff --git a/src/polypcore/subscribe.c b/src/polypcore/core-subscribe.c
index e8b3c841..2a258604 100644
--- a/src/polypcore/subscribe.c
+++ b/src/polypcore/core-subscribe.c
@@ -27,7 +27,7 @@
#include <assert.h>
#include "queue.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "xmalloc.h"
#include "log.h"
diff --git a/src/polypcore/subscribe.h b/src/polypcore/core-subscribe.h
index 625159e3..bc9dcba3 100644
--- a/src/polypcore/subscribe.h
+++ b/src/polypcore/core-subscribe.h
@@ -1,5 +1,5 @@
-#ifndef foosubscribehfoo
-#define foosubscribehfoo
+#ifndef foocoresubscribehfoo
+#define foocoresubscribehfoo
/* $Id$ */
diff --git a/src/polypcore/core.c b/src/polypcore/core.c
index 678e8212..9d040e68 100644
--- a/src/polypcore/core.c
+++ b/src/polypcore/core.c
@@ -34,10 +34,10 @@
#include "source.h"
#include "namereg.h"
#include "util.h"
-#include "scache.h"
+#include "core-scache.h"
#include "autoload.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "props.h"
#include "random.h"
diff --git a/src/polypcore/core.h b/src/polypcore/core.h
index f7a90169..29329025 100644
--- a/src/polypcore/core.h
+++ b/src/polypcore/core.h
@@ -31,7 +31,7 @@ typedef struct pa_core pa_core;
#include "memblock.h"
#include "resampler.h"
#include "queue.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
/* The core structure of polypaudio. Every polypaudio daemon contains
* exactly one of these. It is used for storing kind of global
diff --git a/src/polypcore/module.c b/src/polypcore/module.c
index 499ea299..73ec5bd4 100644
--- a/src/polypcore/module.c
+++ b/src/polypcore/module.c
@@ -32,7 +32,7 @@
#include "module.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "log.h"
#include "util.h"
diff --git a/src/polypcore/namereg.c b/src/polypcore/namereg.c
index 07fb485c..ca03c455 100644
--- a/src/polypcore/namereg.c
+++ b/src/polypcore/namereg.c
@@ -34,7 +34,7 @@
#include "source.h"
#include "sink.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "util.h"
struct namereg_entry {
diff --git a/src/polypcore/protocol-esound.c b/src/polypcore/protocol-esound.c
index 14f237c7..d2c0f354 100644
--- a/src/polypcore/protocol-esound.c
+++ b/src/polypcore/protocol-esound.c
@@ -39,7 +39,7 @@
#include "source-output.h"
#include "source.h"
#include <polyp/sample.h>
-#include "scache.h"
+#include "core-scache.h"
#include "sample-util.h"
#include "authkey.h"
#include "namereg.h"
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index b94903d9..31983bc2 100644
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -40,10 +40,10 @@
#include "pstream-util.h"
#include "authkey.h"
#include "namereg.h"
-#include "scache.h"
+#include "core-scache.h"
#include "xmalloc.h"
#include "util.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "log.h"
#include "autoload.h"
#include "authkey-prop.h"
diff --git a/src/polypcore/sink-input.c b/src/polypcore/sink-input.c
index f447b8cf..696c47a4 100644
--- a/src/polypcore/sink-input.c
+++ b/src/polypcore/sink-input.c
@@ -31,7 +31,7 @@
#include "sink-input.h"
#include "sample-util.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "log.h"
#define CONVERT_BUFFER_LENGTH 4096
diff --git a/src/polypcore/sink.c b/src/polypcore/sink.c
index f29afba7..6c143463 100644
--- a/src/polypcore/sink.c
+++ b/src/polypcore/sink.c
@@ -34,7 +34,7 @@
#include "util.h"
#include "sample-util.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "log.h"
#include <polyp/introspect.h>
diff --git a/src/polypcore/source-output.c b/src/polypcore/source-output.c
index e1d8ccf7..9b75a8b0 100644
--- a/src/polypcore/source-output.c
+++ b/src/polypcore/source-output.c
@@ -30,7 +30,7 @@
#include "source-output.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "log.h"
pa_source_output* pa_source_output_new(
diff --git a/src/polypcore/source.c b/src/polypcore/source.c
index 6e377b20..c64f7b99 100644
--- a/src/polypcore/source.c
+++ b/src/polypcore/source.c
@@ -32,7 +32,7 @@
#include "source-output.h"
#include "namereg.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "log.h"
pa_source* pa_source_new(