mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

timer: Proper reference of internal versioned symbols

Browse source 
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 <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2018-01-04 15:24:14 +01:00
parent d4e08c5e86
commit f19d9575b0
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pcm/pcm_direct.c
View file

@ -1589,7 +1589,7 @@ int snd_pcm_direct_set_timer_params(snd_pcm_direct_t *dmix)
if (dmix->tread) {
filter = (1<<SND_TIMER_EVENT_TICK) |
dmix->timer_events;
snd_timer_params_set_filter(&params, filter);
INTERNAL(snd_timer_params_set_filter)(&params, filter);
}
ret = snd_timer_params(dmix->timer, &params);
if (ret < 0) {

1
src/pcm/pcm_direct.h
View file

@ -20,6 +20,7 @@
*/
#include "pcm_local.h"
#include "../timer/timer_local.h"
#define DIRECT_IPC_SEMS 1
#define DIRECT_IPC_SEM_CLIENT 0

2
src/pcm/pcm_hw.c
View file

@ -459,7 +459,7 @@ static int snd_pcm_hw_change_timer(snd_pcm_t *pcm, int enable)
}
snd_timer_params_set_auto_start(&params, 1);
snd_timer_params_set_ticks(&params, 1);
snd_timer_params_set_filter(&params, (1<<SND_TIMER_EVENT_TICK) |
INTERNAL(snd_timer_params_set_filter)(&params, (1<<SND_TIMER_EVENT_TICK) |
suspend | resume);
err = snd_timer_params(hw->period_timer, &params);
if (err < 0) {

10
src/timer/timer_local.h
View file

@ -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 */