[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-266-g882cdfc

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  f753ef2a23c0c42e5ad35a36327a9fda2e4f2d98 (commit)

- Log -----------------------------------------------------------------
882cdfc rtclock: fix type of PA_TIMEVAL_RTCLOCK
9217b47 timeval: don't create the wrong illusion that nsecs should be stored in pa_usec_t
f3bbbd0 rtclock: document that we fallback to wallclock time if monotonic time is not supported
-----------------------------------------------------------------------

Summary of changes:
 src/pulse/rtclock.h          |    6 ++++--
 src/pulse/timeval.h          |    6 +++---
 src/pulsecore/core-rtclock.h |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------

commit f3bbbd0fd377e856a27a2ed4f57ac042d620662f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jun 23 00:15:57 2009 +0200

    rtclock: document that we fallback to wallclock time if monotonic time is not supported

diff --git a/src/pulse/rtclock.h b/src/pulse/rtclock.h
index eeea625..6459d92 100644
--- a/src/pulse/rtclock.h
+++ b/src/pulse/rtclock.h
@@ -27,11 +27,13 @@
 #include <pulse/gccmacro.h>
 
 /** \file
- *  Monotonic clock utility. */
+ *  Monotonic clock utilities. */
 
 PA_C_DECL_BEGIN
 
-/** Return the current CLOCK_MONOTONIC time in usec.  \since 0.9.16 */
+/** Return the current monotonic system time in usec, if such a clock
+ * is available.  If it is not available this will return the
+ * wallclock time instead.  \since 0.9.16 */
 pa_usec_t pa_rtclock_now(void);
 
 PA_C_DECL_END

commit 9217b47b1920c0c88be6d1817f0479074b6328b8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jun 23 00:16:42 2009 +0200

    timeval: don't create the wrong illusion that nsecs should be stored in pa_usec_t

diff --git a/src/pulse/timeval.h b/src/pulse/timeval.h
index 6307735..48c6cdb 100644
--- a/src/pulse/timeval.h
+++ b/src/pulse/timeval.h
@@ -40,16 +40,16 @@ PA_C_DECL_BEGIN
 #define PA_USEC_PER_SEC ((pa_usec_t) 1000000ULL)
 
 /** The number of nanoseconds in a second */
-#define PA_NSEC_PER_SEC ((pa_usec_t) 1000000000ULL)
+#define PA_NSEC_PER_SEC ((unsigned long long) 1000000000ULL)
 
 /** The number of microseconds in a millisecond */
 #define PA_USEC_PER_MSEC ((pa_usec_t) 1000ULL)
 
 /** The number of nanoseconds in a millisecond */
-#define PA_NSEC_PER_MSEC ((pa_usec_t) 1000000ULL)
+#define PA_NSEC_PER_MSEC ((unsigned long long) 1000000ULL)
 
 /** The number of nanoseconds in a microsecond */
-#define PA_NSEC_PER_USEC ((pa_usec_t) 1000ULL)
+#define PA_NSEC_PER_USEC ((unsigned long long) 1000ULL)
 
 /** Invalid time in usec */
 #define PA_USEC_INVALID ((pa_usec_t) -1)

commit 882cdfc123d89a393d237e130a6f8e213c91dc40
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jun 23 00:17:26 2009 +0200

    rtclock: fix type of PA_TIMEVAL_RTCLOCK

diff --git a/src/pulsecore/core-rtclock.h b/src/pulsecore/core-rtclock.h
index 3c90068..9f5ae2d 100644
--- a/src/pulsecore/core-rtclock.h
+++ b/src/pulsecore/core-rtclock.h
@@ -39,7 +39,7 @@ void pa_rtclock_hrtimer_enable(void);
 #define PA_HRTIMER_THRESHOLD_USEC 10
 
 /* bit to set in tv.tv_usec to mark that the timeval is in monotonic time */
-#define PA_TIMEVAL_RTCLOCK (1 << 30)
+#define PA_TIMEVAL_RTCLOCK ((time_t) (1LU << 30))
 
 struct timeval* pa_rtclock_from_wallclock(struct timeval *tv);
 

-- 
hooks/post-receive
PulseAudio Sound Server