Merge most of elmarco/rtclock2

Merge commit 'e4d914c945c13d23b131d7ba75fbdd03cb6d0043'

diff --cc src/Makefile.am
index cb96070,b490480..c580ece
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -561,8 -577,8 +566,9 @@@ libpulsecommon_@PA_MAJORMINORMICRO@_la_
                pulsecore/authkey.c pulsecore/authkey.h \
                pulsecore/conf-parser.c pulsecore/conf-parser.h \
                pulsecore/core-error.c pulsecore/core-error.h \
+               pulsecore/core-rtclock.c pulsecore/core-rtclock.h \
                pulsecore/core-util.c pulsecore/core-util.h \
 +              pulsecore/rtkit.c pulsecore/rtkit.h \
                pulsecore/creds.h \
                pulsecore/dynarray.c pulsecore/dynarray.h \
                pulsecore/endianmacros.h \

diff --cc src/daemon/main.c
Simple merge

diff --cc src/modules/alsa/alsa-sink.c
Simple merge

diff --cc src/modules/alsa/alsa-source.c
Simple merge

diff --cc src/modules/bluetooth/module-bluetooth-device.c
Simple merge

diff --cc src/modules/module-card-restore.c
Simple merge

diff --cc src/modules/module-combine.c
index cd3118d,757dbda..d50e59a
--- 1/src/modules/module-combine.c
--- 2/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@@ -280,8 -278,9 +278,8 @@@ static void thread_func(void *userdata
          pa_make_realtime(u->core->realtime_priority+1);
  
      pa_thread_mq_install(&u->thread_mq);
 -    pa_rtpoll_install(u->rtpoll);
  
-     u->thread_info.timestamp = pa_rtclock_usec();
+     u->thread_info.timestamp = pa_rtclock_now();
      u->thread_info.in_null_mode = FALSE;
  
      for (;;) {

diff --cc src/modules/module-device-restore.c
Simple merge

diff --cc src/modules/module-esound-sink.c
index 48a9c79,b26b465..d7c678c
--- 1/src/modules/module-esound-sink.c
--- 2/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@@ -200,8 -201,9 +201,8 @@@ static void thread_func(void *userdata
      pa_log_debug("Thread starting up");
  
      pa_thread_mq_install(&u->thread_mq);
 -    pa_rtpoll_install(u->rtpoll);
  
-     pa_smoother_set_time_offset(u->smoother, pa_rtclock_usec());
+     pa_smoother_set_time_offset(u->smoother, pa_rtclock_now());
  
      for (;;) {
          int ret;

diff --cc src/modules/module-null-sink.c
index c4753c9,2669776..36c50b0
--- 1/src/modules/module-null-sink.c
--- 2/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@@ -208,8 -209,9 +209,8 @@@ static void thread_func(void *userdata
      pa_log_debug("Thread starting up");
  
      pa_thread_mq_install(&u->thread_mq);
 -    pa_rtpoll_install(u->rtpoll);
  
-     u->timestamp = pa_rtclock_usec();
+     u->timestamp = pa_rtclock_now();
  
      for (;;) {
          int ret;

diff --cc src/modules/module-sine-source.c
index 8df4d9b,33be66f..9826e5f
--- 1/src/modules/module-sine-source.c
--- 2/src/modules/module-sine-source.c
+++ b/src/modules/module-sine-source.c
@@@ -166,8 -167,9 +167,8 @@@ static void thread_func(void *userdata
      pa_log_debug("Thread starting up");
  
      pa_thread_mq_install(&u->thread_mq);
 -    pa_rtpoll_install(u->rtpoll);
  
-     u->timestamp = pa_rtclock_usec();
+     u->timestamp = pa_rtclock_now();
  
      for (;;) {
          int ret;

diff --cc src/modules/module-stream-restore.c
index bf100e2,99c69f6..7ae93c7
--- 1/src/modules/module-stream-restore.c
--- 2/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@@ -59,11 -60,9 +60,11 @@@ PA_MODULE_LOAD_ONCE(TRUE)
  PA_MODULE_USAGE(
          "restore_device=<Save/restore sinks/sources?> "
          "restore_volume=<Save/restore volumes?> "
 -        "restore_muted=<Save/restore muted states?>");
 +        "restore_muted=<Save/restore muted states?> "
 +        "on_hotplug=<When new device becomes available, recheck streams?> "
 +        "on_rescue=<When device becomes unavailable, recheck streams?>");
  
- #define SAVE_INTERVAL 10
+ #define SAVE_INTERVAL (10 * PA_USEC_PER_SEC)
  #define IDENTIFICATION_PROPERTY "module-stream-restore.id"
  
  static const char* const valid_modargs[] = {

diff --cc src/modules/module-tunnel.c
Simple merge

diff --cc src/modules/raop/module-raop-sink.c
index cab3a82,c226b0c..9699132
--- 1/src/modules/raop/module-raop-sink.c
--- 2/src/modules/raop/module-raop-sink.c
+++ b/src/modules/raop/module-raop-sink.c
@@@ -323,8 -324,9 +324,8 @@@ static void thread_func(void *userdata
      pa_log_debug("Thread starting up");
  
      pa_thread_mq_install(&u->thread_mq);
 -    pa_rtpoll_install(u->rtpoll);
  
-     pa_smoother_set_time_offset(u->smoother, pa_rtclock_usec());
+     pa_smoother_set_time_offset(u->smoother, pa_rtclock_now());
  
      /* Create a chunk of memory that is our encoded silence sample. */
      pa_memchunk_reset(&silence);

diff --cc src/pulsecore/rtpoll.c
index 185b821,9401deb..5cbec32
--- 1/src/pulsecore/rtpoll.c
--- 2/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@@ -40,9 -44,10 +40,9 @@@
  #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>
  #include <pulsecore/flist.h>
  #include <pulsecore/core-util.h>
  #include <pulsecore/winsock.h>