Reorder MusicFile methods

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

diff --git a/helpers/action.py b/helpers/action.py
index 99cd39966829c3075b44812bcd1d7c2db057675f..ec8fcb6f0b43748873eb2e8568589c62cfd36f58 100644 (file)
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -30,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
 
@@ -71,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,