X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Faction.py;h=aff61e701f76ecc72721436e5bb315aab7cf557c;hb=8612c5f8bb0fc9529bc489a6719654d4474db6d5;hp=8a69fae3a967f4dd020f7d037e89415a7de072e3;hpb=0e5d59f77586134da457ed7a3c57fc99649be590;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/action.py b/helpers/action.py
index 8a69fae..aff61e7 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -8,6 +8,7 @@ class Action:
         'play',
         'stop',
         'stop_all_actions',
+        'unpause',
         'volume',
         'wait',
     ]
@@ -28,8 +29,12 @@ class Action:
             return True
 
     def run(self):
-        print(getattr(self, self.action + "_print")(**self.arguments))
-        return getattr(self, self.action)(**self.arguments)
+        print(self.description())
+        getattr(self, self.action)(**self.arguments)
+        #pygame.event.post(pygame.event.Event(pygame.USEREVENT))
+
+    def description(self):
+        return getattr(self, self.action + "_print")(**self.arguments)
 
     def command(self, command = "", **kwargs):
         pass
@@ -40,6 +45,12 @@ class Action:
         else:
             pygame.mixer.pause()
 
+    def unpause(self, music = None, **kwargs):
+        if music is not None:
+            music.unpause()
+        else:
+            pygame.mixer.unpause()
+
     def play(self, music = None, fade_in = 0, start_at = 0,
             restart_if_running = False, volume = 100, **kwargs):
         if music is not None:
@@ -58,12 +69,12 @@ class Action:
             music.stop(fade_out = fade_out)
         else:
             if fade_out > 0:
-                pygame.fadeout(fade_out * 1000)
+                pygame.mixer.fadeout(int(fade_out * 1000))
             else:
                 pygame.mixer.stop()
 
     def stop_all_actions(self, **kwargs):
-        self.key.mapping.stop_all_running()
+        self.key.parent.stop_all_running()
 
     def volume(self, music = None, value = 100, **kwargs):
         if music is not None:
@@ -71,25 +82,35 @@ class Action:
         else:
             pass
 
-    def wait(self, duration = 0, **kwargs):
+    def wait(self, duration = 0, music = None, **kwargs):
         # FIXME: Make it stoppable
         # http://stackoverflow.com/questions/29082268/python-time-sleep-vs-event-wait
-        time.sleep(duration)
+        if music is None:
+            time.sleep(duration)
+        else:
+            # TODO
+            music.wait_end()
 
     def command_print(self, command = "", **kwargs):
         return "running command {}".format(command)
 
     def pause_print(self, music = None, **kwargs):
         if music is not None:
-            return "pausing {}".format(music.filename)
+            return "pausing « {} »".format(music.name)
         else:
             return "pausing all musics"
 
+    def unpause_print(self, music = None, **kwargs):
+        if music is not None:
+            return "unpausing « {} »".format(music.name)
+        else:
+            return "unpausing all musics"
+
     def play_print(self, music = None, fade_in = 0, start_at = 0,
             restart_if_running = False, volume = 100, **kwargs):
         message = "starting "
         if music is not None:
-            message += music.filename
+            message += "« {} »".format(music.name)
         else:
             message += "music"
 
@@ -109,9 +130,9 @@ class Action:
     def stop_print(self, music = None, fade_out = 0, **kwargs):
         if music is not None:
             if fade_out == 0:
-                return "stopping music {}".format(music.filename)
+                return "stopping music « {} »".format(music.name)
             else:
-                return "stopping music {} with {}s fadeout".format(music.filename, fade_out)
+                return "stopping music « {} » with {}s fadeout".format(music.name, fade_out)
         else:
             if fade_out == 0:
                 return "stopping all musics"
@@ -123,7 +144,7 @@ class Action:
 
     def volume_print(self, music = None, value = 100, **kwargs):
         if music is not None:
-            return "setting volume of {} to {}%".format(music.filename, value)
+            return "setting volume of « {} » to {}%".format(music.name, value)
         else:
             return "setting volume to {}%".format(value)