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 <tiwai@suse.de>

diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
index abf73789795f7ab36294eb80385813f2f0fd1279..2b07eff90ff6e12200e27a0d40378f29a7bf0d24 100644 (file)
--- 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<<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) {

diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h
index ad2d5dee40f45f194e585b7595c5ef92dd294814..f0ad82ae691db9e3d16d25facba45245f7b04251 100644 (file)
--- 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 557036b5621d809a0fdc615baae0c2462f863908..b93926c17b9913693b69d5fa70470ac5ae9d0916 100644 (file)
--- 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(&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) {

diff --git a/src/timer/timer_local.h b/src/timer/timer_local.h
index 9e6a39c41ced665393151af2ba0a06e15856f213..ac2895496456dc7a7f3cf4a9ca1d71d8364e6492 100644 (file)
--- 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 */