Merge most of elmarco/rtclock2

Merge commit 'e4d914c945c13d23b131d7ba75fbdd03cb6d0043'

diff --cc src/Makefile.am
index cb96070dc10d80df522fda76b7ac8b74b9c5adbc,b4904803b1e401f99b8b18d694e350c09686c62d..c580ece89a7fd3ace0109722726a1aaeef988b6e
--- 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 cd3118d79cb072f8f1a1edb81ac86d941f492ff0,757dbda43960baa569dbdba5c76a51d2480af73b..d50e59aeb1d94047cf211a20dcb5ef3ba74d3ace
--- 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 48a9c7947766d4d332db09966720d97e3d0bbe56,b26b465dfeb0a1b572e3a5a8da80f4348d28d824..d7c678ca9d5a3cda1961e3d67ac6cd335ee33aed
--- 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 c4753c9dc8dee6d2e171eb5a5c322f079bf08410,2669776d2824167f7fc8a2c6069b7f12901ecd1f..36c50b05358bb9a1ea782a8d4596bd4e0e2fa31f
--- 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 8df4d9bbc4c5bb8dc9c0822bbf2b044bf3d89b91,33be66f567319728f6fa377cac23235ff1298093..9826e5f4f83ccbb951cf2db681c55bd6be1e1dfc
--- 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 bf100e2d95f49660a746cca922377ec5a5c58494,99c69f660819757a931a3c4d61fe0bd6a1b997cd..7ae93c7da8948b61f7db5ea167913af4807a2437
--- 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 cab3a82a1feb93ac1654f5b228534bdc92b04ee5,c226b0c3605a3fd215091e01b96d1b919c3b4d1f..9699132df3981a871b53667a43dc6b1627ebf49d
--- 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 185b8211f3194cadfac1baa7bb491cb9caba081b,9401debd319d2eab9abbdf11e94d1c6eae8d1a49..5cbec3211afb10e45071ea210f81fe41f5e7183c
--- 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>