Add support for monotonic timestamps

diff --git a/configure.in b/configure.in
index 706080502299c88b3895f85e4f83769fac8bdf27..8d674fdfa220a41cec6677d5ead0175272d46256 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -241,6 +241,22 @@ else
   AC_MSG_RESULT(no)
 fi
 
+dnl Check for librt
+AC_MSG_CHECKING(for librt)
+AC_ARG_WITH(librt,
+  AS_HELP_STRING([--with-librt], [Use librt for monotonic clock (default = yes)]),
+  [ have_librt="$withval" ], [ have_librt="yes" ])
+if test "$have_librt" = "yes"; then
+  AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT="yes"])
+  if test "$HAVE_LIBRT" = "yes" ; then
+    ALSA_DEPLIBS="$ALSA_DEPLIBS -lrt"
+    AC_DEFINE([HAVE_LIBRT], 1, [Have librt])
+    AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Have clock gettime])
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
 AC_SUBST(ALSA_DEPLIBS)
 
 dnl Check for architecture

diff --git a/include/pcm_ioplug.h b/include/pcm_ioplug.h
index f740a1973d2624cf4ac7861f9f17b10f9c7c0df0..b5968f1a6bd9402802d895874f2b8370d15668db 100644 (file)
--- a/include/pcm_ioplug.h
+++ b/include/pcm_ioplug.h
@@ -59,6 +59,7 @@ typedef struct snd_pcm_ioplug_callback snd_pcm_ioplug_callback_t;
  * bit flags for additional conditions
  */
 #define SND_PCM_IOPLUG_FLAG_LISTED     (1<<0)          /* list up this PCM */
