Fix setting volume when not playing

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

diff --git a/helpers/music_file.py b/helpers/music_file.py
index aef0adce00c4f55f539b67dd07479bdae7327b7e..5f4fe764469c0b660b00754c5485b8fdd2ec798f 100644 (file)
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -70,7 +70,8 @@ class MusicFile(Machine):
         ]
 
         Machine.__init__(self, states=states,
-                transitions=transitions, initial='initial')
+                transitions=transitions, initial='initial',
+                ignore_invalid_triggers=True)
 
         self.volume = 100
         self.mapping = mapping
@@ -288,6 +289,9 @@ class MusicFile(Machine):
                 value + int(delta) * self.volume,
                 self.volume)
 
+        if not (self.is_loaded_playing() or self.is_loaded_paused()):
+            return
+
         if fade > 0:
             self.gain_effects.append(GainEffect(
                 "fade",