From 3a09a88fd1f3dfe365dc1f3e455c097010d00964 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Mar 2009 18:13:40 +0100
Subject: prepare move to rtpoll

---
 src/modules/alsa/alsa-sink.c                    | 2 +-
 src/modules/alsa/alsa-source.c                  | 2 +-
 src/modules/bluetooth/module-bluetooth-device.c | 2 +-
 src/modules/module-combine.c                    | 2 +-
 src/modules/module-null-sink.c                  | 2 +-
 src/modules/module-sine-source.c                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 7bf16c3c..d95f3c2f 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1329,7 +1329,7 @@ static void thread_func(void *userdata) {
         } else if (u->use_tsched)
 
             /* OK, we're in an invalid state, let's disable our timers */
-            pa_rtpoll_set_timer_disabled(u->rtpoll);
+            pa_rtpoll_disable_timer(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
         if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index f4acad8c..63b5e460 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1188,7 +1188,7 @@ static void thread_func(void *userdata) {
         } else if (u->use_tsched)
 
             /* OK, we're in an invalid state, let's disable our timers */
-            pa_rtpoll_set_timer_disabled(u->rtpoll);
+            pa_rtpoll_disable_timer(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
         if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 8d066a95..93673cb9 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1161,7 +1161,7 @@ static void thread_func(void *userdata) {
         }
 
         if (disable_timer)
-            pa_rtpoll_set_timer_disabled(u->rtpoll);
+            pa_rtpoll_disable_timer(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
         if (pollfd)
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 4b2d6f9b..43ad9680 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -302,7 +302,7 @@ static void thread_func(void *userdata) {
             pa_rtpoll_set_timer_absolute(u->rtpoll, u->thread_info.timestamp);
             u->thread_info.in_null_mode = TRUE;
         } else {
-            pa_rtpoll_set_timer_disabled(u->rtpoll);
+            pa_rtpoll_disable_timer(u->rtpoll);
             u->thread_info.in_null_mode = FALSE;
         }
 
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 183d4b2e..b5952d69 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -227,7 +227,7 @@ static void thread_func(void *userdata) {
 
             pa_rtpoll_set_timer_absolute(u->rtpoll, u->timestamp);
         } else
-            pa_rtpoll_set_timer_disabled(u->rtpoll);
+            pa_rtpoll_disable_timer(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
         if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c
index 206c45f4..23831a0d 100644
--- a/src/modules/module-sine-source.c
+++ b/src/modules/module-sine-source.c
@@ -181,7 +181,7 @@ static void thread_func(void *userdata) {
 
             pa_rtpoll_set_timer_absolute(u->rtpoll, u->timestamp);
         } else
-            pa_rtpoll_set_timer_disabled(u->rtpoll);
+            pa_rtpoll_disable_timer(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
         if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
-- 
cgit