+#define SND_PCM_IOPLUG_FLAG_MONOTONIC  (1<<1)          /* monotonic timestamps */
 
 /*
  * Protocol version

diff --git a/src/pcm/pcm_adpcm.c b/src/pcm/pcm_adpcm.c
index 270c900036f952111e4a3f0d42fc78518bf9fd20..4f9c46b0835137d80327e11e0b0c9e38a0421ec7 100644 (file)
--- a/src/pcm/pcm_adpcm.c
+++ b/src/pcm/pcm_adpcm.c
@@ -576,6 +576,7 @@ int snd_pcm_adpcm_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sfor
        pcm->private_data = adpcm;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &adpcm->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &adpcm->plug.appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_alaw.c b/src/pcm/pcm_alaw.c
index 767e69fdbd2634b9e877ce9817ad105da5ec8c1d..3814241aaab8a69f72475cd29fcfe4c3e279969b 100644 (file)
--- a/src/pcm/pcm_alaw.c
+++ b/src/pcm/pcm_alaw.c
@@ -450,6 +450,7 @@ int snd_pcm_alaw_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sform
        pcm->private_data = alaw;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &alaw->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &alaw->plug.appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_copy.c b/src/pcm/pcm_copy.c
index b1525bfa3969beab85bdaada0140d6e07e51008a..9d3eb38501efa8aef344d37265982cad57cb3c98 100644 (file)
--- a/src/pcm/pcm_copy.c
+++ b/src/pcm/pcm_copy.c
@@ -206,6 +206,7 @@ int snd_pcm_copy_open(snd_pcm_t **pcmp, const char *name, snd_pcm_t *slave, int
        pcm->private_data = copy;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &copy->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &copy->plug.appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h
index d5f60e585c54901aaaa5c29eb1370f6a4a3803c7..803329ee12472ba3c41398eff1accbdd3a000125 100644 (file)
--- a/src/pcm/pcm_direct.h
+++ b/src/pcm/pcm_direct.h
@@ -85,7 +85,7 @@ typedef struct {
                unsigned int period_size;
                unsigned int period_time;
                snd_interval_t periods;
-               unsigned int tick_time; /* not used */
+               unsigned int monotonic;
                snd_pcm_tstamp_t tstamp_mode;
                unsigned int period_step;
                unsigned int sleep_min; /* not used */

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index b9fb1c7abc301f06dcd9036f1323cf76440818c2..9ea6e87974f9ca225c849fb22842f5a7ae2ce1dc 100644 (file)
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -333,7 +333,7 @@ static int snd_pcm_dmix_sync_ptr(snd_pcm_t *pcm)
                dmix->avail_max = avail;
        if (avail >= pcm->stop_threshold) {
                snd_timer_stop(dmix->timer);
-               gettimestamp(&dmix->trigger_tstamp);
+               gettimestamp(&dmix->trigger_tstamp, pcm->monotonic);
                if (dmix->state == SND_PCM_STATE_RUNNING) {
                        dmix->state = SND_PCM_STATE_XRUN;
                        return -EPIPE;
@@ -385,7 +385,7 @@ static int snd_pcm_dmix_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
        if (pcm->tstamp_mode == SND_PCM_TSTAMP_MMAP)
                status->tstamp = snd_pcm_hw_fast_tstamp(dmix->spcm);
        else
-               gettimestamp(&status->tstamp);
+               gettimestamp(&status->tstamp, pcm->monotonic);
        status->avail = snd_pcm_mmap_playback_avail(pcm);
        status->avail_max = status->avail > dmix->avail_max ? status->avail : dmix->avail_max;
        dmix->avail_max = 0;
@@ -504,7 +504,7 @@ static int snd_pcm_dmix_start(snd_pcm_t *pcm)
                        return err;
                snd_pcm_dmix_sync_area(pcm);
        }
-       gettimestamp(&dmix->trigger_tstamp);
+       gettimestamp(&dmix->trigger_tstamp, pcm->monotonic);
        return 0;
 }
 

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
index 44417ea1fdfe25b209fd64fc950c957aeca0a89d..301bc0304b421dcd77f004b9be61b756cbb261a1 100644 (file)
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -195,7 +195,7 @@ static int snd_pcm_dshare_sync_ptr(snd_pcm_t *pcm)
                dshare->avail_max = avail;
        if (avail >= pcm->stop_threshold) {
                snd_timer_stop(dshare->timer);
-               gettimestamp(&dshare->trigger_tstamp);
+               gettimestamp(&dshare->trigger_tstamp, pcm->monotonic);
                if (dshare->state == SND_PCM_STATE_RUNNING) {
                        dshare->state = SND_PCM_STATE_XRUN;
                        return -EPIPE;
@@ -229,7 +229,7 @@ static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
        if (pcm->tstamp_mode == SND_PCM_TSTAMP_MMAP)
                status->tstamp = snd_pcm_hw_fast_tstamp(dshare->spcm);
        else
-               gettimestamp(&status->tstamp);
+               gettimestamp(&status->tstamp, pcm->monotonic);
        status->avail = snd_pcm_mmap_playback_avail(pcm);
        status->avail_max = status->avail > dshare->avail_max ? status->avail : dshare->avail_max;
        dshare->avail_max = 0;
@@ -349,7 +349,7 @@ static int snd_pcm_dshare_start(snd_pcm_t *pcm)
                        return err;
                snd_pcm_dshare_sync_area(pcm);
        }
-       gettimestamp(&dshare->trigger_tstamp);
+       gettimestamp(&dshare->trigger_tstamp, pcm->monotonic);
        return 0;
 }
 

diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index b70416598db4d9f51e78dfce46e386180258b0ce..6add13209554a61caf77a297b3c821e5bc81a10a 100644 (file)
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -141,7 +141,7 @@ static int snd_pcm_dsnoop_sync_ptr(snd_pcm_t *pcm)
        if (pcm->stop_threshold >= pcm->boundary)       /* don't care */
                return 0;
        if ((avail = snd_pcm_mmap_capture_hw_avail(pcm)) >= pcm->stop_threshold) {
-               gettimestamp(&dsnoop->trigger_tstamp);
+               gettimestamp(&dsnoop->trigger_tstamp, pcm->monotonic);
                dsnoop->state = SND_PCM_STATE_XRUN;
                dsnoop->avail_max = avail;
                return -EPIPE;
@@ -175,7 +175,7 @@ static int snd_pcm_dsnoop_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
        if (pcm->tstamp_mode == SND_PCM_TSTAMP_MMAP)
                status->tstamp = snd_pcm_hw_fast_tstamp(dsnoop->spcm);
        else
-               gettimestamp(&status->tstamp);
+               gettimestamp(&status->tstamp, pcm->monotonic);
        status->avail = snd_pcm_mmap_capture_avail(pcm);
        status->avail_max = status->avail > dsnoop->avail_max ? status->avail : dsnoop->avail_max;
        dsnoop->avail_max = 0;
@@ -274,7 +274,7 @@ static int snd_pcm_dsnoop_start(snd_pcm_t *pcm)
        if (err < 0)
                return err;
        dsnoop->state = SND_PCM_STATE_RUNNING;
-       gettimestamp(&dsnoop->trigger_tstamp);
+       gettimestamp(&dsnoop->trigger_tstamp, pcm->monotonic);
        return 0;
 }
 

diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
index 9a53d53145ef7191555c7ab10340400ae507a422..89f8b75177150443a15b3ced0f46f1e0061123ac 100644 (file)
--- a/src/pcm/pcm_file.c
+++ b/src/pcm/pcm_file.c
@@ -467,6 +467,7 @@ int snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
        pcm->mmap_shadow = 1;
+       pcm->monotonic = 1;
        snd_pcm_link_hw_ptr(pcm, slave);
        snd_pcm_link_appl_ptr(pcm, slave);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_hooks.c b/src/pcm/pcm_hooks.c
index 93827fa5f4a5854b069978def710429ee5550c39..99b3248336e89f43c3b3c8abd9a73efa8809ab57 100644 (file)
--- a/src/pcm/pcm_hooks.c
+++ b/src/pcm/pcm_hooks.c
@@ -201,6 +201,7 @@ int snd_pcm_hooks_open(snd_pcm_t **pcmp, const char *name, snd_pcm_t *slave, int
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
        pcm->mmap_shadow = 1;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_link_hw_ptr(pcm, slave);
        snd_pcm_link_appl_ptr(pcm, slave);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index e7bb4407daa6049ee172d0e6ccb4638119013c6c..bcbdfd51527ae9ecff55ff09c6c2cdf339771d36 100644 (file)
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -923,9 +923,8 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name,
                       int fd, int mmap_emulation ATTRIBUTE_UNUSED,
                       int sync_ptr_ioctl)
 {
-       int ver;
+       int ver, mode, monotonic = 0;
        long fmode;
-       int mode;
        snd_pcm_t *pcm = NULL;
        snd_pcm_hw_t *hw = NULL;
        snd_pcm_info_t info;
@@ -980,8 +979,19 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name,
                        ret = -errno;
                        SNDMSG("TSTAMP failed\n");
                        return ret;
-               }                       
+               }
+       }
+#ifdef HAVE_CLOCK_GETTIME
+         else if (SNDRV_PROTOCOL_VERSION(2, 0, 9) >= ver) {
+               int on = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC;
+               if (ioctl(fd, SNDRV_PCM_IOCTL_TTSTAMP, &on) < 0) {
+                       ret = -errno;
+                       SNDMSG("TTSTAMP failed\n");
+                       return ret;
+               }
+               monotonic = 1;
        }
