SND_PCM_TSTAMP_MMAP -> SND_PCM_TSTAMP_ENABLE change

diff --git a/include/pcm.h b/include/pcm.h
index 6f4d0ebc666baf9929b37af61e7cb009430fbf17..d217bb913b3662c8c77a597cd4e49a210eabd5bf 100644 (file)
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -281,9 +281,9 @@ typedef enum _snd_pcm_xrun {
 typedef enum _snd_pcm_tstamp {
        /** No timestamp */
        SND_PCM_TSTAMP_NONE = 0,
-       /** Update mmap'ed timestamp */
-       SND_PCM_TSTAMP_MMAP,
-       SND_PCM_TSTAMP_LAST = SND_PCM_TSTAMP_MMAP
+       /** Update timestamp at every hardware position update */
+       SND_PCM_TSTAMP_ENABLE,
+       SND_PCM_TSTAMP_LAST = SND_PCM_TSTAMP_ENABLE
 } snd_pcm_tstamp_t;
 
 /** Unsigned frames quantity */

diff --git a/include/sound/asound.h b/include/sound/asound.h
index e8fa0dabf1d9d3da12ea37dc727f16591e8453a4..fa1c9ab95f845201583bc12145e58ea2c7db951e 100644 (file)
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -380,8 +380,8 @@ struct sndrv_pcm_hw_params {
 
 enum sndrv_pcm_tstamp {
        SNDRV_PCM_TSTAMP_NONE = 0,
-       SNDRV_PCM_TSTAMP_MMAP,
-       SNDRV_PCM_TSTAMP_LAST = SNDRV_PCM_TSTAMP_MMAP,
+       SNDRV_PCM_TSTAMP_ENABLE,
+       SNDRV_PCM_TSTAMP_LAST = SNDRV_PCM_TSTAMP_ENABLE,
 };
 
 struct sndrv_pcm_sw_params {

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index d843c7657f4f8824cb54c3fc84260a4bf5c4db41..efabf5c311078a35db06b8f7ceb9c12c34050cec 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -1586,7 +1586,7 @@ static const char *snd_pcm_xrun_mode_names[] = {
 
 static const char *snd_pcm_tstamp_mode_names[] = {
        TSTAMP(NONE),
-       TSTAMP(MMAP),
+       TSTAMP(ENABLE),
 };
 #endif
 

diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
index 1f9cbe275660fce7a5764be68b4d2efca2c7a5b9..73d1aaec109b64c752ca732d2e2758258f829afb 100644 (file)
--- a/src/pcm/pcm_direct.c
+++ b/src/pcm/pcm_direct.c
@@ -1004,7 +1004,7 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str
         * based on the tstamp_mode of each client
         */
        ret = snd_pcm_sw_params_set_tstamp_mode(spcm, sw_params,
-                                               SND_PCM_TSTAMP_MMAP);
+                                               SND_PCM_TSTAMP_ENABLE);
        if (ret < 0) {
                SNDERR("unable to tstamp mode MMAP");
                return ret;