[polypaudio-commits] r496 - in /trunk/src: ./ modules/ polypcore/
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Thu Feb 16 15:13:28 PST 2006
Author: lennart
Date: Fri Feb 17 00:13:27 2006
New Revision: 496
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=496&root=polypaudio&view=rev
Log:
* rename polypcore/subscribe.[ch] to polypcore/core-subscribe.[ch] to avoid confusion with polyp/subscribe.[ch]
* same for scache.[ch]
Added:
trunk/src/polypcore/core-scache.c
- copied, changed from r492, trunk/src/polypcore/scache.c
trunk/src/polypcore/core-scache.h
- copied, changed from r492, trunk/src/polypcore/scache.h
trunk/src/polypcore/core-subscribe.c
- copied, changed from r492, trunk/src/polypcore/subscribe.c
trunk/src/polypcore/core-subscribe.h
- copied, changed from r492, trunk/src/polypcore/subscribe.h
Removed:
trunk/src/polypcore/scache.c
trunk/src/polypcore/scache.h
trunk/src/polypcore/subscribe.c
trunk/src/polypcore/subscribe.h
Modified:
trunk/src/Makefile.am
trunk/src/modules/module-match.c
trunk/src/modules/module-tunnel.c
trunk/src/modules/module-x11-bell.c
trunk/src/modules/module-x11-publish.c
trunk/src/polypcore/autoload.c
trunk/src/polypcore/cli-command.c
trunk/src/polypcore/cli-text.c
trunk/src/polypcore/client.c
trunk/src/polypcore/core.c
trunk/src/polypcore/core.h
trunk/src/polypcore/module.c
trunk/src/polypcore/namereg.c
trunk/src/polypcore/protocol-esound.c
trunk/src/polypcore/protocol-native.c
trunk/src/polypcore/sink-input.c
trunk/src/polypcore/sink.c
trunk/src/polypcore/source-output.c
trunk/src/polypcore/source.c
Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Fri Feb 17 00:13:27 2006
@@ -479,7 +479,7 @@
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 @@
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 \
Modified: trunk/src/modules/module-match.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-match.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/modules/module-match.c (original)
+++ trunk/src/modules/module-match.c Fri Feb 17 00:13:27 2006
@@ -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>
Modified: trunk/src/modules/module-tunnel.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-tunnel.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/modules/module-tunnel.c (original)
+++ trunk/src/modules/module-tunnel.c Fri Feb 17 00:13:27 2006
@@ -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>
Modified: trunk/src/modules/module-x11-bell.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-bell.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/modules/module-x11-bell.c (original)
+++ trunk/src/modules/module-x11-bell.c Fri Feb 17 00:13:27 2006
@@ -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>
Modified: trunk/src/modules/module-x11-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-publish.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/modules/module-x11-publish.c (original)
+++ trunk/src/modules/module-x11-publish.c Fri Feb 17 00:13:27 2006
@@ -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>
Modified: trunk/src/polypcore/autoload.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/autoload.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/autoload.c (original)
+++ trunk/src/polypcore/autoload.c Fri Feb 17 00:13:27 2006
@@ -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);
Modified: trunk/src/polypcore/cli-command.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli-command.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/cli-command.c (original)
+++ trunk/src/polypcore/cli-command.c Fri Feb 17 00:13:27 2006
@@ -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"
Modified: trunk/src/polypcore/cli-text.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/cli-text.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/cli-text.c (original)
+++ trunk/src/polypcore/cli-text.c Fri Feb 17 00:13:27 2006
@@ -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>
Modified: trunk/src/polypcore/client.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/client.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/client.c (original)
+++ trunk/src/polypcore/client.c Fri Feb 17 00:13:27 2006
@@ -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) {
Copied: trunk/src/polypcore/core-scache.c (from r492, trunk/src/polypcore/scache.c)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-scache.c?p2=trunk/src/polypcore/core-scache.c&p1=trunk/src/polypcore/scache.c&r1=492&r2=496&rev=496&root=polypaudio&view=diff
==============================================================================
--- trunk/src/polypcore/scache.c (original)
+++ trunk/src/polypcore/core-scache.c Fri Feb 17 00:13:27 2006
@@ -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"
Copied: trunk/src/polypcore/core-scache.h (from r492, trunk/src/polypcore/scache.h)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-scache.h?p2=trunk/src/polypcore/core-scache.h&p1=trunk/src/polypcore/scache.h&r1=492&r2=496&rev=496&root=polypaudio&view=diff
==============================================================================
--- trunk/src/polypcore/scache.h (original)
+++ trunk/src/polypcore/core-scache.h Fri Feb 17 00:13:27 2006
@@ -1,5 +1,5 @@
-#ifndef fooscachehfoo
-#define fooscachehfoo
+#ifndef foocorescachehfoo
+#define foocorescachehfoo
/* $Id$ */
Copied: trunk/src/polypcore/core-subscribe.c (from r492, trunk/src/polypcore/subscribe.c)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-subscribe.c?p2=trunk/src/polypcore/core-subscribe.c&p1=trunk/src/polypcore/subscribe.c&r1=492&r2=496&rev=496&root=polypaudio&view=diff
==============================================================================
--- trunk/src/polypcore/subscribe.c (original)
+++ trunk/src/polypcore/core-subscribe.c Fri Feb 17 00:13:27 2006
@@ -27,7 +27,7 @@
#include <assert.h>
#include "queue.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "xmalloc.h"
#include "log.h"
Copied: trunk/src/polypcore/core-subscribe.h (from r492, trunk/src/polypcore/subscribe.h)
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core-subscribe.h?p2=trunk/src/polypcore/core-subscribe.h&p1=trunk/src/polypcore/subscribe.h&r1=492&r2=496&rev=496&root=polypaudio&view=diff
==============================================================================
--- trunk/src/polypcore/subscribe.h (original)
+++ trunk/src/polypcore/core-subscribe.h Fri Feb 17 00:13:27 2006
@@ -1,5 +1,5 @@
-#ifndef foosubscribehfoo
-#define foosubscribehfoo
+#ifndef foocoresubscribehfoo
+#define foocoresubscribehfoo
/* $Id$ */
Modified: trunk/src/polypcore/core.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/core.c (original)
+++ trunk/src/polypcore/core.c Fri Feb 17 00:13:27 2006
@@ -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"
Modified: trunk/src/polypcore/core.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/core.h?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/core.h (original)
+++ trunk/src/polypcore/core.h Fri Feb 17 00:13:27 2006
@@ -31,7 +31,7 @@
#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
Modified: trunk/src/polypcore/module.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/module.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/module.c (original)
+++ trunk/src/polypcore/module.c Fri Feb 17 00:13:27 2006
@@ -32,7 +32,7 @@
#include "module.h"
#include "xmalloc.h"
-#include "subscribe.h"
+#include "core-subscribe.h"
#include "log.h"
#include "util.h"
Modified: trunk/src/polypcore/namereg.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/namereg.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/namereg.c (original)
+++ trunk/src/polypcore/namereg.c Fri Feb 17 00:13:27 2006
@@ -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 {
Modified: trunk/src/polypcore/protocol-esound.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-esound.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-esound.c (original)
+++ trunk/src/polypcore/protocol-esound.c Fri Feb 17 00:13:27 2006
@@ -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"
Modified: trunk/src/polypcore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/protocol-native.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/protocol-native.c (original)
+++ trunk/src/polypcore/protocol-native.c Fri Feb 17 00:13:27 2006
@@ -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"
Modified: trunk/src/polypcore/sink-input.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink-input.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/sink-input.c (original)
+++ trunk/src/polypcore/sink-input.c Fri Feb 17 00:13:27 2006
@@ -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
Modified: trunk/src/polypcore/sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/sink.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/sink.c (original)
+++ trunk/src/polypcore/sink.c Fri Feb 17 00:13:27 2006
@@ -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>
Modified: trunk/src/polypcore/source-output.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/source-output.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/source-output.c (original)
+++ trunk/src/polypcore/source-output.c Fri Feb 17 00:13:27 2006
@@ -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(
Modified: trunk/src/polypcore/source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polypcore/source.c?rev=496&root=polypaudio&r1=495&r2=496&view=diff
==============================================================================
--- trunk/src/polypcore/source.c (original)
+++ trunk/src/polypcore/source.c Fri Feb 17 00:13:27 2006
@@ -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(
More information about the pulseaudio-commits
mailing list