| Message ID | 20170629235828.18076-13-o-takashi@sakamocchi.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index a849c644..9608e89d 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -999,11 +999,9 @@ static int map_status_and_control_data(snd_pcm_t *pcm, bool force_fallback) snd_pcm_set_appl_ptr(pcm, &hw->mmap_control->appl_ptr, hw->fd, SNDRV_PCM_MMAP_OFFSET_CONTROL); if (hw->mmap_control_fallbacked) { - if (ioctl(hw->fd, SNDRV_PCM_IOCTL_SYNC_PTR, hw->sync_ptr) < 0) { - err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_SYNC_PTR failed (%i)", err); + err = sync_ptr1(hw, 0); + if (err < 0) return err; - } } return 0;
At failure of control data mapping, alsa-lib goes to fallback mode. In this mode, it keeps a buffer in user space and executes ioctl(2) with SNDRV_PCM_IOCTL_SYNC_PTR to issue/query control data as necessary. The effect of this operation can be managed by passing corresponding flags. When 0 is passing as the flag, all members in the control data are updated in kernel space. This is used when control data is initialized. This commit adds a minor code refactoring for the initialization. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> --- src/pcm/pcm_hw.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)