diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | doc/README.html.in | 4 | ||||
| -rw-r--r-- | doc/todo | 7 | ||||
| -rw-r--r-- | polyp/Makefile.am | 4 | ||||
| -rw-r--r-- | polyp/main.c | 2 | ||||
| -rw-r--r-- | polyp/protocol-native.c | 38 |
6 files changed, 28 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 13a06362..0df5fac1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -EXTRA_DIST = bootstrap.sh README LICENSE +EXTRA_DIST = bootstrap.sh README LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in SUBDIRS=polyp doc MAINTAINERCLEANFILES=README diff --git a/doc/README.html.in b/doc/README.html.in index 4972c194..602787d4 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -133,8 +133,8 @@ management.</p> <p><tt>polypaudio</tt> needs <a href="http://www.mega-nerd.com/SRC/">Secret Rabbit Code (aka -<tt>libsamplerate</tt>)</a>, <a href="http://www.mega-nerd.com/SND"><tt>libsndfile</tt></a> and <a -href="http://www.alsa-project.org/">alsa-lib</a>.</p> +<tt>libsamplerate</tt>)</a>, <a href="http://www.mega-nerd.com/SND"><tt>libsndfile</tt></a>, <a +href="http://www.alsa-project.org/">alsa-lib</a> and <a href="http://www.gtk.org/">GLIB</a>. (The latter is required for building the GLIB main loop integration module only.)</p> <h2><a name="installation">Installation</a></h2> @@ -1,12 +1,7 @@ *** $Id$ *** -*** 0.2 *** - -- enable searchdir -- update docs -- pacat drain - *** 0.3 *** +- pacat drain fix - future cancellation - make mcalign merge chunks - use ref counting in more objects diff --git a/polyp/Makefile.am b/polyp/Makefile.am index ac98e86e..f9f6b6ab 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -AM_CFLAGS=-ansi -D_GNU_SOURCE -DDLSEARCHDIR=\"$(pkglibdir)\" -I$(srcdir)/.. $(PTHREAD_CFLAGS) +AM_CFLAGS=-D_GNU_SOURCE -DDLSEARCHDIR=\"$(pkglibdir)\" -I$(top_srcdir) $(PTHREAD_CFLAGS) AM_LDADD=$(PTHREAD_LIBS) AM_LIBADD=$(PTHREAD_LIBS) @@ -39,6 +39,7 @@ polypinclude_HEADERS=polyplib.h \ polyplib-subscribe.h \ polyplib-operation.h \ polyplib-scache.h \ + polyplib-version.h \ cdecl.h \ mainloop-api.h \ mainloop.h \ @@ -304,6 +305,7 @@ libpolyp_la_SOURCES = polyplib.h \ polyplib-introspect.c polyplib-introspect.h \ polyplib-scache.c polyplib-scache.h \ polyplib-subscribe.c polyplib-subscribe.h \ + polyplib-internal.h \ cdecl.h \ llist.h libpolyp_la_CFLAGS = $(AM_CFLAGS) diff --git a/polyp/main.c b/polyp/main.c index 9f3d3406..de02a110 100644 --- a/polyp/main.c +++ b/polyp/main.c @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) { r = lt_dlinit(); assert(r == 0); #ifdef DLSEARCHDIR -/* lt_dladdsearchdir(DLSEARCHDIR);*/ + lt_dladdsearchdir(DLSEARCHDIR); #endif mainloop = pa_mainloop_new(); diff --git a/polyp/protocol-native.c b/polyp/protocol-native.c index d633c265..c8e5137e 100644 --- a/polyp/protocol-native.c +++ b/polyp/protocol-native.c @@ -1154,25 +1154,27 @@ static void command_get_info_list(struct pa_pdispatch *pd, uint32_t command, uin assert(command == PA_COMMAND_GET_SAMPLE_INFO_LIST); i = c->protocol->core->scache; } - - for (p = pa_idxset_first(i, &index); p; p = pa_idxset_next(i, &index)) { - if (command == PA_COMMAND_GET_SINK_INFO_LIST) - sink_fill_tagstruct(reply, p); - else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST) - source_fill_tagstruct(reply, p); - else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST) - client_fill_tagstruct(reply, p); - else if (command == PA_COMMAND_GET_MODULE_INFO_LIST) - module_fill_tagstruct(reply, p); - else if (command == PA_COMMAND_GET_SINK_INPUT_INFO_LIST) - sink_input_fill_tagstruct(reply, p); - else if (command == PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST) - source_output_fill_tagstruct(reply, p); - else { - assert(command == PA_COMMAND_GET_SAMPLE_INFO_LIST); - scache_fill_tagstruct(reply, p); + + if (i) { + for (p = pa_idxset_first(i, &index); p; p = pa_idxset_next(i, &index)) { + if (command == PA_COMMAND_GET_SINK_INFO_LIST) + sink_fill_tagstruct(reply, p); + else if (command == PA_COMMAND_GET_SOURCE_INFO_LIST) + source_fill_tagstruct(reply, p); + else if (command == PA_COMMAND_GET_CLIENT_INFO_LIST) + client_fill_tagstruct(reply, p); + else if (command == PA_COMMAND_GET_MODULE_INFO_LIST) + module_fill_tagstruct(reply, p); + else if (command == PA_COMMAND_GET_SINK_INPUT_INFO_LIST) + sink_input_fill_tagstruct(reply, p); + else if (command == PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST) + source_output_fill_tagstruct(reply, p); + else { + assert(command == PA_COMMAND_GET_SAMPLE_INFO_LIST); + scache_fill_tagstruct(reply, p); + } } - } + } pa_pstream_send_tagstruct(c->pstream, reply); } |