* 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 cfd4b75105faadec8385b6d2a1b2dd91af366f28..7d87a1199cc51d7f57f8476f3c3e7070b51508ff 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 10ceb75edc6d534c614ac0be53aa6ac4fd81db77..1fb7233cc074bd1f255a53407ccb62ef9cb83e8c 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 5ee10fda9379fa048a059276e348852fd97e6952..61b9bb3b37bb12bcf8eac3e602faa2d41e5f56f7 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 d722b732fd32f365f81ea54eb5e0c54639e76980..d59f3f5929bfe334794a49eb1febe9b357de5bbd 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 dca5d049e03670f0d55bfdb22ac31aaa3fe6d060..6d9036f5a4169ddf19875f309747e06b5fcc451f 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 ff2916cbfe12fed4220783f0915dd9368e3f0f84..83df8ef7f40e49629d20d31687597312758adcf7 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 f6192bf87d70408b0841cfa6329bbcd3a9c78e38..dd4cbe463a04a5095783321c3ee62cc50c3557a1 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 58248d8ecf4c44dc8d1d3cc7cf5f8606bbd1f685..d8446b0674a7b301f07205e7f573808958f42fee 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 3c2084bfb9c764ef7a291b99891139c20c56060f..9b256794211113c51bc1290bafeae3d1238ce32c 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 02c7d34fa30e6c0a84d65403dd12a7eae052268f..0d926abafa8c00b78d8c9d9257e0bcebfbc9c5d0 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 d667ae60c32f5cbb80bbe964d9f961d97fa45ab0..0918ebe47e118279f786da6f9220de0341740aeb 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 e8b3c8418ee5f0d87061ee25ea92a6089f0ee40e..2a258604d71ed402fcc85ea396ed416c3a399e00 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 625159e37b8c21f2c71a747cd539eaa06ff564b5..bc9dcba3d0bd528bad476ce86b08073752e75358 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 678e8212c2541398ba925e54a244de9223104bb7..9d040e687dfdf28d3540a0a754f803ed895774ad 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 f7a90169a6cd2057af2a79baada31f9efd274919..29329025456e70a85de927483d79c32fad54f74c 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 499ea2990a78d0a3f3dce680d2245b02a5011c98..73ec5bd401b35f270230a49e34239fe7734f53f3 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 07fb485c890475d0ccd7539ab7d018687772dd32..ca03c455dca8a86c1ae36036389eae232f5bb232 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 14f237c7509751ae28a6a8b0c04a29f94293252a..d2c0f3546038e2ef019f18fb46be1c42151c4b55 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 b94903d9c7b7069e01b6d13da7dcb8ce3849c178..31983bc260912cc7c9207759fbb0b2845c00ef97 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 f447b8cf801341b80ed3fded5feb6a43ffd1fd97..696c47a4d5c9725840faf14db67323e8724edcf3 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 f29afba73fbfa11a6e24dcb4bdd4b971cc47de51..6c143463b355ebdfb048f5abec43a0a4c86c3971 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 e1d8ccf72ebc51eeabaf54659052156d0fa291bf..9b75a8b0d1c45cdda04db5e2a3b5c88e8f20b14f 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 6e377b20e8c72752bc5e35e106908d50ed7a1191..c64f7b990f71ad67ad7597f0c57def6c7e6963a4 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(