Add loop option for play

[perso/Immae/Projets/Python/MusicSampler.git] / helpers / action.py

diff --git a/helpers/action.py b/helpers/action.py
index 28afceeb6e66c3cc193428e88c28e06959cca29d..792b123cd2676c37bca6c72f2c7905aaf06b6578 100644 (file)
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -6,6 +6,7 @@ class Action:
         'command',
         'pause',
         'play',
+        'seek',
         'stop',
         'stop_all_actions',
         'unpause',
@@ -63,15 +64,21 @@ class Action:
                 music.unpause()
 
     def play(self, music = None, fade_in = 0, start_at = 0,
-            restart_if_running = False, volume = 100, **kwargs):
+            restart_if_running = False, volume = 100,
+            loop = 0,
+            **kwargs):
         if music is not None:
             if restart_if_running:
                 if music.is_not_stopped():
                     music.stop()
-                music.play(volume = volume, fade_in = fade_in, start_at = start_at)
+                music.play(volume = volume, fade_in = fade_in, start_at = start_at, loop = loop)
             else:
                 if not music.is_not_stopped():
-                    music.play(volume = volume, fade_in = fade_in, start_at = start_at)
+                    music.play(volume = volume, fade_in = fade_in, start_at = start_at, loop = loop)
+
+    def seek(self, music = None, value = 0, delta = False, **kwargs):
+        for music in self.music_list(music):
+            music.seek(value = value, delta = delta)
 
     def stop(self, music = None, fade_out = 0, wait = False, **kwargs):
         previous = None
@@ -87,11 +94,11 @@ class Action:
     def stop_all_actions(self, **kwargs):
         self.mapping.stop_all_running()
 
-    def volume(self, music = None, value = 100, add = False, **kwargs):
+    def volume(self, music = None, value = 100, delta = False, **kwargs):
         if music is not None:
-            music.set_volume(value, add = add)
+            music.set_volume(value, delta = delta)
         else:
-            self.mapping.set_master_volume(value, add = add)
+            self.mapping.set_master_volume(value, delta = delta)
 
     def wait(self, duration = 0, music = None, **kwargs):
         self.sleep_event = threading.Event()
@@ -119,7 +126,7 @@ class Action:
             return "unpausing all musics"
 
     def play_print(self, music = None, fade_in = 0, start_at = 0,
-            restart_if_running = False, volume = 100, **kwargs):
+            restart_if_running = False, volume = 100, loop = 0, **kwargs):
         message = "starting "
         if music is not None:
             message += "« {} »".format(music.name)
@@ -134,6 +141,11 @@ class Action:
 
         message += " at volume {}%".format(volume)
 
+        if loop > 0:
+            message += " {} times".format(loop + 1)
+        elif loop < 0:
+            message += " in loop"
+
         if restart_if_running:
             message += " (restarting if already running)"
 
@@ -156,8 +168,20 @@ class Action:
     def stop_all_actions_print(self, **kwargs):
         return "stopping all actions"
 
-    def volume_print(self, music = None, value = 100, add = False, **kwargs):
-        if add:
+    def seek_print(self, music = None, value = 0, delta = False, **kwargs):
+        if delta:
+            if music is not None:
+                return "moving music « {} » by {:+d}s".format(music.name, value)
+            else:
+                return "moving all musics by {:+d}s".format(value)
+        else:
+            if music is not None:
+                return "moving music « {} » to position {}s".format(music.name, value)
+            else:
+                return "moving all musics to position {}s".format(value)
+
+    def volume_print(self, music = None, value = 100, delta = False, **kwargs):
+        if delta:
             if music is not None:
                 return "{:+d}% to volume of « {} »".format(value, music.name)
             else: