X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Faction.py;h=b921fbff18c8a263d9473b748c0602a36aed6445;hb=60979de4e9f5f3f249f4887b8fecfe94f233b3d4;hp=97873a0029d8e24e8a93b239174b305ab76bdd65;hpb=ba9ea93a0f52178d24a606fddc2acc5dc85b7ff2;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/action.py b/helpers/action.py
index 97873a0..b921fbf 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -8,6 +8,7 @@ class Action:
         'play',
         'stop',
         'stop_all_actions',
+        'unpause',
         'volume',
         'wait',
     ]
@@ -23,13 +24,13 @@ class Action:
 
     def ready(self):
         if 'music' in self.arguments:
-            return self.arguments['music'].loaded
+            return self.arguments['music'].check_is_loaded()
         else:
             return True
 
     def run(self):
         print(self.description())
-        return getattr(self, self.action)(**self.arguments)
+        getattr(self, self.action)(**self.arguments)
 
     def description(self):
         return getattr(self, self.action + "_print")(**self.arguments)
@@ -41,7 +42,17 @@ class Action:
         if music is not None:
             music.pause()
         else:
-            pygame.mixer.pause()
+            for music in self.key.parent.open_files.values():
+                if music.is_playing() and not music.is_paused():
+                    music.pause()
+
+    def unpause(self, music = None, **kwargs):
+        if music is not None:
+            music.unpause()
+        else:
+            for music in self.key.parent.open_files.values():
+                if music.is_playing() and music.is_paused():
+                    music.unpause()
 
     def play(self, music = None, fade_in = 0, start_at = 0,
             restart_if_running = False, volume = 100, **kwargs):
@@ -61,12 +72,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:
@@ -74,25 +85,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"
 
@@ -112,9 +133,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"
@@ -126,7 +147,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)