diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 40 | ||||
-rw-r--r-- | src/cli-command.c | 4 | ||||
-rw-r--r-- | src/cli.c | 4 | ||||
-rw-r--r-- | src/clitext.c | 4 | ||||
-rw-r--r-- | src/module-protocol-stub.c | 2 | ||||
-rw-r--r-- | src/native-common.h | 4 | ||||
-rw-r--r-- | src/pacat-simple.c | 4 | ||||
-rw-r--r-- | src/pacat.c | 4 | ||||
-rw-r--r-- | src/pactl.c | 4 | ||||
-rw-r--r-- | src/parec-simple.c | 4 | ||||
-rw-r--r-- | src/pdispatch.c | 3 | ||||
-rw-r--r-- | src/polyplib-def.h | 5 | ||||
-rw-r--r-- | src/polyplib-error.c | 4 | ||||
-rw-r--r-- | src/polyplib-error.h | 6 | ||||
-rw-r--r-- | src/polyplib-simple.c | 7 | ||||
-rw-r--r-- | src/polyplib-simple.h | 6 | ||||
-rw-r--r-- | src/polyplib.c | 4 | ||||
-rw-r--r-- | src/polyplib.h | 6 | ||||
-rw-r--r-- | src/protocol-esound.c | 6 | ||||
-rw-r--r-- | src/protocol-native.c | 6 | ||||
-rw-r--r-- | src/protocol-simple.c | 4 | ||||
-rw-r--r-- | src/pstream-util.c | 2 | ||||
-rw-r--r-- | src/sink-input.c | 2 | ||||
-rw-r--r-- | src/sink.c | 2 | ||||
-rw-r--r-- | src/source-output.c | 2 | ||||
-rw-r--r-- | src/source.c | 2 |
26 files changed, 74 insertions, 67 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 09df6284..8ca2bfed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,10 @@ AM_CFLAGS=-ansi -D_GNU_SOURCE -bin_PROGRAMS = polypaudio pacat pactl pacat-simple parec-simple +EXTRA_DIST = polypaudio.run +bin_PROGRAMS = polypaudio pacat pactl +noinst_PROGRAMS = pacat-simple parec-simple +noinst_SCRIPTS = depmod.py pkglib_LTLIBRARIES=libiochannel.la \ libsocket-server.la \ @@ -54,7 +57,8 @@ pkglib_LTLIBRARIES=libiochannel.la \ module-native-protocol-unix.la \ libpolyp.la \ libpolyp-simple.la \ - libpolyp-error.la + libpolyp-error.la \ + libpolyp-mainloop.la polypaudio_SOURCES = idxset.c idxset.h \ queue.c queue.h \ @@ -67,8 +71,8 @@ polypaudio_SOURCES = idxset.c idxset.h \ memblockq.c memblockq.h \ client.c client.h \ core.c core.h \ - sourceoutput.c sourceoutput.h \ - sinkinput.c sinkinput.h \ + source-output.c source-output.h \ + sink-input.c sink-input.h \ source.c source.h \ sink.c sink.h \ module.c module.h \ @@ -147,14 +151,14 @@ libprotocol_cli_la_SOURCES = protocol-cli.c protocol-cli.h libprotocol_cli_la_LDFLAGS = -avoid-version libprotocol_cli_la_LIBADD = libsocket-server.la libiochannel.la libcli.la -libprotocol_native_la_SOURCES = protocol-native.c protocol-native.h +libprotocol_native_la_SOURCES = protocol-native.c protocol-native.h native-common.h libprotocol_native_la_LDFLAGS = -avoid-version libprotocol_native_la_LIBADD = libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libtagstruct_la_SOURCES = tagstruct.c tagstruct.h libtagstruct_la_LDFLAGS = -avoid-version -libprotocol_esound_la_SOURCES = protocol-esound.c protocol-esound.h esound-spec.h +libprotocol_esound_la_SOURCES = protocol-esound.c protocol-esound.h esound.h libprotocol_esound_la_LDFLAGS = -avoid-version libprotocol_esound_la_LIBADD = libsocket-server.la libiochannel.la libauthkey.la @@ -230,8 +234,8 @@ module_cli_la_SOURCES = module-cli.c module_cli_la_LDFLAGS = -module -avoid-version module_cli_la_LIBADD = libcli.la libiochannel.la -libpolyp_la_SOURCES = polyp.c polyp.h \ - polypdef.h \ +libpolyp_la_SOURCES = polyplib.c polyplib.h \ + polyplib-def.h \ tagstruct.c tagstruct.h \ iochannel.c iochannel.h \ pstream.c pstream.h \ @@ -239,8 +243,6 @@ libpolyp_la_SOURCES = polyp.c polyp.h \ pdispatch.c pdispatch.h \ protocol-native-spec.h \ mainloop-api.c mainloop-api.h \ - mainloop.c mainloop.h \ - mainloop-signal.c mainloop-signal.h \ idxset.c idxset.h \ util.c util.h \ memblock.c memblock.h \ @@ -250,22 +252,28 @@ libpolyp_la_SOURCES = polyp.c polyp.h \ dynarray.c dynarray.h \ memchunk.c memchunk.h \ authkey.c authkey.h \ - socket-util.c socket-util.h + socket-util.c socket-util.h \ + native-common.h libpolyp_la_CFLAGS = $(AM_CFLAGS) -libpolyp_error_la_SOURCES = polyp-error.c polyp-error.h +libpolyp_mainloop_la_SOURCES = mainloop-api.h mainloop-api.c \ + mainloop.c mainloop.h \ + mainloop-signal.c mainloop-signal.h +libpolyp_mainloop_la_CFLAGS = $(AM_CFLAGS) + +libpolyp_error_la_SOURCES = polyplib-error.c polyplib-error.h libpolyp_error_la_CFLAGS = $(AM_CFLAGS) -libpolyp_simple_la_SOURCES = simple.c simple.h +libpolyp_simple_la_SOURCES = polyplib-simple.c polyplib-simple.h libpolyp_simple_la_CFLAGS = $(AM_CFLAGS) -libpolyp_simple_la_LIBADD = libpolyp.la +libpolyp_simple_la_LIBADD = libpolyp.la libpolyp-mainloop.la pacat_SOURCES = pacat.c #$(libpolyp_la_SOURCES) $(libpolyp_error_la_SOURCES) -pacat_LDADD = libpolyp.la libpolyp-error.la +pacat_LDADD = libpolyp.la libpolyp-error.la libpolyp-mainloop.la pacat_CFLAGS = $(AM_CFLAGS) pactl_SOURCES = pactl.c #$(libpolyp_la_SOURCES) $(libpolyp_error_la_SOURCES) -pactl_LDADD = libpolyp.la libpolyp-error.la +pactl_LDADD = libpolyp.la libpolyp-error.la libpolyp-mainloop.la pactl_CFLAGS = $(AM_CFLAGS) pacat_simple_SOURCES = pacat-simple.c #$(libpolyp_la_SOURCES) $(libpolyp_simple_la_SOURCES) $(libpolyp_error_la_SOURCES) diff --git a/src/cli-command.c b/src/cli-command.c index 0c754c7e..469e405e 100644 --- a/src/cli-command.c +++ b/src/cli-command.c @@ -9,8 +9,8 @@ #include "sink.h" #include "source.h" #include "client.h" -#include "sinkinput.h" -#include "sourceoutput.h" +#include "sink-input.h" +#include "source-output.h" #include "tokenizer.h" #include "strbuf.h" #include "namereg.h" @@ -9,8 +9,8 @@ #include "sink.h" #include "source.h" #include "client.h" -#include "sinkinput.h" -#include "sourceoutput.h" +#include "sink-input.h" +#include "source-output.h" #include "tokenizer.h" #include "strbuf.h" #include "namereg.h" diff --git a/src/clitext.c b/src/clitext.c index 701cf2c0..6c3a0b2e 100644 --- a/src/clitext.c +++ b/src/clitext.c @@ -5,8 +5,8 @@ #include "client.h" #include "sink.h" #include "source.h" -#include "sinkinput.h" -#include "sourceoutput.h" +#include "sink-input.h" +#include "source-output.h" #include "strbuf.h" #include "sample-util.h" diff --git a/src/module-protocol-stub.c b/src/module-protocol-stub.c index f9ed62b8..4fbb2258 100644 --- a/src/module-protocol-stub.c +++ b/src/module-protocol-stub.c @@ -37,7 +37,7 @@ #else #ifdef USE_PROTOCOL_ESOUND #include "protocol-esound.h" - #include "esound-spec.h" + #include "esound.h" #define protocol_new pa_protocol_esound_new #define protocol_free pa_protocol_esound_free #define IPV4_PORT ESD_DEFAULT_PORT diff --git a/src/native-common.h b/src/native-common.h index e1db6f64..75fe483e 100644 --- a/src/native-common.h +++ b/src/native-common.h @@ -1,5 +1,5 @@ -#ifndef fooprotocolnativespech -#define fooprotocolnativespech +#ifndef foonativecommonhfoo +#define foonativecommonhfoo enum { PA_COMMAND_ERROR, diff --git a/src/pacat-simple.c b/src/pacat-simple.c index 896df814..be24c4fc 100644 --- a/src/pacat-simple.c +++ b/src/pacat-simple.c @@ -3,8 +3,8 @@ #include <string.h> #include <errno.h> -#include "simple.h" -#include "polyp-error.h" +#include "polyplib-simple.h" +#include "polyplib-error.h" #define BUFSIZE 1024 diff --git a/src/pacat.c b/src/pacat.c index 2c5198fb..ca11b3e9 100644 --- a/src/pacat.c +++ b/src/pacat.c @@ -6,8 +6,8 @@ #include <stdio.h> #include <stdlib.h> -#include "polyp.h" -#include "polyp-error.h" +#include "polyplib.h" +#include "polyplib-error.h" #include "mainloop.h" #include "mainloop-signal.h" diff --git a/src/pactl.c b/src/pactl.c index 688e1104..2f195907 100644 --- a/src/pactl.c +++ b/src/pactl.c @@ -6,8 +6,8 @@ #include <stdio.h> #include <stdlib.h> -#include "polyp.h" -#include "polyp-error.h" +#include "polyplib.h" +#include "polyplib-error.h" #include "mainloop.h" #include "mainloop-signal.h" diff --git a/src/parec-simple.c b/src/parec-simple.c index a2841beb..83c4ea2f 100644 --- a/src/parec-simple.c +++ b/src/parec-simple.c @@ -3,8 +3,8 @@ #include <string.h> #include <errno.h> -#include "simple.h" -#include "polyp-error.h" +#include "polyplib-simple.h" +#include "polyplib-error.h" #define BUFSIZE 1024 diff --git a/src/pdispatch.c b/src/pdispatch.c index 32753963..51f31725 100644 --- a/src/pdispatch.c +++ b/src/pdispatch.c @@ -1,8 +1,9 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> + #include "pdispatch.h" -#include "protocol-native-spec.h" +#include "native-common.h" #ifdef DEBUG_OPCODES diff --git a/src/polyplib-def.h b/src/polyplib-def.h index 6cfafc97..85920d2b 100644 --- a/src/polyplib-def.h +++ b/src/polyplib-def.h @@ -1,5 +1,5 @@ -#ifndef foopolypdefhfoo -#define foopolypdefhfoo +#ifndef foopolyplibdefhfoo +#define foopolyplibdefhfoo #include <inttypes.h> @@ -16,5 +16,4 @@ struct pa_buffer_attr { uint32_t fragsize; }; - #endif diff --git a/src/polyplib-error.c b/src/polyplib-error.c index 86166b0c..87c9d8fa 100644 --- a/src/polyplib-error.c +++ b/src/polyplib-error.c @@ -1,8 +1,8 @@ #include <stdio.h> #include <stdlib.h> -#include "polyp-error.h" -#include "protocol-native-spec.h" +#include "polyplib-error.h" +#include "native-common.h" static const char* const errortab[PA_ERROR_MAX] = { [PA_ERROR_OK] = "OK", diff --git a/src/polyplib-error.h b/src/polyplib-error.h index 7407f34c..7d31ec5a 100644 --- a/src/polyplib-error.h +++ b/src/polyplib-error.h @@ -1,10 +1,8 @@ -#ifndef foopolyperrhfoo -#define foopolyperrhfoo +#ifndef foopolypliberrorhfoo +#define foopolypliberrorhfoo #include <inttypes.h> -#include "protocol-native-spec.h" - const char* pa_strerror(uint32_t error); #endif diff --git a/src/polyplib-simple.c b/src/polyplib-simple.c index 5f86c5bf..6015b77d 100644 --- a/src/polyplib-simple.c +++ b/src/polyplib-simple.c @@ -3,10 +3,11 @@ #include <assert.h> #include <stdlib.h> -#include "simple.h" -#include "polyp.h" +#include "polyplib-simple.h" +#include "polyplib.h" #include "mainloop.h" -#include "polyp-error.h" +#include "native-common.h" +/*#include "polyp-error.h"*/ struct pa_simple { struct pa_mainloop *mainloop; diff --git a/src/polyplib-simple.h b/src/polyplib-simple.h index f5f872ee..8286811d 100644 --- a/src/polyplib-simple.h +++ b/src/polyplib-simple.h @@ -1,10 +1,10 @@ -#ifndef foosimplehfoo -#define foosimplehfoo +#ifndef foopolyplibsimplehfoo +#define foopolyplibsimplehfoo #include <sys/types.h> #include "sample.h" -#include "polypdef.h" +#include "polyplib-def.h" struct pa_simple; diff --git a/src/polyplib.c b/src/polyplib.c index d6d0f908..f60d9a2a 100644 --- a/src/polyplib.c +++ b/src/polyplib.c @@ -6,8 +6,8 @@ #include <sys/socket.h> #include <netdb.h> -#include "polyp.h" -#include "protocol-native-spec.h" +#include "polyplib.h" +#include "native-common.h" #include "pdispatch.h" #include "pstream.h" #include "dynarray.h" diff --git a/src/polyplib.h b/src/polyplib.h index 00849445..56d1ba66 100644 --- a/src/polyplib.h +++ b/src/polyplib.h @@ -1,10 +1,10 @@ -#ifndef foopolyphfoo -#define foopolyphfoo +#ifndef foopolyplibhfoo +#define foopolyplibhfoo #include <sys/types.h> #include "sample.h" -#include "polypdef.h" +#include "polyplib-def.h" #include "mainloop-api.h" struct pa_context; diff --git a/src/protocol-esound.c b/src/protocol-esound.c index d6d7e177..db57dfc7 100644 --- a/src/protocol-esound.c +++ b/src/protocol-esound.c @@ -6,12 +6,12 @@ #include <limits.h> #include "protocol-esound.h" -#include "esound-spec.h" +#include "esound.h" #include "memblock.h" #include "client.h" -#include "sinkinput.h" +#include "sink-input.h" #include "sink.h" -#include "sourceoutput.h" +#include "source-output.h" #include "source.h" #include "sample.h" diff --git a/src/protocol-native.c b/src/protocol-native.c index 094c6630..5165d671 100644 --- a/src/protocol-native.c +++ b/src/protocol-native.c @@ -4,11 +4,11 @@ #include <stdlib.h> #include "protocol-native.h" -#include "protocol-native-spec.h" +#include "native-common.h" #include "packet.h" #include "client.h" -#include "sourceoutput.h" -#include "sinkinput.h" +#include "source-output.h" +#include "sink-input.h" #include "pstream.h" #include "tagstruct.h" #include "pdispatch.h" diff --git a/src/protocol-simple.c b/src/protocol-simple.c index 4b52a246..6d27a284 100644 --- a/src/protocol-simple.c +++ b/src/protocol-simple.c @@ -5,8 +5,8 @@ #include <errno.h> #include <string.h> -#include "sinkinput.h" -#include "sourceoutput.h" +#include "sink-input.h" +#include "source-output.h" #include "protocol-simple.h" #include "client.h" #include "sample-util.h" diff --git a/src/pstream-util.c b/src/pstream-util.c index cdcde5fa..4f545ab4 100644 --- a/src/pstream-util.c +++ b/src/pstream-util.c @@ -1,6 +1,6 @@ #include <assert.h> -#include "protocol-native-spec.h" +#include "native-common.h" #include "pstream-util.h" void pa_pstream_send_tagstruct(struct pa_pstream *p, struct pa_tagstruct *t) { diff --git a/src/sink-input.c b/src/sink-input.c index 54778a81..b31455dd 100644 --- a/src/sink-input.c +++ b/src/sink-input.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <string.h> -#include "sinkinput.h" +#include "sink-input.h" #include "sample-util.h" #define CONVERT_BUFFER_LENGTH 4096 @@ -4,7 +4,7 @@ #include <stdio.h> #include "sink.h" -#include "sinkinput.h" +#include "sink-input.h" #include "namereg.h" #include "util.h" #include "sample-util.h" diff --git a/src/source-output.c b/src/source-output.c index 25c661a9..eefc4f99 100644 --- a/src/source-output.c +++ b/src/source-output.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <string.h> -#include "sourceoutput.h" +#include "source-output.h" struct pa_source_output* pa_source_output_new(struct pa_source *s, const char *name, const struct pa_sample_spec *spec) { struct pa_source_output *o; diff --git a/src/source.c b/src/source.c index c0eec3ea..08ce46b7 100644 --- a/src/source.c +++ b/src/source.c @@ -4,7 +4,7 @@ #include <string.h> #include "source.h" -#include "sourceoutput.h" +#include "source-output.h" #include "namereg.h" struct pa_source* pa_source_new(struct pa_core *core, const char *name, int fail, const struct pa_sample_spec *spec) { |