From 22c8cebb858012e4e9c551bb54456237e7597697 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 16 Feb 2006 22:43:59 +0000 Subject: [PATCH] drop polyplib- prefix from client library files git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@492 fefdeb5f-60dc-0310-8127-8f9354f1896f --- configure.ac | 2 +- src/Makefile.am | 50 +++++++++---------- src/polyp/{polyplib-browser.c => browser.c} | 2 +- src/polyp/{polyplib-browser.h => browser.h} | 0 src/polyp/{polyplib-context.c => context.c} | 6 +-- src/polyp/{polyplib-context.h => context.h} | 4 +- src/polyp/{polyplib-def.h => def.h} | 0 src/polyp/{polyplib-error.c => error.c} | 2 +- src/polyp/{polyplib-error.h => error.h} | 0 src/polyp/{polyplib-internal.h => internal.h} | 6 +-- .../{polyplib-introspect.c => introspect.c} | 6 +-- .../{polyplib-introspect.h => introspect.h} | 4 +- .../{polyplib-operation.c => operation.c} | 4 +- .../{polyplib-operation.h => operation.h} | 2 +- src/polyp/{polyplib.h => polypaudio.h} | 26 +++++----- src/polyp/{polyplib-scache.c => scache.c} | 4 +- src/polyp/{polyplib-scache.h => scache.h} | 4 +- src/polyp/{polyplib-simple.c => simple.c} | 2 +- src/polyp/{polyplib-simple.h => simple.h} | 2 +- src/polyp/{polyplib-stream.c => stream.c} | 2 +- src/polyp/{polyplib-stream.h => stream.h} | 4 +- .../{polyplib-subscribe.c => subscribe.c} | 4 +- .../{polyplib-subscribe.h => subscribe.h} | 4 +- .../{polyplib-version.h.in => version.h.in} | 2 +- src/polypcore/native-common.h | 2 +- src/polypcore/sink.c | 2 +- src/tests/pacat-simple.c | 4 +- src/tests/parec-simple.c | 4 +- src/utils/pabrowse.c | 2 +- src/utils/pacat.c | 4 +- src/utils/pactl.c | 2 +- src/utils/paplay.c | 4 +- 32 files changed, 83 insertions(+), 83 deletions(-) rename src/polyp/{polyplib-browser.c => browser.c} (99%) rename src/polyp/{polyplib-browser.h => browser.h} (100%) rename src/polyp/{polyplib-context.c => context.c} (99%) rename src/polyp/{polyplib-context.h => context.h} (98%) rename src/polyp/{polyplib-def.h => def.h} (100%) rename src/polyp/{polyplib-error.c => error.c} (98%) rename src/polyp/{polyplib-error.h => error.h} (100%) rename src/polyp/{polyplib-internal.h => internal.h} (98%) rename src/polyp/{polyplib-introspect.c => introspect.c} (99%) rename src/polyp/{polyplib-introspect.h => introspect.h} (99%) rename src/polyp/{polyplib-operation.c => operation.c} (97%) rename src/polyp/{polyplib-operation.h => operation.h} (97%) rename src/polyp/{polyplib.h => polypaudio.h} (79%) rename src/polyp/{polyplib-scache.c => scache.c} (98%) rename src/polyp/{polyplib-scache.h => scache.h} (96%) rename src/polyp/{polyplib-simple.c => simple.c} (99%) rename src/polyp/{polyplib-simple.h => simple.h} (99%) rename src/polyp/{polyplib-stream.c => stream.c} (99%) rename src/polyp/{polyplib-stream.h => stream.h} (99%) rename src/polyp/{polyplib-subscribe.c => subscribe.c} (97%) rename src/polyp/{polyplib-subscribe.h => subscribe.h} (95%) rename src/polyp/{polyplib-version.h.in => version.h.in} (94%) diff --git a/configure.ac b/configure.ac index 182a2455c..4261903f1 100644 --- a/configure.ac +++ b/configure.ac @@ -407,7 +407,7 @@ doc/daemon.html doc/modules.html doxygen/Makefile doxygen/doxygen.conf -src/polyp/polyplib-version.h +src/polyp/version.h doc/FAQ.html ]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 7e8e73b61..cfd4b7510 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,7 +88,7 @@ polypconf_DATA = \ client.conf BUILT_SOURCES = \ - polyp/polyplib-version.h + polyp/version.h ################################### # Main daemon # @@ -259,23 +259,23 @@ polypinclude_HEADERS = \ polyp/mainloop.h \ polyp/mainloop-api.h \ polyp/mainloop-signal.h \ - polyp/polyplib.h \ - polyp/polyplib-context.h \ - polyp/polyplib-def.h \ - polyp/polyplib-error.h \ - polyp/polyplib-introspect.h \ - polyp/polyplib-operation.h \ - polyp/polyplib-scache.h \ - polyp/polyplib-simple.h \ - polyp/polyplib-stream.h \ - polyp/polyplib-subscribe.h \ - polyp/polyplib-version.h \ + polyp/polypaudio.h \ + polyp/context.h \ + polyp/def.h \ + polyp/error.h \ + polyp/introspect.h \ + polyp/operation.h \ + polyp/scache.h \ + polyp/simple.h \ + polyp/stream.h \ + polyp/subscribe.h \ + polyp/version.h \ polyp/sample.h \ polyp/volume.h if HAVE_HOWL polypinclude_HEADERS += \ - polyp/polyplib-browser.h + polyp/browser.h endif lib_LTLIBRARIES = \ @@ -306,15 +306,15 @@ libpolyp_@PA_MAJORMINOR@_la_SOURCES = \ polyp/client-conf.c polyp/client-conf.h \ polyp/llist.h \ polyp/mainloop-api.c polyp/mainloop-api.h \ - polyp/polyplib.h \ - polyp/polyplib-context.c polyp/polyplib-context.h \ - polyp/polyplib-def.h \ - polyp/polyplib-internal.h \ - polyp/polyplib-introspect.c polyp/polyplib-introspect.h \ - polyp/polyplib-operation.c polyp/polyplib-operation.h \ - polyp/polyplib-scache.c polyp/polyplib-scache.h \ - polyp/polyplib-stream.c polyp/polyplib-stream.h \ - polyp/polyplib-subscribe.c polyp/polyplib-subscribe.h \ + polyp/polypaudio.h \ + polyp/context.c polyp/context.h \ + polyp/def.h \ + polyp/internal.h \ + polyp/introspect.c polyp/introspect.h \ + polyp/operation.c polyp/operation.h \ + polyp/scache.c polyp/scache.h \ + polyp/stream.c polyp/stream.h \ + polyp/subscribe.c polyp/subscribe.h \ polyp/sample.c polyp/sample.h \ polyp/volume.c polyp/volume.h @@ -368,7 +368,7 @@ libpolyp_@PA_MAJORMINOR@_la_CFLAGS += $(LIBASYNCNS_CFLAGS) libpolyp_@PA_MAJORMINOR@_la_LIBADD += $(LIBASYNCNS_LIBS) endif -libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-error.c polyp/polyplib-error.h +libpolyp_error_@PA_MAJORMINOR@_la_SOURCES = polyp/error.c polyp/error.h libpolyp_error_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) libpolyp_error_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la libpolyp_error_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0 @@ -381,12 +381,12 @@ libpolyp_mainloop_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) libpolyp_mainloop_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la $(WINSOCK_LIBS) libpolyp_mainloop_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0 -libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-simple.c polyp/polyplib-simple.h +libpolyp_simple_@PA_MAJORMINOR@_la_SOURCES = polyp/simple.c polyp/simple.h libpolyp_simple_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) libpolyp_simple_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la libpolyp_simple_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0 -libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyp/polyplib-browser.c polyp/polyplib-browser.h +libpolyp_browse_@PA_MAJORMINOR@_la_SOURCES = polyp/browser.c polyp/browser.h libpolyp_browse_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS) libpolyp_browse_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-@PA_MAJORMINOR@.la $(HOWL_LIBS) libpolyp_browse_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0 diff --git a/src/polyp/polyplib-browser.c b/src/polyp/browser.c similarity index 99% rename from src/polyp/polyplib-browser.c rename to src/polyp/browser.c index 9a3894842..80051d545 100644 --- a/src/polyp/polyplib-browser.c +++ b/src/polyp/browser.c @@ -22,7 +22,7 @@ #include #include -#include "polyplib-browser.h" +#include "browser.h" #include #include #include diff --git a/src/polyp/polyplib-browser.h b/src/polyp/browser.h similarity index 100% rename from src/polyp/polyplib-browser.h rename to src/polyp/browser.h diff --git a/src/polyp/polyplib-context.c b/src/polyp/context.c similarity index 99% rename from src/polyp/polyplib-context.c rename to src/polyp/context.c index c392f0fcf..4ac11caa4 100644 --- a/src/polyp/polyplib-context.c +++ b/src/polyp/context.c @@ -47,9 +47,9 @@ #include -#include "polyplib-internal.h" -#include "polyplib-context.h" -#include "polyplib-version.h" +#include "internal.h" +#include "context.h" +#include "version.h" #include #include #include diff --git a/src/polyp/polyplib-context.h b/src/polyp/context.h similarity index 98% rename from src/polyp/polyplib-context.h rename to src/polyp/context.h index febb75f42..6496c7030 100644 --- a/src/polyp/polyplib-context.h +++ b/src/polyp/context.h @@ -23,10 +23,10 @@ ***/ #include -#include +#include #include #include -#include +#include /** \file * Connection contexts for asynchrononous communication with a diff --git a/src/polyp/polyplib-def.h b/src/polyp/def.h similarity index 100% rename from src/polyp/polyplib-def.h rename to src/polyp/def.h diff --git a/src/polyp/polyplib-error.c b/src/polyp/error.c similarity index 98% rename from src/polyp/polyplib-error.c rename to src/polyp/error.c index 188d6a93d..a137ab494 100644 --- a/src/polyp/polyplib-error.c +++ b/src/polyp/error.c @@ -26,7 +26,7 @@ #include #include -#include "polyplib-error.h" +#include "error.h" #include static const char* const errortab[PA_ERROR_MAX] = { diff --git a/src/polyp/polyplib-error.h b/src/polyp/error.h similarity index 100% rename from src/polyp/polyplib-error.h rename to src/polyp/error.h diff --git a/src/polyp/polyplib-internal.h b/src/polyp/internal.h similarity index 98% rename from src/polyp/polyplib-internal.h rename to src/polyp/internal.h index b95a20f3a..feb9f6f41 100644 --- a/src/polyp/polyplib-internal.h +++ b/src/polyp/internal.h @@ -28,9 +28,9 @@ #include #include -#include "polyplib-context.h" -#include "polyplib-stream.h" -#include "polyplib-operation.h" +#include "context.h" +#include "stream.h" +#include "operation.h" #include #include #include diff --git a/src/polyp/polyplib-introspect.c b/src/polyp/introspect.c similarity index 99% rename from src/polyp/polyplib-introspect.c rename to src/polyp/introspect.c index 0bdffa35f..d89eb9ede 100644 --- a/src/polyp/polyplib-introspect.c +++ b/src/polyp/introspect.c @@ -25,9 +25,9 @@ #include -#include "polyplib-introspect.h" -#include "polyplib-context.h" -#include "polyplib-internal.h" +#include "introspect.h" +#include "context.h" +#include "internal.h" #include #include diff --git a/src/polyp/polyplib-introspect.h b/src/polyp/introspect.h similarity index 99% rename from src/polyp/polyplib-introspect.h rename to src/polyp/introspect.h index d34899086..75dc027f6 100644 --- a/src/polyp/polyplib-introspect.h +++ b/src/polyp/introspect.h @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/src/polyp/polyplib-operation.c b/src/polyp/operation.c similarity index 97% rename from src/polyp/polyplib-operation.c rename to src/polyp/operation.c index ea336c173..0baa661b5 100644 --- a/src/polyp/polyplib-operation.c +++ b/src/polyp/operation.c @@ -26,8 +26,8 @@ #include #include -#include "polyplib-internal.h" -#include "polyplib-operation.h" +#include "internal.h" +#include "operation.h" pa_operation *pa_operation_new(pa_context *c, pa_stream *s) { pa_operation *o; diff --git a/src/polyp/polyplib-operation.h b/src/polyp/operation.h similarity index 97% rename from src/polyp/polyplib-operation.h rename to src/polyp/operation.h index cac03e30b..fea82f10e 100644 --- a/src/polyp/polyplib-operation.h +++ b/src/polyp/operation.h @@ -23,7 +23,7 @@ ***/ #include -#include +#include /** \file * Asynchronous operations */ diff --git a/src/polyp/polyplib.h b/src/polyp/polypaudio.h similarity index 79% rename from src/polyp/polyplib.h rename to src/polyp/polypaudio.h index b9b9b447d..232085268 100644 --- a/src/polyp/polyplib.h +++ b/src/polyp/polypaudio.h @@ -25,18 +25,18 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** \file * Include all polyplib header file at once. The following files are included: \ref mainloop-api.h, \ref sample.h, - * \ref polyplib-def.h, \ref polyplib-context.h, \ref polyplib-stream.h, - * \ref polyplib-introspect.h, \ref polyplib-subscribe.h and \ref polyplib-scache.h \ref polyplib-version.h + * \ref def.h, \ref context.h, \ref stream.h, + * \ref introspect.h, \ref subscribe.h and \ref scache.h \ref version.h * at once */ /** \mainpage @@ -57,13 +57,13 @@ * * Use this if you develop your program in synchronous style and just * need a way to play or record data on the sound server. See - * \ref polyplib-simple.h for more details. + * \ref simple.h for more details. * * \section async_api Asynchronous API * * Use this if you develop your programs in asynchronous, main loop * based style or want to use advanced features of the polypaudio - * API. A good starting point is \ref polyplib-context.h + * API. A good starting point is \ref context.h * * The asynchronous API relies on an abstract main loop API that is * described in \ref mainloop-api.h. Two distinct implementations are @@ -79,8 +79,8 @@ * * The polypaudio libraries provide pkg-config snippets for the different modules. To use the * asynchronous API use "polyplib" as pkg-config file. GLIB main loop - * support is available as "polyplib-glib-mainloop". The simple - * synchronous API is available as "polyplib-simple". + * support is available as "glib-mainloop". The simple + * synchronous API is available as "simple". */ #endif diff --git a/src/polyp/polyplib-scache.c b/src/polyp/scache.c similarity index 98% rename from src/polyp/polyplib-scache.c rename to src/polyp/scache.c index 1315af970..c274e3597 100644 --- a/src/polyp/polyplib-scache.c +++ b/src/polyp/scache.c @@ -28,8 +28,8 @@ #include #include -#include "polyplib-scache.h" -#include "polyplib-internal.h" +#include "scache.h" +#include "internal.h" #include void pa_stream_connect_upload(pa_stream *s, size_t length) { diff --git a/src/polyp/polyplib-scache.h b/src/polyp/scache.h similarity index 96% rename from src/polyp/polyplib-scache.h rename to src/polyp/scache.h index 89d27597f..41b956d2e 100644 --- a/src/polyp/polyplib-scache.h +++ b/src/polyp/scache.h @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #include /** \file diff --git a/src/polyp/polyplib-simple.c b/src/polyp/simple.c similarity index 99% rename from src/polyp/polyplib-simple.c rename to src/polyp/simple.c index 7436f0074..6f20da899 100644 --- a/src/polyp/polyplib-simple.c +++ b/src/polyp/simple.c @@ -28,7 +28,7 @@ #include #include -#include "polyplib-simple.h" +#include "simple.h" #include "polyplib.h" #include "mainloop.h" #include diff --git a/src/polyp/polyplib-simple.h b/src/polyp/simple.h similarity index 99% rename from src/polyp/polyplib-simple.h rename to src/polyp/simple.h index b01f30d5d..31dcaef49 100644 --- a/src/polyp/polyplib-simple.h +++ b/src/polyp/simple.h @@ -25,7 +25,7 @@ #include #include "sample.h" -#include "polyplib-def.h" +#include "def.h" #include /** \file diff --git a/src/polyp/polyplib-stream.c b/src/polyp/stream.c similarity index 99% rename from src/polyp/polyplib-stream.c rename to src/polyp/stream.c index 63c9245b0..007d5e24f 100644 --- a/src/polyp/polyplib-stream.c +++ b/src/polyp/stream.c @@ -28,7 +28,7 @@ #include #include -#include "polyplib-internal.h" +#include "internal.h" #include #include #include diff --git a/src/polyp/polyplib-stream.h b/src/polyp/stream.h similarity index 99% rename from src/polyp/polyplib-stream.h rename to src/polyp/stream.h index bc828b71c..d8409b3bf 100644 --- a/src/polyp/polyplib-stream.h +++ b/src/polyp/stream.h @@ -27,9 +27,9 @@ #include #include #include -#include +#include #include -#include +#include /** \file * Audio streams for input, output and sample upload */ diff --git a/src/polyp/polyplib-subscribe.c b/src/polyp/subscribe.c similarity index 97% rename from src/polyp/polyplib-subscribe.c rename to src/polyp/subscribe.c index 13fcfb420..c481f5255 100644 --- a/src/polyp/polyplib-subscribe.c +++ b/src/polyp/subscribe.c @@ -26,8 +26,8 @@ #include #include -#include "polyplib-subscribe.h" -#include "polyplib-internal.h" +#include "subscribe.h" +#include "internal.h" #include #include diff --git a/src/polyp/polyplib-subscribe.h b/src/polyp/subscribe.h similarity index 95% rename from src/polyp/polyplib-subscribe.h rename to src/polyp/subscribe.h index 920c98533..4986272d0 100644 --- a/src/polyp/polyplib-subscribe.h +++ b/src/polyp/subscribe.h @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #include /** \file diff --git a/src/polyp/polyplib-version.h.in b/src/polyp/version.h.in similarity index 94% rename from src/polyp/polyplib-version.h.in rename to src/polyp/version.h.in index 89e0a0e50..36cafb70f 100644 --- a/src/polyp/polyplib-version.h.in +++ b/src/polyp/version.h.in @@ -22,7 +22,7 @@ USA. ***/ -/* WARNING: Make sure to edit the real source file polyplib-version.h.in! */ +/* WARNING: Make sure to edit the real source file version.h.in! */ /** \file * Define header version */ diff --git a/src/polypcore/native-common.h b/src/polypcore/native-common.h index 78ae721ef..ac3ea8231 100644 --- a/src/polypcore/native-common.h +++ b/src/polypcore/native-common.h @@ -23,7 +23,7 @@ ***/ #include -#include +#include PA_C_DECL_BEGIN diff --git a/src/polypcore/sink.c b/src/polypcore/sink.c index 411befe7f..f29afba73 100644 --- a/src/polypcore/sink.c +++ b/src/polypcore/sink.c @@ -36,7 +36,7 @@ #include "xmalloc.h" #include "subscribe.h" #include "log.h" -#include +#include #define MAX_MIX_CHANNELS 32 diff --git a/src/tests/pacat-simple.c b/src/tests/pacat-simple.c index 8b3a7b227..0382ec060 100644 --- a/src/tests/pacat-simple.c +++ b/src/tests/pacat-simple.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #define BUFSIZE 1024 diff --git a/src/tests/parec-simple.c b/src/tests/parec-simple.c index 10eaea8de..fc2314acc 100644 --- a/src/tests/parec-simple.c +++ b/src/tests/parec-simple.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #define BUFSIZE 1024 diff --git a/src/utils/pabrowse.c b/src/utils/pabrowse.c index 634c308a2..290531e63 100644 --- a/src/utils/pabrowse.c +++ b/src/utils/pabrowse.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) { diff --git a/src/utils/pacat.c b/src/utils/pacat.c index bd2b64fd5..a4f3d3af1 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -33,10 +33,10 @@ #include #include -#include +#include #include #include -#include +#include #if PA_API_VERSION != 8 #error Invalid Polypaudio API version diff --git a/src/utils/pactl.c b/src/utils/pactl.c index 23bd924b8..7d903eb8f 100644 --- a/src/utils/pactl.c +++ b/src/utils/pactl.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/utils/paplay.c b/src/utils/paplay.c index ddc1cbc16..1b3697fae 100644 --- a/src/utils/paplay.c +++ b/src/utils/paplay.c @@ -35,10 +35,10 @@ #include #include -#include +#include #include #include -#include +#include #if PA_API_VERSION != 8 #error Invalid Polypaudio API version