gemian/pulseaudio-modules-droid
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modules: Fix compatibility with PulseAudio 13.0.

Browse source 
There were some API changes:
 - 878ef44079
 - 6665b466d2

Leading to:
 Error relocating /usr/lib/pulse-13.0/modules/libdroid-sink.so: pa_make_realtime: symbol not found
 Error relocating /usr/lib/pulse-13.0/modules/libdroid-source.so: pa_make_realtime: symbol not found
 Error relocating /usr/lib/pulse-13.0/modules/libdroid-source.so: pa_source_get_state: symbol not found

Fixes are:
 - include <pulse/util.h>, replace pa_make_realtime -> pa_thread_make_realtime
 - replace pa_source_get_state(X) -> X->state
 - replace pa_sink_get_state(X) -> X->state

[modules] Fix compatibility with PulseAudio 13.0. JB#47666
This commit is contained in:
Alexey Min 2019-10-06 23:14:46 +03:00 • committed by Juho Hämäläinen
parent 97a0c98f84
commit 21b3c42db7
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/droid/droid-sink.c
View file

@ -54,6 +54,7 @@
#include <pulsecore/time-smoother.h>
#include <pulsecore/hashmap.h>
#include <pulsecore/core-subscribe.h>
#include <pulse/version.h>
#include "droid-sink.h"
#include <droid/droid-util.h>
@ -371,7 +372,11 @@ static void thread_func(void *userdata) {
pa_log_debug("Thread starting up.");
if (u->core->realtime_scheduling)
#if PA_CHECK_VERSION(13,0,0)
pa_thread_make_realtime(u->core->realtime_priority);
#else
pa_make_realtime(u->core->realtime_priority);
#endif
pa_thread_mq_install(&u->thread_mq);

7
src/droid/droid-source.c
View file

@ -51,6 +51,7 @@
#include <pulsecore/rtpoll.h>
#include <pulsecore/time-smoother.h>
#include <pulsecore/resampler.h>
#include <pulse/version.h>
#include "droid-source.h"
#include <droid/droid-util.h>
@ -211,7 +212,11 @@ static void thread_func(void *userdata) {
pa_log_debug("Thread starting up.");
if (u->core->realtime_scheduling)
#if PA_CHECK_VERSION(13,0,0)
pa_thread_make_realtime(u->core->realtime_priority);
#else
pa_make_realtime(u->core->realtime_priority);
#endif
pa_thread_mq_install(&u->thread_mq);
@ -366,7 +371,7 @@ static int source_set_port_cb(pa_source *s, pa_device_port *p) {
pa_log_debug("Source set port %#010x", data->device);
if (!PA_SOURCE_IS_OPENED(pa_source_get_state(u->source)))
if (!PA_SOURCE_IS_OPENED(u->source->state))
do_routing(u, data->device);
else {
pa_asyncmsgq_post(u->source->asyncmsgq, PA_MSGOBJECT(u->source), SOURCE_MESSAGE_DO_ROUTING, PA_UINT_TO_PTR(data->device), 0, NULL, NULL);