Split up the timers package

Author: einarf

demosys/timers/__init__.py

@@ -0,0 +1,2 @@
+from .base import Timer  # noqa
+from .music import MusicTimer  # noqa

demosys/timers/base.py

@@ -0,0 +1,44 @@
+import glfw
+
+
+class Timer:
+    """Timer based on glfw time"""
+    def __init__(self, **kwargs):
+        self.start_time = None
+        self.stop_time = None
+        self.pause_time = None
+        self.offset = 0
+
+    def start(self):
+        # Initial start?
+        if self.start_time is None:
+            self.start_time = glfw.get_time()
+        # Play after pause
+        else:
+            # Add the duration of the paused interval to the total offset
+            pause_duration = glfw.get_time() - self.pause_time
+            self.offset += pause_duration
+            # print("pause duration", pause_duration, "offset", self.offset)
+            # Exit the paused state
+            self.pause_time = None
+
+    def pause(self):
+        self.pause_time = glfw.get_time()
+
+    def toggle_pause(self):
+        if self.pause_time:
+            self.start()
+        else:
+            self.pause()
+
+    def stop(self):
+        self.stop_time = glfw.get_time()
+        return self.stop_time - self.start_time - self.offset
+
+    def get_time(self):
+        if self.pause_time is not None:
+            time = self.pause_time - self.offset - self.start_time
+            return time
+
+        time = glfw.get_time()
+        return time - self.start_time - self.offset

demosys/timeline/timers.py renamed to demosys/timers/music.py

@@ -1,51 +1,9 @@
 import glfw
 from pygame import mixer
+from .base import Timer
 
 
-class Timer:
-    """Timer based on glfw time"""
-    def __init__(self, **kwargs):
-        self.start_time = None
-        self.stop_time = None
-        self.pause_time = None
-        self.offset = 0
-
-    def start(self):
-        # Initial start?
-        if self.start_time is None:
-            self.start_time = glfw.get_time()
-        # Play after pause
-        else:
-            # Add the duration of the paused interval to the total offset
-            pause_duration = glfw.get_time() - self.pause_time
-            self.offset += pause_duration
-            # print("pause duration", pause_duration, "offset", self.offset)
-            # Exit the paused state
-            self.pause_time = None
-
-    def pause(self):
-        self.pause_time = glfw.get_time()
-
-    def toggle_pause(self):
-        if self.pause_time:
-            self.start()
-        else:
-            self.pause()
-
-    def stop(self):
-        self.stop_time = glfw.get_time()
-        return self.stop_time - self.start_time - self.offset
-
-    def get_time(self):
-        if self.pause_time is not None:
-            time = self.pause_time - self.offset - self.start_time
-            return time
-
-        time = glfw.get_time()
-        return time - self.start_time - self.offset
-
-
-class MusicTimer:
+class MusicTimer(Timer):
     """Timer based on music"""
     def __init__(self, **kwargs):
         mixer.init()

demosys/view/controller.py

@@ -9,7 +9,7 @@
 from demosys.opengl import fbo
 from demosys.opengl.fbo import WINDOW_FBO
 from demosys import resources
-from demosys.timeline import timers
+from demosys import timers
 from demosys.conf import settings
 from demosys.scene import camera
 from . import screenshot