X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Faction.py;h=247e0a9c50ff765cdf73d33490a5895930575a53;hb=2ca79e96c4a2791cdce93f95225a3b7fd0176f34;hp=218c3167c934ada44a8213d22a5400d80215fe19;hpb=2e4049036ec4d90a9daeff606d821d2ac2d023ce;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/action.py b/helpers/action.py
index 218c316..247e0a9 100644
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -102,11 +102,11 @@ class Action:
     def stop_all_actions(self, **kwargs):
         self.mapping.stop_all_running()
 
-    def volume(self, music=None, value=100, delta=False, **kwargs):
+    def volume(self, music=None, value=100, fade=0, delta=False, **kwargs):
         if music is not None:
-            music.set_volume(value, delta=delta)
+            music.set_volume(value, delta=delta, fade=fade)
         else:
-            self.mapping.set_master_volume(value, delta=delta)
+            self.mapping.set_master_volume(value, delta=delta, fade=fade)
 
     def wait(self, duration=0, music=None, **kwargs):
         self.sleep_event = threading.Event()
@@ -192,22 +192,29 @@ class Action:
                 return "moving all musics to position {}s" \
                         .format(value)
 
-    def volume_print(self, music=None, value=100, delta=False, **kwargs):
+    def volume_print(self, music=None,
+            value=100, delta=False, fade=0, **kwargs):
+        message = ""
         if delta:
             if music is not None:
-                return "{:+d}% to volume of « {} »" \
+                message += "{:+d}% to volume of « {} »" \
                         .format(value, music.name)
             else:
-                return "{:+d}% to volume" \
+                message += "{:+d}% to volume" \
                         .format(value)
         else:
             if music is not None:
-                return "setting volume of « {} » to {}%" \
+                message += "setting volume of « {} » to {}%" \
                         .format(music.name, value)
             else:
-                return "setting volume to {}%" \
+                message += "setting volume to {}%" \
                         .format(value)
 
+        if fade > 0:
+            message += " with {}s fade".format(fade)
+
+        return message
+
     def wait_print(self, duration=0, music=None, **kwargs):
         if music is None:
             return "waiting {}s" \