GObject timeout: use timeout_add and timeout_add_seconds properly

teltek · Jul 1, 2016 · 85db813 · 85db813
1 parent 089a3a4
commit 85db813
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/galicaster/plugins/forcedurationrec.py b/galicaster/plugins/forcedurationrec.py
@@ -39,7 +39,7 @@ def create_timer(sender=None, mp_id=None):
     global timeout_id
     do_stop_timers()
     logger.debug("Init a timer to stop a record in {} minutes".format(max_duration))
-    timeout_id = GObject.timeout_add(60 * max_duration* 1000, stop_recording)
+    timeout_id = GObject.timeout_add_seconds(60 * max_duration, stop_recording)
 
 
 def stop_recording(sender=None):

diff --git a/galicaster/scheduler/heartbeat.py b/galicaster/scheduler/heartbeat.py
@@ -30,9 +30,9 @@ def __init__(self, dispatcher, interval_short=10, interval_long=60, nighty_time=
 
 
     def init_timer(self):
-        timeout_id = GObject.timeout_add(self.get_seg_until_next()*1000, self.__notify_timer_daily)
-        timeout_id = GObject.timeout_add(self.interval_short*1000, self.__notify_timer_short)
-        timeout_id = GObject.timeout_add(self.interval_long*1000, self.__notify_timer_long)
+        timeout_id = GObject.timeout_add_seconds(self.get_seg_until_next(), self.__notify_timer_daily)
+        timeout_id = GObject.timeout_add_seconds(self.interval_short, self.__notify_timer_short)
+        timeout_id = GObject.timeout_add_seconds(self.interval_long, self.__notify_timer_long)
 
 
     def get_seg_until_next(self):

diff --git a/galicaster/scheduler/scheduler.py b/galicaster/scheduler/scheduler.py
@@ -72,7 +72,7 @@ def create_timer(self, mp):
             self.logger.info('Create timer for MP {}, it starts at {}'.format(mp.getIdentifier(), mp.getStartDateAsString()))
             self.dispatcher.emit('recorder-scheduled-event', mp.getIdentifier())
 
-            timeout_id = GObject.timeout_add(diff.seconds*1000, self.__start_record, mp.getIdentifier())
+            timeout_id = GObject.timeout_add_seconds(diff.seconds, self.__start_record, mp.getIdentifier())
             self.start_timers[mp.getIdentifier()] = timeout_id
 
 
@@ -103,7 +103,7 @@ def __start_record(self, key):
 
             self.logger.info('Start record %s, duration %s ms', mp.getIdentifier(), mp.getDuration())
 
-            timeout_id = GObject.timeout_add(mp.getDuration(), self.__stop_record, mp.getIdentifier())
+            timeout_id = GObject.timeout_add_seconds(mp.getDuration()/1000, self.__stop_record, mp.getIdentifier())
             self.recorder.record(mp)
 
         del self.start_timers[mp.getIdentifier()]

diff --git a/tests/core/dispatcher.py b/tests/core/dispatcher.py
@@ -55,7 +55,7 @@ def test_connect_ui_and_emit(self):
         dispatcher.connect_ui('pr', self.callback_ui)
         obj = {'called': False}
 
-        timeout_id = GObject.timeout_add(1.0, self.emit_signal, dispatcher, 'pr', obj)
+        timeout_id = GObject.timeout_add_seconds(1, self.emit_signal, dispatcher, 'pr', obj)
         Gtk.main()
         self.assertTrue(called)