X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Faction.py;h=ec8fcb6f0b43748873eb2e8568589c62cfd36f58;hb=205861936ca55357beea6a8af7c0c9ed5a61f484;hp=218c3167c934ada44a8213d22a5400d80215fe19;hpb=2e4049036ec4d90a9daeff606d821d2ac2d023ce;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/action.py b/helpers/action.py
index 218c316..ec8fcb6 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -6,6 +6,7 @@ from . import debug_print
 class Action:
     action_types = [
         'command',
+        'interrupt_wait',
         'pause',
         'play',
         'seek',
@@ -29,7 +30,7 @@ class Action:
 
     def ready(self):
         if 'music' in self.arguments:
-            return self.arguments['music'].check_is_loaded()
+            return self.arguments['music'].is_loaded(allow_substates=True)
         else:
             return True
 
@@ -70,14 +71,14 @@ class Action:
             loop=0, **kwargs):
         for music in self.music_list(music):
             if restart_if_running:
-                if music.is_not_stopped():
+                if music.is_in_use():
                     music.stop()
                 music.play(
                         volume=volume,
                         fade_in=fade_in,
                         start_at=start_at,
                         loop=loop)
-            elif not music.is_not_stopped():
+            elif not music.is_in_use():
                 music.play(
                         volume=volume,
                         fade_in=fade_in,
@@ -88,27 +89,39 @@ class Action:
         for music in self.music_list(music):
             music.seek(value=value, delta=delta)
 
-    def stop(self, music=None, fade_out=0, wait=False, **kwargs):
+    def interrupt_wait(self, wait_id=None):
+        self.mapping.interrupt_wait(wait_id)
+
+    def stop(self, music=None, fade_out=0, wait=False,
+            set_wait_id=None, **kwargs):
         previous = None
         for music in self.music_list(music):
             if music.is_loaded_paused() or music.is_loaded_playing():
                 if previous is not None:
                     previous.stop(fade_out=fade_out)
                 previous = music
+            else:
+                music.stop(fade_out=fade_out)
 
         if previous is not None:
-            previous.stop(fade_out=fade_out, wait=wait)
+            previous.stop(
+                    fade_out=fade_out,
+                    wait=wait,
+                    set_wait_id=set_wait_id)
 
     def stop_all_actions(self, **kwargs):
         self.mapping.stop_all_running()
 
-    def volume(self, music=None, value=100, delta=False, **kwargs):
+    def volume(self, music=None, value=100, fade=0, delta=False, **kwargs):
         if music is not None:
-            music.set_volume(value, delta=delta)
+            music.set_volume(value, delta=delta, fade=fade)
         else:
-            self.mapping.set_master_volume(value, delta=delta)
+            self.mapping.set_master_volume(value, delta=delta, fade=fade)
+
+    def wait(self, duration=0, music=None, set_wait_id=None, **kwargs):
+        if set_wait_id is not None:
+            self.mapping.add_wait_id(set_wait_id, self)
 
-    def wait(self, duration=0, music=None, **kwargs):
         self.sleep_event = threading.Event()
 
         if music is not None:
@@ -121,6 +134,9 @@ class Action:
     def command_print(self, command="", **kwargs):
         return "running command {}".format(command)
 
+    def interrupt_wait_print(self, wait_id=None, **kwargs):
+        return "interrupt wait with id {}".format(wait_id)
+
     def pause_print(self, music=None, **kwargs):
         if music is not None:
             return "pausing « {} »".format(music.name)
@@ -159,7 +175,9 @@ class Action:
 
         return message
 
-    def stop_print(self, music=None, fade_out=0, wait=False, **kwargs):
+    def stop_print(self, music=None, fade_out=0, wait=False,
+            set_wait_id=None, **kwargs):
+
         message = "stopping "
         if music is not None:
             message += "music « {} »".format(music.name)
@@ -169,7 +187,11 @@ class Action:
         if fade_out > 0:
             message += " with {}s fadeout".format(fade_out)
             if wait:
-                message += " (waiting the end of fadeout)"
+                if set_wait_id is not None:
+                    message += " (waiting the end of fadeout, with id {})"\
+                            .format(set_wait_id)
+                else:
+                    message += " (waiting the end of fadeout)"
 
         return message
 
@@ -192,33 +214,45 @@ class Action:
                 return "moving all musics to position {}s" \
                         .format(value)
 
-    def volume_print(self, music=None, value=100, delta=False, **kwargs):
+    def volume_print(self, music=None,
+            value=100, delta=False, fade=0, **kwargs):
+        message = ""
         if delta:
             if music is not None:
-                return "{:+d}% to volume of « {} »" \
+                message += "{:+d}% to volume of « {} »" \
                         .format(value, music.name)
             else:
-                return "{:+d}% to volume" \
+                message += "{:+d}% to volume" \
                         .format(value)
         else:
             if music is not None:
-                return "setting volume of « {} » to {}%" \
+                message += "setting volume of « {} » to {}%" \
                         .format(music.name, value)
             else:
-                return "setting volume to {}%" \
+                message += "setting volume to {}%" \
                         .format(value)
 
-    def wait_print(self, duration=0, music=None, **kwargs):
+        if fade > 0:
+            message += " with {}s fade".format(fade)
+
+        return message
+
+    def wait_print(self, duration=0, music=None, set_wait_id=None, **kwargs):
+        message = ""
         if music is None:
-            return "waiting {}s" \
+            message += "waiting {}s" \
                     .format(duration)
         elif duration == 0:
-            return "waiting the end of « {} »" \
+            message += "waiting the end of « {} »" \
                     .format(music.name)
         else:
-            return "waiting the end of « {} » + {}s" \
+            message += "waiting the end of « {} » + {}s" \
                     .format(music.name, duration)
 
+        if set_wait_id is not None:
+            message += " (setting id = {})".format(set_wait_id)
+
+        return message
 
     # Interruptions
     def wait_interrupt(self, duration=0, music=None, **kwargs):