mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-17 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix timer read in non-TREAD mode

Browse source 
Fix timer read in non-TREAD mode.  (the struct is different.)
This commit is contained in:
Takashi Iwai 2005-04-15 09:22:48 +00:00
parent c5fc9e7cf7
commit 9a0f2817bb
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pcm/pcm_direct.c
View file

@ -420,9 +420,15 @@ void snd_pcm_direct_clear_timer_queue(snd_pcm_direct_t *dmix)
{ {
/* rbuf might be overwriten by multiple plugins */ /* rbuf might be overwriten by multiple plugins */
/* we don't need the value */ /* we don't need the value */
if (dmix->tread) {
snd_timer_tread_t rbuf; snd_timer_tread_t rbuf;
while (snd_timer_read(dmix->timer, &rbuf, sizeof(rbuf)) == sizeof(rbuf)) while (snd_timer_read(dmix->timer, &rbuf, sizeof(rbuf)) == sizeof(rbuf))
; ;
} else {
snd_timer_read_t rbuf;
while (snd_timer_read(dmix->timer, &rbuf, sizeof(rbuf)) == sizeof(rbuf))
;
}
} }
int snd_pcm_direct_timer_stop(snd_pcm_direct_t *dmix) int snd_pcm_direct_timer_stop(snd_pcm_direct_t *dmix)
@ -849,10 +855,10 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix)
snd_pcm_info_t *info; snd_pcm_info_t *info;
snd_timer_params_t *params; snd_timer_params_t *params;
char name[128]; char name[128];
int tread = 0;
struct pollfd fd; struct pollfd fd;
int capture = dmix->type == SND_PCM_TYPE_DSNOOP ? 1 : 0; int capture = dmix->type == SND_PCM_TYPE_DSNOOP ? 1 : 0;
dmix->tread = 0;
snd_pcm_info_alloca(&info); snd_pcm_info_alloca(&info);
snd_timer_params_alloca(&params); snd_timer_params_alloca(&params);
ret = snd_pcm_info(dmix->spcm, info); ret = snd_pcm_info(dmix->spcm, info);
@ -888,16 +894,16 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix)
int ver = 0; int ver = 0;
ioctl(dmix->poll_fd, SNDRV_TIMER_IOCTL_PVERSION, &ver); ioctl(dmix->poll_fd, SNDRV_TIMER_IOCTL_PVERSION, &ver);
if (ver >= SNDRV_PROTOCOL_VERSION(2, 0, 3)) { if (ver >= SNDRV_PROTOCOL_VERSION(2, 0, 3)) {
tread = 1; dmix->tread = 1;
if (ioctl(dmix->poll_fd, SNDRV_TIMER_IOCTL_TREAD, &tread) < 0) if (ioctl(dmix->poll_fd, SNDRV_TIMER_IOCTL_TREAD, &dmix->tread) < 0)
tread = 0; dmix->tread = 0;
} }
} }
snd_timer_params_set_auto_start(params, 1); snd_timer_params_set_auto_start(params, 1);
snd_timer_params_set_early_event(params, 1); snd_timer_params_set_early_event(params, 1);
snd_timer_params_set_ticks(params, 1); snd_timer_params_set_ticks(params, 1);
if (tread) if (dmix->tread)
snd_timer_params_set_filter(params, (1<<SND_TIMER_EVENT_TICK)|(1<<SND_TIMER_EVENT_MPAUSE)); snd_timer_params_set_filter(params, (1<<SND_TIMER_EVENT_TICK)|(1<<SND_TIMER_EVENT_MPAUSE));
ret = snd_timer_params(dmix->timer, params); ret = snd_timer_params(dmix->timer, params);
if (ret < 0) { if (ret < 0) {

1
src/pcm/pcm_direct.h
View file

@ -96,6 +96,7 @@ struct snd_pcm_direct {
int comm_fd; /* communication file descriptor (socket) */ int comm_fd; /* communication file descriptor (socket) */
int hw_fd; /* hardware file descriptor */ int hw_fd; /* hardware file descriptor */
int poll_fd; int poll_fd;
int tread;
int server_fd; int server_fd;
pid_t server_pid; pid_t server_pid;
snd_timer_t *timer; /* timer used as poll_fd */ snd_timer_t *timer; /* timer used as poll_fd */