aboutsummaryrefslogtreecommitdiff
path: root/helpers/action.py
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-07-25 16:53:46 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-07-25 16:53:46 +0200
commit205861936ca55357beea6a8af7c0c9ed5a61f484 (patch)
tree2c9711c256013ba0b6911e6c5f05a79cd549172d /helpers/action.py
parent9c4f705fc6e8ef19973c1977ae8a5b9982cf6ecc (diff)
downloadMusicSampler-205861936ca55357beea6a8af7c0c9ed5a61f484.tar.gz
MusicSampler-205861936ca55357beea6a8af7c0c9ed5a61f484.tar.zst
MusicSampler-205861936ca55357beea6a8af7c0c9ed5a61f484.zip
Reorder MusicFile methods
Diffstat (limited to 'helpers/action.py')
-rw-r--r--helpers/action.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/helpers/action.py b/helpers/action.py
index 99cd399..ec8fcb6 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -30,7 +30,7 @@ class Action:
30 30
31 def ready(self): 31 def ready(self):
32 if 'music' in self.arguments: 32 if 'music' in self.arguments:
33 return self.arguments['music'].check_is_loaded() 33 return self.arguments['music'].is_loaded(allow_substates=True)
34 else: 34 else:
35 return True 35 return True
36 36
@@ -71,14 +71,14 @@ class Action:
71 loop=0, **kwargs): 71 loop=0, **kwargs):
72 for music in self.music_list(music): 72 for music in self.music_list(music):
73 if restart_if_running: 73 if restart_if_running:
74 if music.is_not_stopped(): 74 if music.is_in_use():
75 music.stop() 75 music.stop()
76 music.play( 76 music.play(
77 volume=volume, 77 volume=volume,
78 fade_in=fade_in, 78 fade_in=fade_in,
79 start_at=start_at, 79 start_at=start_at,
80 loop=loop) 80 loop=loop)
81 elif not music.is_not_stopped(): 81 elif not music.is_in_use():
82 music.play( 82 music.play(
83 volume=volume, 83 volume=volume,
84 fade_in=fade_in, 84 fade_in=fade_in,