summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2014-09-14 18:33:37 +0200
committerJaroslav Kysela <perex@perex.cz>2014-09-14 18:33:37 +0200
commit99e57cb41a1af2056478e5d8dd0e575109e58a56 (patch)
tree4c184ea1b757443037542e2ae0d54fa4cee1fc15
parentf803a3394a7b7390087be3cc192b2895f9e960ea (diff)
downloadalsa-lib-99e57cb41a1af2056478e5d8dd0e575109e58a56.tar.gz
Revert "pcm: rewindable, forwardable: don't return stale data"
This reverts commit 6db0fe495ef1db1fd8f0ed791996f834665a926b.
-rw-r--r--src/pcm/pcm_dmix.c6
-rw-r--r--src/pcm/pcm_dshare.c6
-rw-r--r--src/pcm/pcm_dsnoop.c6
-rw-r--r--src/pcm/pcm_hw.c6
-rw-r--r--src/pcm/pcm_ioplug.c2
-rw-r--r--src/pcm/pcm_plugin.c6
6 files changed, 0 insertions, 32 deletions
diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index d9565f94..babde6a1 100644
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -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)
{
- int err = snd_pcm_dmix_hwsync(pcm);
- if (err < 0)
- return err;
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)
{
- 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 de0b2426..020e6f7d 100644
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -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)
{
- int err = snd_pcm_dshare_hwsync(pcm);
- if (err < 0)
- return err;
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)
{
- 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 00cd461b..8333eefd 100644
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -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)
{
- int err = snd_pcm_dsnoop_hwsync(pcm);
- if (err < 0)
- return err;
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)
{
- 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 4a527031..c34b766e 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -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)
{
- int err = snd_pcm_hw_hwsync(pcm);
- if (err < 0)
- return err;
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)
{
- 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 3861bc2e..fe9347c8 100644
--- a/src/pcm/pcm_ioplug.c
+++ b/src/pcm/pcm_ioplug.c
@@ -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)
{
- snd_pcm_ioplug_hw_ptr_update(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)
{
- 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 57a1953f..c19e2f17 100644
--- a/src/pcm/pcm_plugin.c
+++ b/src/pcm/pcm_plugin.c
@@ -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)
{
- int err = snd_pcm_generic_hwsync(pcm);
- if (err < 0)
- return err;
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)
{
- int err = snd_pcm_generic_hwsync(pcm);
- if (err < 0)
- return err;
return snd_pcm_mmap_avail(pcm);
}