Support skipping time with LEFT, RIGHT

Author: einarf

demosys/conf/default.py

@@ -25,7 +25,7 @@
 
 MUSIC = None
 
-TIMER = 'demosys.timers.time.Timer'
+TIMER = 'demosys.timers.clock.Timer'
 
 TIMELINE = 'demosys.timeline.single.Timeline'
 

demosys/context/base.py

@@ -160,6 +160,12 @@ def keyboard_event(self, key, action, modifier):
         if key == self.keys.R and action == self.keys.ACTION_PRESS:
             project.instance.reload_programs()
 
+        if key == self.keys.RIGHT and action == self.keys.ACTION_PRESS:
+            self.timer.set_time(self.timer.get_time() + 10.0)
+
+        if key == self.keys.LEFT and action == self.keys.ACTION_PRESS:
+            self.timer.set_time(self.timer.get_time() - 10.0)
+
         # Forward the event to the timeline
         self.timeline.key_event(key, action, modifier)
 

demosys/context/glfw/keys.py

@@ -14,6 +14,10 @@ class Keys(BaseKeys):
     ENTER = glfw.KEY_ENTER
     PAGE_UP = glfw.KEY_PAGE_UP
     PAGE_DOWN = glfw.KEY_PAGE_DOWN
+    LEFT = glfw.KEY_LEFT
+    RIGHT = glfw.KEY_RIGHT
+    UP = glfw.KEY_UP
+    DOWN = glfw.KEY_DOWN
 
     A = glfw.KEY_A
     B = glfw.KEY_B

demosys/context/pyglet/keys.py

@@ -11,6 +11,10 @@ class Keys(BaseKeys):
     ENTER = key.ENTER
     PAGE_UP = key.PAGEUP
     PAGE_DOWN = key.PAGEDOWN
+    LEFT = key.LEFT
+    RIGHT = key.RIGHT
+    UP = key.UP
+    DOWN = key.DOWN
 
     A = key.A
     B = key.B

demosys/context/pyqt/keys.py

@@ -11,6 +11,10 @@ class Keys(BaseKeys):
     ENTER = Qt.Key_Enter
     PAGE_UP = Qt.Key_PageUp
     PAGE_DOWN = Qt.Key_PageDown
+    LEFT = Qt.Key_Left
+    RIGHT = Qt.Key_Right
+    UP = Qt.Key_Up
+    DOWN = Qt.Key_Down
 
     A = Qt.Key_A
     B = Qt.Key_B

demosys/project_template/project/settings.py

@@ -29,7 +29,7 @@
 
 MUSIC = None
 
-TIMER = 'demosys.timers.time.Timer'
+TIMER = 'demosys.timers.clock.Timer'
 
 TIMELINE = 'demosys.timeline.single.Timeline'
 

demosys/timers/base.py

@@ -24,3 +24,7 @@ def stop(self):
     def get_time(self):
         """Get the current time in seconds (float)"""
         raise NotImplementedError()
+
+    def set_time(self, value):
+        """Set the current time"""
+        raise NotImplementedError()

demosys/timers/time.py demosys/timers/clock.pydemosys/timers/time.py renamed to demosys/timers/clock.py

@@ -52,3 +52,9 @@ def get_time(self):
 
         curr_time = time.time()
         return curr_time - self.start_time - self.offset
+
+    def set_time(self, value):
+        if value < 0:
+            value = 0
+
+        self.offset += self.get_time() - value

demosys/timers/music.py

@@ -11,7 +11,7 @@
 class Timer(BaseTimer):
     """Timer based on music"""
     def __init__(self, **kwargs):
-        mixer.init(frequency=44100, size=-16, channels=2, buffer=1024)
+        mixer.init(frequency=44100, size=-16, channels=2, buffer=4096)
         mixer.music.load(settings.MUSIC)
         self.paused = True
         self.pause_time = 0
@@ -53,3 +53,10 @@ def get_time(self):
             return self.pause_time
 
         return mixer.music.get_pos() / 1000.0
+
+    def set_time(self, value):
+        if value < 0:
+            value = 0
+
+        # mixer.music.play(start=value)
+        mixer.music.set_pos(value)

demosys/timers/rocket.py

@@ -17,9 +17,10 @@ def __init__(self, **kwargs):
         self.mode = config.get('mode') or 'editor'
         self.files = config.get('files') or './tracks'
         self.project = config.get('project') or 'project.xml'
+        self.rps = config.get('rps', 24)
         self.start_paused = False
 
-        self.controller = TimeController(config.get('rps', 24))
+        self.controller = TimeController(self.rps)
         if self.mode == 'editor':
             self.rocket = Rocket.from_socket(self.controller, track_path=self.files)
             self.start_paused = True
@@ -52,6 +53,12 @@ def get_time(self):
         self.rocket.update()
         return self.rocket.time
 
+    def set_time(self, value):
+        if value < 0:
+            value = 0
+
+        self.controller.row =  self.rps * value
+
     def pause(self):
         """Pause the timer"""
         self.controller.playing = False