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

@@ -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

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/polypaudio.h \
-		polyp/polyplib-context.h \
+		polyp/context.h \
-		polyp/polyplib-def.h \
+		polyp/def.h \
-		polyp/polyplib-error.h \
+		polyp/error.h \
-		polyp/polyplib-introspect.h \
+		polyp/introspect.h \
-		polyp/polyplib-operation.h \
+		polyp/operation.h \
-		polyp/polyplib-scache.h \
+		polyp/scache.h \
-		polyp/polyplib-simple.h \
+		polyp/simple.h \
-		polyp/polyplib-stream.h \
+		polyp/stream.h \
-		polyp/polyplib-subscribe.h \
+		polyp/subscribe.h \
-		polyp/polyplib-version.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/polypaudio.h \
-		polyp/polyplib-context.c polyp/polyplib-context.h \
+		polyp/context.c polyp/context.h \
-		polyp/polyplib-def.h \
+		polyp/def.h \
-		polyp/polyplib-internal.h \
+		polyp/internal.h \
-		polyp/polyplib-introspect.c polyp/polyplib-introspect.h \
+		polyp/introspect.c polyp/introspect.h \
-		polyp/polyplib-operation.c polyp/polyplib-operation.h \
+		polyp/operation.c polyp/operation.h \
-		polyp/polyplib-scache.c polyp/polyplib-scache.h \
+		polyp/scache.c polyp/scache.h \
-		polyp/polyplib-stream.c polyp/polyplib-stream.h \
+		polyp/stream.c polyp/stream.h \
-		polyp/polyplib-subscribe.c polyp/polyplib-subscribe.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 

src/polyp/browser.c

@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <howl.h>
 
-#include "polyplib-browser.h"
+#include "browser.h"
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>

src/polyp/context.c

@@ -47,9 +47,9 @@
 
 #include <polypcore/winsock.h>
 
-#include "polyplib-internal.h"
+#include "internal.h"
-#include "polyplib-context.h"
+#include "context.h"
-#include "polyplib-version.h"
+#include "version.h"
 #include <polypcore/native-common.h>
 #include <polypcore/pdispatch.h>
 #include <polypcore/pstream.h>

src/polyp/context.h

@@ -23,10 +23,10 @@
 ***/
 
 #include <polyp/sample.h>
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
 #include <polyp/mainloop-api.h>
 #include <polyp/cdecl.h>
-#include <polyp/polyplib-operation.h>
+#include <polyp/operation.h>
 
 /** \file
  * Connection contexts for asynchrononous communication with a

src/polyp/error.c

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "polyplib-error.h"
+#include "error.h"
 #include <polypcore/native-common.h>
 
 static const char* const errortab[PA_ERROR_MAX] = {

src/polyp/internal.h

@@ -28,9 +28,9 @@
 #include <polypcore/pdispatch.h>
 #include <polypcore/dynarray.h>
 
-#include "polyplib-context.h"
+#include "context.h"
-#include "polyplib-stream.h"
+#include "stream.h"
-#include "polyplib-operation.h"
+#include "operation.h"
 #include <polypcore/llist.h>
 #include <polypcore/native-common.h>
 #include <polyp/client-conf.h>

src/polyp/introspect.c

@@ -25,9 +25,9 @@
 
 #include <assert.h>
 
-#include "polyplib-introspect.h"
+#include "introspect.h"
-#include "polyplib-context.h"
+#include "context.h"
-#include "polyplib-internal.h"
+#include "internal.h"
 #include <polypcore/pstream-util.h>
 #include <polypcore/gccmacro.h>
 

src/polyp/introspect.h

@@ -24,8 +24,8 @@
 
 #include <inttypes.h>
 
-#include <polyp/polyplib-operation.h>
+#include <polyp/operation.h>
-#include <polyp/polyplib-context.h>
+#include <polyp/context.h>
 #include <polyp/cdecl.h>
 #include <polyp/channelmap.h>
 #include <polyp/volume.h>

src/polyp/operation.c

@@ -26,8 +26,8 @@
 #include <assert.h>
 
 #include <polypcore/xmalloc.h>
-#include "polyplib-internal.h"
+#include "internal.h"
-#include "polyplib-operation.h"
+#include "operation.h"
 
 pa_operation *pa_operation_new(pa_context *c, pa_stream *s) {
     pa_operation *o;

src/polyp/operation.h

@@ -23,7 +23,7 @@
 ***/
 
 #include <polyp/cdecl.h>
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
 
 /** \file
  * Asynchronous operations */

src/polyp/polypaudio.h

@@ -25,18 +25,18 @@
 #include <polyp/cdecl.h>
 #include <polyp/mainloop-api.h>
 #include <polyp/sample.h>
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
-#include <polyp/polyplib-context.h>
+#include <polyp/context.h>
-#include <polyp/polyplib-stream.h>
+#include <polyp/stream.h>
-#include <polyp/polyplib-introspect.h>
+#include <polyp/introspect.h>
-#include <polyp/polyplib-subscribe.h>
+#include <polyp/subscribe.h>
-#include <polyp/polyplib-scache.h>
+#include <polyp/scache.h>
-#include <polyp/polyplib-version.h>
+#include <polyp/version.h>
 
 /** \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 def.h, \ref context.h, \ref stream.h,
- * \ref polyplib-introspect.h, \ref polyplib-subscribe.h and \ref polyplib-scache.h \ref polyplib-version.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
+ * support is available as "glib-mainloop". The simple
- * synchronous API is available as "polyplib-simple".
+ * synchronous API is available as "simple".
  */
 
 #endif

src/polyp/scache.c

@@ -28,8 +28,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "polyplib-scache.h"
+#include "scache.h"
-#include "polyplib-internal.h"
+#include "internal.h"
 #include <polypcore/pstream-util.h>
 
 void pa_stream_connect_upload(pa_stream *s, size_t length) {

src/polyp/scache.h

@@ -24,8 +24,8 @@
 
 #include <sys/types.h>
 
-#include <polyp/polyplib-context.h>
+#include <polyp/context.h>
-#include <polyp/polyplib-stream.h>
+#include <polyp/stream.h>
 #include <polyp/cdecl.h>
 
 /** \file

src/polyp/simple.c

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "polyplib-simple.h"
+#include "simple.h"
 #include "polyplib.h"
 #include "mainloop.h"
 #include <polypcore/native-common.h>

src/polyp/simple.h

@@ -25,7 +25,7 @@
 #include <sys/types.h>
 
 #include "sample.h"
-#include "polyplib-def.h"
+#include "def.h"
 #include <polyp/cdecl.h>
 
 /** \file

src/polyp/stream.c

@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "polyplib-internal.h"
+#include "internal.h"
 #include <polypcore/xmalloc.h>
 #include <polypcore/pstream-util.h>
 #include <polypcore/util.h>

src/polyp/stream.h

@@ -27,9 +27,9 @@
 #include <polyp/sample.h>
 #include <polyp/channelmap.h>
 #include <polyp/volume.h>
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
 #include <polyp/cdecl.h>
-#include <polyp/polyplib-operation.h>
+#include <polyp/operation.h>
 
 /** \file
  * Audio streams for input, output and sample upload */

src/polyp/subscribe.c

@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "polyplib-subscribe.h"
+#include "subscribe.h"
-#include "polyplib-internal.h"
+#include "internal.h"
 #include <polypcore/pstream-util.h>
 #include <polypcore/gccmacro.h>
 

src/polyp/subscribe.h

@@ -24,8 +24,8 @@
 
 #include <inttypes.h>
 
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
-#include <polyp/polyplib-context.h>
+#include <polyp/context.h>
 #include <polyp/cdecl.h>
 
 /** \file

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 */

src/polypcore/native-common.h

@@ -23,7 +23,7 @@
 ***/
 
 #include <polyp/cdecl.h>
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
 
 PA_C_DECL_BEGIN
 

src/polypcore/sink.c

@@ -36,7 +36,7 @@
 #include "xmalloc.h"
 #include "subscribe.h"
 #include "log.h"
-#include <polyp/polyplib-introspect.h>
+#include <polyp/introspect.h>
 
 #define MAX_MIX_CHANNELS 32
 

src/tests/pacat-simple.c

@@ -28,8 +28,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include <polyp/polyplib-simple.h>
+#include <polyp/simple.h>
-#include <polyp/polyplib-error.h>
+#include <polyp/error.h>
 #include <polypcore/gccmacro.h>
 
 #define BUFSIZE 1024

src/tests/parec-simple.c

@@ -28,8 +28,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include <polyp/polyplib-simple.h>
+#include <polyp/simple.h>
-#include <polyp/polyplib-error.h>
+#include <polyp/error.h>
 #include <polypcore/gccmacro.h>
 
 #define BUFSIZE 1024

src/utils/pabrowse.c

@@ -29,7 +29,7 @@
 
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
-#include <polyp/polyplib-browser.h>
+#include <polyp/browser.h>
 #include <polyp/typeid.h>
 
 static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {

src/utils/pacat.c

@@ -33,10 +33,10 @@
 #include <getopt.h>
 
 #include <polyp/polyplib.h>
-#include <polyp/polyplib-error.h>
+#include <polyp/error.h>
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
-#include <polyp/polyplib-version.h>
+#include <polyp/version.h>
 
 #if PA_API_VERSION != 8
 #error Invalid Polypaudio API version

src/utils/pactl.c

@@ -36,7 +36,7 @@
 #include <sndfile.h>
 
 #include <polyp/polyplib.h>
-#include <polyp/polyplib-error.h>
+#include <polyp/error.h>
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
 #include <polyp/sample.h>

src/utils/paplay.c

@@ -35,10 +35,10 @@
 #include <sndfile.h>
 
 #include <polyp/polyplib.h>
-#include <polyp/polyplib-error.h>
+#include <polyp/error.h>
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
-#include <polyp/polyplib-version.h>
+#include <polyp/version.h>
 
 #if PA_API_VERSION != 8
 #error Invalid Polypaudio API version