mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "pcm: rewindable, forwardable: don't return stale data"

Browse source 
This reverts commit 6db0fe495e.
This commit is contained in:
Jaroslav Kysela 2014-09-14 18:33:37 +02:00
parent f803a3394a
commit 99e57cb41a
6 changed files with 0 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pcm/pcm_dmix.c
View file

@ -661,9 +661,6 @@ static int snd_pcm_dmix_pause(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int enable ATTRIB
static snd_pcm_sframes_t snd_pcm_dmix_rewindable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_dmix_rewindable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_dmix_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_playback_hw_rewindable(pcm); return snd_pcm_mmap_playback_hw_rewindable(pcm);
} }
@ -747,9 +744,6 @@ static snd_pcm_sframes_t snd_pcm_dmix_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t f
static snd_pcm_sframes_t snd_pcm_dmix_forwardable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_dmix_forwardable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_dmix_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_avail(pcm); return snd_pcm_mmap_avail(pcm);
} }

6
src/pcm/pcm_dshare.c
View file

@ -412,9 +412,6 @@ static int snd_pcm_dshare_pause(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int enable ATTR
static snd_pcm_sframes_t snd_pcm_dshare_rewindable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_dshare_rewindable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_dshare_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_playback_hw_rewindable(pcm); return snd_pcm_mmap_playback_hw_rewindable(pcm);
} }
@ -431,9 +428,6 @@ static snd_pcm_sframes_t snd_pcm_dshare_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t
static snd_pcm_sframes_t snd_pcm_dshare_forwardable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_dshare_forwardable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_dshare_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_playback_avail(pcm); return snd_pcm_mmap_playback_avail(pcm);
} }

6
src/pcm/pcm_dsnoop.c
View file

@ -335,9 +335,6 @@ static int snd_pcm_dsnoop_pause(snd_pcm_t *pcm ATTRIBUTE_UNUSED, int enable ATTR
static snd_pcm_sframes_t snd_pcm_dsnoop_rewindable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_dsnoop_rewindable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_dsnoop_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_capture_hw_avail(pcm); return snd_pcm_mmap_capture_hw_avail(pcm);
} }
@ -354,9 +351,6 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t
static snd_pcm_sframes_t snd_pcm_dsnoop_forwardable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_dsnoop_forwardable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_dsnoop_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_capture_avail(pcm); return snd_pcm_mmap_capture_avail(pcm);
} }

6
src/pcm/pcm_hw.c
View file

@ -659,9 +659,6 @@ static int snd_pcm_hw_pause(snd_pcm_t *pcm, int enable)
static snd_pcm_sframes_t snd_pcm_hw_rewindable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_hw_rewindable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_hw_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_hw_rewindable(pcm); return snd_pcm_mmap_hw_rewindable(pcm);
} }
@ -682,9 +679,6 @@ static snd_pcm_sframes_t snd_pcm_hw_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t fra
static snd_pcm_sframes_t snd_pcm_hw_forwardable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_hw_forwardable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_hw_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_avail(pcm); return snd_pcm_mmap_avail(pcm);
} }

2
src/pcm/pcm_ioplug.c
View file

@ -503,7 +503,6 @@ static int snd_pcm_ioplug_pause(snd_pcm_t *pcm, int enable)
static snd_pcm_sframes_t snd_pcm_ioplug_rewindable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_ioplug_rewindable(snd_pcm_t *pcm)
{ {
snd_pcm_ioplug_hw_ptr_update(pcm);
return snd_pcm_mmap_hw_rewindable(pcm); return snd_pcm_mmap_hw_rewindable(pcm);
} }
@ -515,7 +514,6 @@ static snd_pcm_sframes_t snd_pcm_ioplug_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t
static snd_pcm_sframes_t snd_pcm_ioplug_forwardable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_ioplug_forwardable(snd_pcm_t *pcm)
{ {
snd_pcm_ioplug_hw_ptr_update(pcm);
return snd_pcm_mmap_avail(pcm); return snd_pcm_mmap_avail(pcm);
} }

6
src/pcm/pcm_plugin.c
View file

@ -198,9 +198,6 @@ static int snd_pcm_plugin_reset(snd_pcm_t *pcm)
static snd_pcm_sframes_t snd_pcm_plugin_rewindable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_plugin_rewindable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_generic_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_hw_rewindable(pcm); return snd_pcm_mmap_hw_rewindable(pcm);
} }
@ -229,9 +226,6 @@ snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t frames
static snd_pcm_sframes_t snd_pcm_plugin_forwardable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_plugin_forwardable(snd_pcm_t *pcm)
{ {
int err = snd_pcm_generic_hwsync(pcm);
if (err < 0)
return err;
return snd_pcm_mmap_avail(pcm); return snd_pcm_mmap_avail(pcm);
} }