X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmapping.py;h=0c81af4666fd175058108a3b51975a34f16cf66c;hb=3aaddc9de62202a04ed84b3bf53e7ecab92ebf0d;hp=19fc3c5f2140ec9ba64feac2984b97d720e9f05b;hpb=6c44b2313c8c115ee05ffe9106ccd8517ec5c66b;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/mapping.py b/helpers/mapping.py
index 19fc3c5..0c81af4 100644
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -10,6 +10,8 @@ import sys
 from .music_file import *
 from .mixer import Mixer
 from . import Config, gain, error_print
+from .music_effect import GainEffect
+from .action import Action
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
@@ -26,19 +28,44 @@ class Mapping(RelativeLayout):
         self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
         self._keyboard.bind(on_key_down=self._on_keyboard_down)
         self.running = []
+        self.wait_ids = {}
         Clock.schedule_interval(self.not_all_keys_ready, 1)
 
     @property
     def master_gain(self):
         return gain(self.master_volume)
 
-    def set_master_volume(self, value, delta=False):
+    def set_master_volume(self, value, delta=False, fade=0):
         [db_gain, self.master_volume] = gain(
                 value + int(delta) * self.master_volume,
                 self.master_volume)
 
         for music in self.open_files.values():
-            music.set_gain(db_gain)
+            if not (music.is_loaded_playing() or music.is_loaded_paused()):
+                continue
+
+            if fade > 0:
+                music.gain_effects.append(GainEffect(
+                    "fade",
+                    music.current_audio_segment,
+                    music.current_loop,
+                    music.sound_position,
+                    music.sound_position + fade,
+                    gain=db_gain))
+            else:
+                music.set_gain(db_gain)
+
+    def add_wait_id(self, wait_id, action_or_wait):
+        self.wait_ids[wait_id] = action_or_wait
+
+    def interrupt_wait(self, wait_id):
+        if wait_id in self.wait_ids:
+            action_or_wait = self.wait_ids[wait_id]
+            del(self.wait_ids[wait_id])
+            if isinstance(action_or_wait, Action):
+                action_or_wait.interrupt()
+            else:
+                action_or_wait.set()
 
     def _keyboard_closed(self):
         self._keyboard.unbind(on_key_down=self._on_keyboard_down)
@@ -91,7 +118,7 @@ class Mapping(RelativeLayout):
         stream = open(Config.yml_file, "r")
         try:
             config = yaml.load(stream)
-        except yaml.scanner.ScannerError as e:
+        except Exception as e:
             error_print("Error while loading config file: {}".format(e))
             sys.exit()
         stream.close()