Support generic timer loading

Author: einarf

demosys/conf/default_settings.py

@@ -3,7 +3,7 @@
 """
 
 # What attributes should be used when generating a settings file
-__ORDER__ = ('DEBUG', 'SCREENSHOT_PATH', 'OPENGL', 'WINDOW', 'EFFECTS', 'EFFECT_MANAGER', 'MUSIC',
+__ORDER__ = ('DEBUG', 'SCREENSHOT_PATH', 'OPENGL', 'WINDOW', 'MUSIC', 'TIMER', 'EFFECTS', 'EFFECT_MANAGER',
              'SHADER_DIRS', 'SHADER_FINDERS', 'TEXTURE_DIRS', 'TEXTURE_FINDERS')
 
 DEBUG = False
@@ -30,12 +30,15 @@
     "cursor": False,
 }
 
+MUSIC = None
+
+TIMER = 'demosys.timers.Timer'
+
 # Empty effects tuple
 EFFECTS = ()
 
 EFFECT_MANAGER = 'demosys.effects.managers.single.SingleEffectManager'
 
-MUSIC = None
 
 # Additional directories shaders can be found
 SHADER_DIRS = ()

demosys/timers/music.py

@@ -1,13 +1,14 @@
 import glfw
 from pygame import mixer
 from .base import Timer
+from demosys.conf import settings
 
 
 class MusicTimer(Timer):
     """Timer based on music"""
     def __init__(self, **kwargs):
         mixer.init()
-        mixer.music.load(kwargs['source'])
+        mixer.music.load(settings.MUSIC)
         self.paused = True
         # Reported time is not accurate when pausing or unpausing. We hack around it.
         self.pause_time = 0

demosys/view/controller.py

@@ -12,6 +12,7 @@
 from demosys import timers
 from demosys.conf import settings
 from demosys.scene import camera
+from demosys.utils import module_loading
 from . import screenshot
 
 WINDOW = None
@@ -56,10 +57,8 @@ def run(manager=None):
 
     # Initialize timer
     global TIMER
-    if settings.MUSIC:
-        TIMER = timers.MusicTimer(source=settings.MUSIC)
-    else:
-        TIMER = timers.Timer()
+    timer_cls = module_loading.import_string(settings.TIMER)
+    TIMER = timer_cls()
     TIMER.start()
 
     frames, ft = 0, 0

demosys_test/settings.py

@@ -4,7 +4,7 @@
 
 DEBUG = False
 
-# SCREENSHOT_PATH = os.path.join(PROJECT_DIR, 'screenshots')
+SCREENSHOT_PATH = os.path.join(PROJECT_DIR, 'screenshots')
 
 # Profile: any, core, compat
 OPENGL = {
@@ -24,7 +24,8 @@
     "cursor": False,
 }
 
-# MUSIC = os.path.join(PROJECT_DIR, 'resources/music/tg2035.mp3')
+MUSIC = os.path.join(PROJECT_DIR, 'resources/music/tg2035.mp3')
+TIMER = 'demosys.timers.MusicTimer'
 
 # What effects to load
 EFFECTS = (