Move from pygame to sounddevice for sound handling

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

diff --git a/helpers/action.py b/helpers/action.py
index d4c6252db70df932f954cc94e0ef26db75322b55..69ae96fb8581b5f0bc0006d7841394e37ec87500 100644 (file)
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -24,14 +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())
         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)
@@ -39,47 +38,46 @@ class Action:
     def command(self, command = "", **kwargs):
         pass
 
-    def pause(self, music = None, **kwargs):
+    def music_list(self, music):
         if music is not None:
-            music.pause()
+            return [music]
         else:
-            pygame.mixer.pause()
+            return self.key.parent.open_files.values()
+
+    def pause(self, music = None, **kwargs):
+        for music in self.music_list(music):
+            if music.is_loaded_playing():
+                music.pause()
 
     def unpause(self, music = None, **kwargs):
-        if music is not None:
-            music.unpause()
-        else:
-            pygame.mixer.unpause()
+        for music in self.music_list(music):
+            if music.is_loaded_paused():
+                music.unpause()
 
     def play(self, music = None, fade_in = 0, start_at = 0,
             restart_if_running = False, volume = 100, **kwargs):
         if music is not None:
             if restart_if_running:
-                if music.is_playing():
+                if music.is_not_stopped():
                     music.stop()
                 music.play(volume = volume, fade_in = fade_in, start_at = start_at)
             else:
-                if not music.is_playing():
+                if not music.is_not_stopped():
                     music.play(volume = volume, fade_in = fade_in, start_at = start_at)
-        else:
-            pygame.mixer.unpause()
 
     def stop(self, music = None, fade_out = 0, **kwargs):
-        if music is not None:
-            music.stop(fade_out = fade_out)
-        else:
-            if fade_out > 0:
-                pygame.mixer.fadeout(int(fade_out * 1000))
-            else:
-                pygame.mixer.stop()
+        for music in self.music_list(music):
+            if music.is_loaded_paused() or music.is_loaded_playing():
+                music.stop(fade_out = fade_out)
 
     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:
             music.set_volume(value)
         else:
+            # FIXME: todo
             pass
 
     def wait(self, duration = 0, music = None, **kwargs):