From f19d9575b069945e1143a43f05a158265b016e01 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 4 Jan 2018 15:24:14 +0100 Subject: [PATCH] timer: Proper reference of internal versioned symbols The multiply defined versioned symbols have to be called with INTERNAL() wrapper. Add the missing declarations of versioned timer API functions in the local header, and use them in the callers in PCM. Signed-off-by: Takashi Iwai --- src/pcm/pcm_direct.c | 2 +- src/pcm/pcm_direct.h | 1 + src/pcm/pcm_hw.c | 2 +- src/timer/timer_local.h | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index abf73789..2b07eff9 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -1589,7 +1589,7 @@ int snd_pcm_direct_set_timer_params(snd_pcm_direct_t *dmix) if (dmix->tread) { filter = (1<timer_events; - snd_timer_params_set_filter(¶ms, filter); + INTERNAL(snd_timer_params_set_filter)(¶ms, filter); } ret = snd_timer_params(dmix->timer, ¶ms); if (ret < 0) { diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h index ad2d5dee..f0ad82ae 100644 --- a/src/pcm/pcm_direct.h +++ b/src/pcm/pcm_direct.h @@ -20,6 +20,7 @@ */ #include "pcm_local.h" +#include "../timer/timer_local.h" #define DIRECT_IPC_SEMS 1 #define DIRECT_IPC_SEM_CLIENT 0 diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index 557036b5..b93926c1 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -459,7 +459,7 @@ static int snd_pcm_hw_change_timer(snd_pcm_t *pcm, int enable) } snd_timer_params_set_auto_start(¶ms, 1); snd_timer_params_set_ticks(¶ms, 1); - snd_timer_params_set_filter(¶ms, (1<period_timer, ¶ms); if (err < 0) { diff --git a/src/timer/timer_local.h b/src/timer/timer_local.h index 9e6a39c4..ac289549 100644 --- a/src/timer/timer_local.h +++ b/src/timer/timer_local.h @@ -73,3 +73,13 @@ int snd_timer_hw_open(snd_timer_t **handle, const char *name, int dev_class, int int snd_timer_query_hw_open(snd_timer_query_t **handle, const char *name, int mode); int snd_timer_async(snd_timer_t *timer, int sig, pid_t pid); + +#ifdef INTERNAL +int INTERNAL(snd_timer_params_set_exclusive)(snd_timer_params_t * params, int exclusive); +int INTERNAL(snd_timer_params_get_exclusive)(snd_timer_params_t * params); +void INTERNAL(snd_timer_params_set_filter)(snd_timer_params_t * params, unsigned int filter); +unsigned int INTERNAL(snd_timer_params_get_filter)(snd_timer_params_t * params); +int INTERNAL(snd_timer_query_info)(snd_timer_query_t *timer, snd_timer_ginfo_t *info); +int INTERNAL(snd_timer_query_params)(snd_timer_query_t *timer, snd_timer_gparams_t *params); +int INTERNAL(snd_timer_query_status)(snd_timer_query_t *timer, snd_timer_gstatus_t *status); +#endif /* INTERNAL */ -- 2.47.1