diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 13 | ||||
| -rw-r--r-- | src/modules/module-device-manager.c | 8 | ||||
| -rw-r--r-- | src/pulse/ext-device-manager.c | 5 | ||||
| -rw-r--r-- | src/pulse/ext-device-manager.h | 2 | ||||
| -rw-r--r-- | src/pulse/ext-stream-restore.h | 2 | ||||
| -rw-r--r-- | src/pulse/stream.h | 2 |
6 files changed, 19 insertions, 13 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c5d3ab7b..98c04683 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -180,14 +180,19 @@ pulseaudio_SOURCES = \ daemon/daemon-conf.c daemon/daemon-conf.h \ daemon/dumpmodules.c daemon/dumpmodules.h \ daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \ - daemon/main.c \ - daemon/server-lookup.c daemon/server-lookup.h + daemon/main.c -pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(DBUS_CFLAGS) -pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(DBUS_LIBS) +pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) +pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) # This is needed because automake doesn't properly expand the foreach below pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(PREOPEN_LIBS) +if HAVE_DBUS +pulseaudio_CFLAGS += $(DBUS_CFLAGS) +pulseaudio_SOURCES += daemon/server-lookup.c daemon/server-lookup.h +pulseaudio_LDADD += $(DBUS_LIBS) +endif + if PREOPEN_MODS PREOPEN_LIBS = $(PREOPEN_MODS) else diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c index bfcbfeaf..e3158644 100644 --- a/src/modules/module-device-manager.c +++ b/src/modules/module-device-manager.c @@ -1033,13 +1033,13 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio if ((e = read_entry(u, name))) { uint32_t idx; char *devname; - pa_bool_t available = FALSE; + uint32_t index = PA_INVALID_INDEX; if ((devname = get_name(name, "sink:"))) { pa_sink* s; PA_IDXSET_FOREACH(s, u->core->sinks, idx) { if (strcmp(s->name, devname) == 0) { - available = TRUE; + index = s->index; break; } } @@ -1048,7 +1048,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio pa_source* s; PA_IDXSET_FOREACH(s, u->core->sources, idx) { if (strcmp(s->name, devname) == 0) { - available = TRUE; + index = s->index; break; } } @@ -1058,7 +1058,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio pa_tagstruct_puts(reply, name); pa_tagstruct_puts(reply, e->description); pa_tagstruct_puts(reply, e->icon); - pa_tagstruct_put_boolean(reply, available); + pa_tagstruct_putu32(reply, index); pa_tagstruct_putu32(reply, NUM_ROLES); for (uint32_t i = ROLE_NONE; i < NUM_ROLES; ++i) { diff --git a/src/pulse/ext-device-manager.c b/src/pulse/ext-device-manager.c index 138ed838..57cb57c8 100644 --- a/src/pulse/ext-device-manager.c +++ b/src/pulse/ext-device-manager.c @@ -128,21 +128,18 @@ static void ext_device_manager_read_cb(pa_pdispatch *pd, uint32_t command, uint3 while (!pa_tagstruct_eof(t)) { pa_ext_device_manager_info i; - pa_bool_t available; memset(&i, 0, sizeof(i)); - available = FALSE; if (pa_tagstruct_gets(t, &i.name) < 0 || pa_tagstruct_gets(t, &i.description) < 0 || pa_tagstruct_gets(t, &i.icon) < 0 || - pa_tagstruct_get_boolean(t, &available) < 0 || + pa_tagstruct_getu32(t, &i.index) < 0 || pa_tagstruct_getu32(t, &i.n_role_priorities) < 0) { pa_context_fail(o->context, PA_ERR_PROTOCOL); goto finish; } - i.available = (uint8_t)available; if (i.n_role_priorities > 0) { uint32_t j; diff --git a/src/pulse/ext-device-manager.h b/src/pulse/ext-device-manager.h index 13538f0c..1442a1a9 100644 --- a/src/pulse/ext-device-manager.h +++ b/src/pulse/ext-device-manager.h @@ -44,7 +44,7 @@ typedef struct pa_ext_device_manager_info { const char *name; /**< Identifier string of the device. A string like "sink:" or similar followed by the name of the device. */ const char *description; /**< The description of the device when it was last seen, if applicable and saved */ const char *icon; /**< The icon given to the device */ - uint8_t available; /**< Is the device currently available? */ + uint32_t index; /**< The device index if it is currently available or PA_INVALID_INDEX */ uint32_t n_role_priorities; /**< How many role priorities do we have? */ pa_ext_device_manager_role_priority_info *role_priorities; /**< An array of role priority structures or NULL */ } pa_ext_device_manager_info; diff --git a/src/pulse/ext-stream-restore.h b/src/pulse/ext-stream-restore.h index 0b5d8eb6..54516f63 100644 --- a/src/pulse/ext-stream-restore.h +++ b/src/pulse/ext-stream-restore.h @@ -24,6 +24,8 @@ #include <pulse/context.h> #include <pulse/version.h> +#include <pulse/volume.h> +#include <pulse/channelmap.h> /** \file * diff --git a/src/pulse/stream.h b/src/pulse/stream.h index 21dd0a85..2e8e71a0 100644 --- a/src/pulse/stream.h +++ b/src/pulse/stream.h @@ -31,6 +31,8 @@ #include <pulse/def.h> #include <pulse/cdecl.h> #include <pulse/operation.h> +#include <pulse/context.h> +#include <pulse/proplist.h> /** \page streams Audio Streams * |