X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git;a=blobdiff_plain;f=helpers%2Fmapping.py;h=c2a94e67baa52f3bfe4b06eccb78d88741805789;hp=858fe77354fa483b857f77428d2735d501e67d42;hb=205861936ca55357beea6a8af7c0c9ed5a61f484;hpb=2e4049036ec4d90a9daeff606d821d2ac2d023ce

diff --git a/helpers/mapping.py b/helpers/mapping.py
index 858fe77..c2a94e6 100644
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -9,7 +9,8 @@ import sys
 
 from .music_file import *
 from .mixer import Mixer
-from . import Config, gain
+from . import Config, gain, error_print
+from .action import Action
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
@@ -21,24 +22,43 @@ class Mapping(RelativeLayout):
             self.mixer = Mixer()
         else:
             self.mixer = None
-        self.key_config, self.open_files = self.parse_config()
+
+        try:
+            self.key_config, self.open_files = self.parse_config()
+        except Exception as e:
+            error_print("Error while loading configuration: {}".format(e))
+            sys.exit()
+
         super(Mapping, self).__init__(**kwargs)
         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)
+            music.set_gain_with_effect(db_gain, fade=fade)
+
+    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)
@@ -89,7 +109,11 @@ class Mapping(RelativeLayout):
 
     def parse_config(self):
         stream = open(Config.yml_file, "r")
-        config = yaml.load(stream)
+        try:
+            config = yaml.load(stream)
+        except Exception as e:
+            error_print("Error while loading config file: {}".format(e))
+            sys.exit()
         stream.close()
 
         aliases = config['aliases']