diff options
author | Marc-André Lureau <marc-andre.lureau@nokia.com> | 2009-04-04 23:19:53 +0300 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2009-06-20 17:29:08 +0300 |
commit | 125c52889626b2ac408ecbcc8ea85575f5808e07 (patch) | |
tree | 2dacf8016113b96c114a8a1e39bae0b4cce56670 /src/pulsecore | |
parent | 5dcdd5e3583f32c8bffb5a1892e318747070f5d8 (diff) |
pulse: move pa_rtclock_now in pulsecommon
Diffstat (limited to 'src/pulsecore')
-rw-r--r-- | src/pulsecore/core-rtclock.c (renamed from src/pulsecore/rtclock.c) | 8 | ||||
-rw-r--r-- | src/pulsecore/core-rtclock.h (renamed from src/pulsecore/rtclock.h) | 2 | ||||
-rw-r--r-- | src/pulsecore/log.c | 3 | ||||
-rw-r--r-- | src/pulsecore/ratelimit.c | 3 | ||||
-rw-r--r-- | src/pulsecore/rtpoll.c | 2 |
5 files changed, 6 insertions, 12 deletions
diff --git a/src/pulsecore/rtclock.c b/src/pulsecore/core-rtclock.c index 53c0258c..0610e297 100644 --- a/src/pulsecore/rtclock.c +++ b/src/pulsecore/core-rtclock.c @@ -37,7 +37,7 @@ #include <pulsecore/macro.h> #include <pulsecore/core-error.h> -#include "rtclock.h" +#include "core-rtclock.h" pa_usec_t pa_rtclock_age(const struct timeval *tv) { struct timeval now; @@ -122,12 +122,6 @@ void pa_rtclock_hrtimer_enable(void) { #endif } -pa_usec_t pa_rtclock_now(void) { - struct timeval tv; - - return pa_timeval_load(pa_rtclock_get(&tv)); -} - struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) { #ifdef HAVE_CLOCK_GETTIME diff --git a/src/pulsecore/rtclock.h b/src/pulsecore/core-rtclock.h index b8a588c0..83ff7c7c 100644 --- a/src/pulsecore/rtclock.h +++ b/src/pulsecore/core-rtclock.h @@ -31,8 +31,6 @@ struct timeval; struct timeval *pa_rtclock_get(struct timeval *ts); -pa_usec_t pa_rtclock_now(void); - pa_usec_t pa_rtclock_age(const struct timeval *tv); pa_bool_t pa_rtclock_hrtimer(void); void pa_rtclock_hrtimer_enable(void); diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c index acff981b..8c21ee6c 100644 --- a/src/pulsecore/log.c +++ b/src/pulsecore/log.c @@ -38,6 +38,7 @@ #include <syslog.h> #endif +#include <pulse/rtclock.h> #include <pulse/utf8.h> #include <pulse/xmalloc.h> #include <pulse/util.h> @@ -45,7 +46,7 @@ #include <pulsecore/macro.h> #include <pulsecore/core-util.h> -#include <pulsecore/rtclock.h> +#include <pulsecore/core-rtclock.h> #include <pulsecore/once.h> #include <pulsecore/ratelimit.h> diff --git a/src/pulsecore/ratelimit.c b/src/pulsecore/ratelimit.c index f00587af..844dd77d 100644 --- a/src/pulsecore/ratelimit.c +++ b/src/pulsecore/ratelimit.c @@ -23,7 +23,8 @@ #include <config.h> #endif -#include <pulsecore/rtclock.h> +#include <pulse/rtclock.h> + #include <pulsecore/log.h> #include <pulsecore/mutex.h> diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c index 006b93f6..9401debd 100644 --- a/src/pulsecore/rtpoll.c +++ b/src/pulsecore/rtpoll.c @@ -44,7 +44,7 @@ #include <pulse/timeval.h> #include <pulsecore/core-error.h> -#include <pulsecore/rtclock.h> +#include <pulsecore/core-rtclock.h> #include <pulsecore/macro.h> #include <pulsecore/llist.h> #include <pulsecore/rtsig.h> |