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

The current behavior of snd_pcm_rewindable and snd_pcm_forwardable means
that the returned value is only accurate to one period. Or maybe even
meaningless if period interrupts are off. Fetch the up-to-date position
of the hardware pointer, as that's what is wanted by callers.

Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index babde6a15efe34762e95b023639282f8a99ab7e0..d9565f944b2a9003195b272302e4a910aab7bd99 100644 (file)
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -661,6 +661,9 @@ 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)
 {
+       int err = snd_pcm_dmix_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_playback_hw_rewindable(pcm);
 }
 
@@ -744,6 +747,9 @@ 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)
 {
+       int err = snd_pcm_dmix_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_avail(pcm);
 }
 

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
index 020e6f7d930732a107ab6bc0f8c351e24111c658..de0b2426d44a22e1f5b155a0c8bc029508cc5a18 100644 (file)
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -412,6 +412,9 @@ 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)
 {
+       int err = snd_pcm_dshare_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_playback_hw_rewindable(pcm);
 }
 
@@ -428,6 +431,9 @@ 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)
 {
+       int err = snd_pcm_dshare_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_playback_avail(pcm);
 }
 

diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index 8333eefdaf4c2b4ab7a3eec1f8082920c5ac0964..00cd461b31cabcd2a3722712dffe9927d58131a5 100644 (file)
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -335,6 +335,9 @@ 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)
 {
+       int err = snd_pcm_dsnoop_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_capture_hw_avail(pcm);
 }
 
@@ -351,6 +354,9 @@ 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)
 {
+       int err = snd_pcm_dsnoop_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_capture_avail(pcm);
 }
 

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index c34b766ee0353969d9096f0d51fe8246f2e843d0..4a527031ac01ae387a9a0f1655f751fc00bfa0d2 100644 (file)
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -659,6 +659,9 @@ 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)
 {
+       int err = snd_pcm_hw_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_hw_rewindable(pcm);
 }
 
@@ -679,6 +682,9 @@ 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)
 {
+       int err = snd_pcm_hw_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_avail(pcm);
 }
 

diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
index fe9347c835d54afd51f226d965828b7db9a6c39c..3861bc2e01bdeedb84647a8dcf8a18032f9694ae 100644 (file)
--- a/src/pcm/pcm_ioplug.c
+++ b/src/pcm/pcm_ioplug.c
@@ -503,6 +503,7 @@ 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)
 {
+       snd_pcm_ioplug_hw_ptr_update(pcm);
        return snd_pcm_mmap_hw_rewindable(pcm);
 }
 
@@ -514,6 +515,7 @@ 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)
 {
+       snd_pcm_ioplug_hw_ptr_update(pcm);
        return snd_pcm_mmap_avail(pcm);
 }
 

diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
index c19e2f17a730c8912c9fecbb5e4d2a63359eb6b9..57a1953f73c0ebcbcbc84223d23d91ad1d43485a 100644 (file)
--- a/src/pcm/pcm_plugin.c
+++ b/src/pcm/pcm_plugin.c
@@ -198,6 +198,9 @@ static int snd_pcm_plugin_reset(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);
 }
 
@@ -226,6 +229,9 @@ 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)
 {
+       int err = snd_pcm_generic_hwsync(pcm);
+       if (err < 0)
+               return err;
        return snd_pcm_mmap_avail(pcm);
 }