documentation: added new features + aliases + 'misc' section

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

diff --git a/helpers/mapping.py b/helpers/mapping.py
index 3622f9d8d42086369d59702cf45e6e3cd03fa9d5..0c81af4666fd175058108a3b51975a34f16cf66c 100644 (file)
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -11,6 +11,7 @@ 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)
@@ -27,6 +28,7 @@ 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
@@ -39,6 +41,9 @@ class Mapping(RelativeLayout):
                 self.master_volume)
 
         for music in self.open_files.values():
+            if not (music.is_loaded_playing() or music.is_loaded_paused()):
+                continue
+
             if fade > 0:
                 music.gain_effects.append(GainEffect(
                     "fade",
@@ -50,6 +55,18 @@ class Mapping(RelativeLayout):
             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)
         self._keyboard = None