+#endif
        
        hw = calloc(1, sizeof(snd_pcm_hw_t));
        if (!hw) {
@@ -1012,6 +1022,7 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name,
        pcm->private_data = hw;
        pcm->poll_fd = fd;
        pcm->poll_events = info.stream == SND_PCM_STREAM_PLAYBACK ? POLLOUT : POLLIN;
+       pcm->monotonic = monotonic;
 
        ret = snd_pcm_hw_mmap_status(pcm);
        if (ret < 0) {

diff --git a/src/pcm/pcm_iec958.c b/src/pcm/pcm_iec958.c
index 79d611d10852f177db01540ee61f6619d0f23cf1..f0990d2fa56978843152974b7c0ad035adb4c558 100644 (file)
--- a/src/pcm/pcm_iec958.c
+++ b/src/pcm/pcm_iec958.c
@@ -496,6 +496,7 @@ int snd_pcm_iec958_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sfo
        pcm->private_data = iec;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &iec->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &iec->plug.appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
index 7bf19ca1f73365e8d0e49fde0ed5513e47bb0bf3..19b97d1b17cd66734e1e5c1d4864ddf9f90b03ed 100644 (file)
--- a/src/pcm/pcm_ioplug.c
+++ b/src/pcm/pcm_ioplug.c
@@ -447,7 +447,7 @@ static int snd_pcm_ioplug_start(snd_pcm_t *pcm)
        if (err < 0)
                return err;
 
-       gettimestamp(&io->trigger_tstamp);
+       gettimestamp(&io->trigger_tstamp, pcm->monotonic);
        io->data->state = SND_PCM_STATE_RUNNING;
 
        return 0;
@@ -462,7 +462,7 @@ static int snd_pcm_ioplug_drop(snd_pcm_t *pcm)
 
        io->data->callback->stop(io->data);
 
-       gettimestamp(&io->trigger_tstamp);
+       gettimestamp(&io->trigger_tstamp, pcm->monotonic);
        io->data->state = SND_PCM_STATE_SETUP;
 
        return 0;
@@ -1021,6 +1021,7 @@ int snd_pcm_ioplug_reinit_status(snd_pcm_ioplug_t *ioplug)
 {
        ioplug->pcm->poll_fd = ioplug->poll_fd;
        ioplug->pcm->poll_events = ioplug->poll_events;
+       ioplug->pcm->monotonic = (ioplug->flags & SND_PCM_IOPLUG_FLAG_MONOTONIC) != 0;
        ioplug->pcm->mmap_rw = ioplug->mmap_rw;
        return 0;
 }

diff --git a/src/pcm/pcm_ladspa.c b/src/pcm/pcm_ladspa.c
index 4cf8b8f62e258f9747ca5ecb5029b8d1226796d2..97bb90140d855c8500b645ee2a03d5b7b24877ad 100644 (file)
--- a/src/pcm/pcm_ladspa.c
+++ b/src/pcm/pcm_ladspa.c
@@ -1634,6 +1634,7 @@ int snd_pcm_ladspa_open(snd_pcm_t **pcmp, const char *name,
        pcm->private_data = ladspa;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &ladspa->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &ladspa->plug.appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_lfloat.c b/src/pcm/pcm_lfloat.c
index 3180d4f5649666ea76b0bc5c30d0a7f264d8abc4..883fce96ca890faff1518ed1a82958fbcd3ee405 100644 (file)
--- a/src/pcm/pcm_lfloat.c
+++ b/src/pcm/pcm_lfloat.c
@@ -409,6 +409,7 @@ int snd_pcm_lfloat_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sfo
        pcm->private_data = lfloat;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &lfloat->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &lfloat->plug.appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_linear.c b/src/pcm/pcm_linear.c
index 6fc222cbdfa4d1dfcb73b64dba1512636842faf8..e3aeac15e9c0b673ebbc32ae661e0acbfcbb18d2 100644 (file)
--- a/src/pcm/pcm_linear.c
+++ b/src/pcm/pcm_linear.c
@@ -466,6 +466,7 @@ int snd_pcm_linear_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sfo
        pcm->private_data = linear;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &linear->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &linear->plug.appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index 0b9c09bf46926a11d2a75ffae15717eae52508b8..0954aee7f55f1df0360a946bc36712614e916e56 100644 (file)
--- a/src/pcm/pcm_local.h
+++ b/src/pcm/pcm_local.h
@@ -177,7 +177,8 @@ struct _snd_pcm {
        int poll_fd_count;
        int poll_fd;
        unsigned short poll_events;
-       int setup;
+       int setup: 1,
+           monotonic: 1;
        snd_pcm_access_t access;        /* access mode */
        snd_pcm_format_t format;        /* SND_PCM_FORMAT_* */
        snd_pcm_subformat_t subformat;  /* subformat */
@@ -940,11 +941,15 @@ typedef union snd_tmp_double {
 } snd_tmp_double_t;
 
 /* get the current timestamp */
-static inline void gettimestamp(snd_htimestamp_t *tstamp)
+static inline void gettimestamp(snd_htimestamp_t *tstamp, int monotonic)
 {
-       struct timeval tv;
-
-       gettimeofday(&tv, 0);
-       tstamp->tv_sec = tv.tv_sec;
-       tstamp->tv_nsec = tv.tv_usec * 1000L;
+       if (monotonic) {
+               clock_gettime(CLOCK_MONOTONIC, tstamp);
+       } else {
+               struct timeval tv;
+
+               gettimeofday(&tv, 0);
+               tstamp->tv_sec = tv.tv_sec;
+               tstamp->tv_nsec = tv.tv_usec * 1000L;
+       }
 }

diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c
index 85ac7f84fd7b4d06761d9d8e75fc1170d9b46316..24d08ac929ba6edebe9aeade2fea057193d2efdf 100644 (file)
--- a/src/pcm/pcm_meter.c
+++ b/src/pcm/pcm_meter.c
@@ -581,6 +581,7 @@ int snd_pcm_meter_open(snd_pcm_t **pcmp, const char *name, unsigned int frequenc
        pcm->private_data = meter;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_link_hw_ptr(pcm, slave);
        snd_pcm_link_appl_ptr(pcm, slave);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_mmap_emul.c b/src/pcm/pcm_mmap_emul.c
index d3fe05ef77489ff0efc680120b2e90942b5bf772..29bbfa4a74c5f38bf6e9d730d776af0849c4feed 100644 (file)
--- a/src/pcm/pcm_mmap_emul.c
+++ b/src/pcm/pcm_mmap_emul.c
@@ -399,6 +399,7 @@ static int snd_pcm_mmap_emul_open(snd_pcm_t **pcmp, const char *name,
        pcm->private_data = map;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &map->hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &map->appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_mulaw.c b/src/pcm/pcm_mulaw.c
index 389326b61ab2bd36a78731a4747facfff5cc35bb..d696c968427640bcb4bdd6c4f193184f7dc1812c 100644 (file)
--- a/src/pcm/pcm_mulaw.c
+++ b/src/pcm/pcm_mulaw.c
@@ -465,6 +465,7 @@ int snd_pcm_mulaw_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sfor
        pcm->private_data = mulaw;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &mulaw->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &mulaw->plug.appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c
index dfd679cc9f3e0393e3517f1d8ceb330012ddd421..c2db21e5c5eff2376cfa1695f7eebdc58647d9f6 100644 (file)
--- a/src/pcm/pcm_multi.c
+++ b/src/pcm/pcm_multi.c
@@ -887,6 +887,7 @@ int snd_pcm_multi_open(snd_pcm_t **pcmp, const char *name,
        pcm->private_data = multi;
        pcm->poll_fd = multi->slaves[master_slave].pcm->poll_fd;
        pcm->poll_events = multi->slaves[master_slave].pcm->poll_events;
+       pcm->monotonic = multi->slaves[master_slave].pcm->monotonic;
        snd_pcm_link_hw_ptr(pcm, multi->slaves[master_slave].pcm);
        snd_pcm_link_appl_ptr(pcm, multi->slaves[master_slave].pcm);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c
index 742f2315dacabcf5ec3786d074430ca673771625..5b48cb1b1475cd3f1bcbffdb0df2471b94bd136e 100644 (file)
--- a/src/pcm/pcm_null.c
+++ b/src/pcm/pcm_null.c
@@ -85,7 +85,7 @@ static int snd_pcm_null_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
        memset(status, 0, sizeof(*status));
        status->state = null->state;
        status->trigger_tstamp = null->trigger_tstamp;
-       gettimestamp(&status->tstamp);
+       gettimestamp(&status->tstamp, pcm->monotonic);
        status->avail = pcm->buffer_size;
        status->avail_max = status->avail;
        return 0;

diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
index 87917c422a8338cb88ea5bc9a30096eaf9c667a7..0c2ff6e375e5e6584156b29b0352cb29766420c9 100644 (file)
--- a/src/pcm/pcm_plug.c
+++ b/src/pcm/pcm_plug.c
@@ -1054,6 +1054,7 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp,
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
        pcm->mmap_shadow = 1;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_link_hw_ptr(pcm, slave);
        snd_pcm_link_appl_ptr(pcm, slave);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
index c5bded4d8f04fddda8b49bf39f4fafc3cdc8cbdc..2487bd1065502f06a262f089c14cb4da1e437746 100644 (file)
--- a/src/pcm/pcm_rate.c
+++ b/src/pcm/pcm_rate.c
@@ -1093,7 +1093,7 @@ static int snd_pcm_rate_start(snd_pcm_t *pcm)
        if (snd_pcm_state(rate->gen.slave) != SND_PCM_STATE_PREPARED)
                return -EBADFD;
 
-       gettimestamp(&rate->trigger_tstamp);
+       gettimestamp(&rate->trigger_tstamp, pcm->monotonic);
 
        avail = snd_pcm_mmap_playback_hw_avail(rate->gen.slave);
        if (avail == 0) {
@@ -1366,6 +1366,7 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp, const char *name,
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
        pcm->mmap_rw = 1;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &rate->hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &rate->appl_ptr, -1, 0);
        *pcmp = pcm;

diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index e49bdefdbf570da7849e36f347a90abb17726afc..6991fb1bb0c83b85d6d1674f6a7270d5986ddd5c 100644 (file)
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -886,6 +886,7 @@ int snd_pcm_route_open(snd_pcm_t **pcmp, const char *name,
        pcm->private_data = route;
        pcm->poll_fd = slave->poll_fd;
        pcm->poll_events = slave->poll_events;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &route->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &route->plug.appl_ptr, -1, 0);
        err = route_load_ttable(&route->params, pcm->stream, tt_ssize, ttable, tt_cused, tt_sused);

diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
index 83a84cf63714bea32727f4d87161d21edaab1621..b4e0467691241a504c5c05b68c76d3afdc8b1d18 100644 (file)
--- a/src/pcm/pcm_share.c
+++ b/src/pcm/pcm_share.c
@@ -962,7 +962,7 @@ static int snd_pcm_share_start(snd_pcm_t *pcm)
        }
        slave->running_count++;
        _snd_pcm_share_update(pcm);
-       gettimestamp(&share->trigger_tstamp);
+       gettimestamp(&share->trigger_tstamp, pcm->monotonic);
  _end:
        Pthread_mutex_unlock(&slave->mutex);
        return err;
@@ -1095,7 +1095,7 @@ static void _snd_pcm_share_stop(snd_pcm_t *pcm, snd_pcm_state_t state)
                return;
        }
 #endif
-       gettimestamp(&share->trigger_tstamp);
+       gettimestamp(&share->trigger_tstamp, pcm->monotonic);
        if (pcm->stream == SND_PCM_STREAM_CAPTURE) {
                snd_pcm_areas_copy(pcm->stopped_areas, 0,
                                   pcm->running_areas, 0,
@@ -1492,6 +1492,7 @@ int snd_pcm_share_open(snd_pcm_t **pcmp, const char *name, const char *sname,
        pcm->private_data = share;
        pcm->poll_fd = share->client_socket;
        pcm->poll_events = stream == SND_PCM_STREAM_PLAYBACK ? POLLOUT : POLLIN;
+       pcm->monotonic = pcm->monotonic;
        snd_pcm_set_hw_ptr(pcm, &share->hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &share->appl_ptr, -1, 0);
 

diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index 45dae534c7acee0bc5169d98680f6e17fff38548..8f9120451de9e162581b60d38c2a59aaf95845d1 100644 (file)
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -814,6 +814,7 @@ int snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name,
         * an extra buffer.
         */
        pcm->mmap_shadow = 1;
+       pcm->monotonic = slave->monotonic;
        snd_pcm_set_hw_ptr(pcm, &svol->plug.hw_ptr, -1, 0);
        snd_pcm_set_appl_ptr(pcm, &svol->plug.appl_ptr, -1, 0);
        *pcmp = pcm;