* rename polypcore/subscribe.[ch] to polypcore/core-subscribe.[ch] to avoid confusion...

* same for scache.[ch]

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

diff --git a/src/Makefile.am b/src/Makefile.am
index cfd4b75..7d87a11 100644 (file)
--- 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 10ceb75..1fb7233 100644 (file)
--- 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 5ee10fd..61b9bb3 100644 (file)
--- 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 d722b73..d59f3f5 100644 (file)
--- 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 dca5d04..6d9036f 100644 (file)
--- 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 ff2916c..83df8ef 100644 (file)
--- 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 f6192bf..dd4cbe4 100644 (file)
--- 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 58248d8..d8446b0 100644 (file)
--- 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 3c2084b..9b25679 100644 (file)
--- 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
similarity index 99%
rename from src/polypcore/scache.c
rename to src/polypcore/core-scache.c
index 02c7d34..0d926ab 100644 (file)
--- 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
similarity index 97%
rename from src/polypcore/scache.h
rename to src/polypcore/core-scache.h
index d667ae6..0918ebe 100644 (file)
--- 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
similarity index 99%
rename from src/polypcore/subscribe.c
rename to src/polypcore/core-subscribe.c
index e8b3c84..2a25860 100644 (file)
--- 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
similarity index 95%
rename from src/polypcore/subscribe.h
rename to src/polypcore/core-subscribe.h
index 625159e..bc9dcba 100644 (file)
--- 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 678e821..9d040e6 100644 (file)
--- 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 f7a9016..2932902 100644 (file)
--- 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 499ea29..73ec5bd 100644 (file)
--- 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 07fb485..ca03c45 100644 (file)
--- 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 14f237c..d2c0f35 100644 (file)
--- 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 b94903d..31983bc 100644 (file)
--- 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 f447b8c..696c47a 100644 (file)
--- 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 f29afba..6c14346 100644 (file)
--- 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 e1d8ccf..9b75a8b 100644 (file)
--- 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 6e377b2..c64f7b9 100644 (file)
--- 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(