X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmapping.py;h=43cacf2990a2c0f3f6d70573ce0225dcb765abb1;hb=513226699e5cb5776bd71ee6bb2ada87a43c4dee;hp=cfc2c3f7546b4dba6afa1f083aacc8ca8c515e05;hpb=af27d78259265bdada147757cd64488f44dd524d;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/mapping.py b/helpers/mapping.py
index cfc2c3f..43cacf2 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 .music_effect import GainEffect
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
@@ -17,10 +18,10 @@ class Mapping(RelativeLayout):
     ready_color = ListProperty([1, 165/255, 0, 1])
 
     def __init__(self, **kwargs):
-        if Config.no_mixing:
-            self.mixer = None
-        else:
+        if Config.builtin_mixing:
             self.mixer = Mixer()
+        else:
+            self.mixer = None
         self.key_config, self.open_files = self.parse_config()
         super(Mapping, self).__init__(**kwargs)
         self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
@@ -32,10 +33,25 @@ class Mapping(RelativeLayout):
     def master_gain(self):
         return gain(self.master_volume)
 
-    def set_master_volume(self, value, delta = False):
-        [db_gain, self.master_volume] = gain(value + int(delta) * self.master_volume, self.master_volume)
+    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 _keyboard_closed(self):
         self._keyboard.unbind(on_key_down=self._on_keyboard_down)
@@ -44,7 +60,7 @@ class Mapping(RelativeLayout):
     def _on_keyboard_down(self, keyboard, keycode, text, modifiers):
         key = self.find_by_key_code(keycode)
         if len(modifiers) == 0 and key is not None:
-            threading.Thread(name = "MSKeyAction", target=key.do_actions).start()
+            threading.Thread(name="MSKeyAction", target=key.do_actions).start()
         elif 'ctrl' in modifiers and (keycode[0] == 113 or keycode[0] == '99'):
             for thread in threading.enumerate():
                 if thread.getName()[0:2] != "MS":
@@ -86,7 +102,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']
@@ -131,10 +151,14 @@ class Mapping(RelativeLayout):
                     del(action[action_name]['include'])
 
                     if isinstance(included, str):
-                        action[action_name].update(aliases[included], **action[action_name])
+                        action[action_name].update(
+                                aliases[included],
+                                **action[action_name])
                     else:
                         for included_ in included:
-                            action[action_name].update(aliases[included_], **action[action_name])
+                            action[action_name].update(
+                                    aliases[included_],
+                                    **action[action_name])
 
                 for argument in action[action_name]:
                     if argument == 'file':
@@ -151,14 +175,16 @@ class Mapping(RelativeLayout):
                                         filename)
 
                         if filename not in key_properties[mapped_key]['files']:
-                            key_properties[mapped_key]['files'].append(seen_files[filename])
+                            key_properties[mapped_key]['files'] \
+                                    .append(seen_files[filename])
 
                         action_args['music'] = seen_files[filename]
 
                     else:
                         action_args[argument] = action[action_name][argument]
 
-                key_properties[mapped_key]['actions'].append([action_name, action_args])
+                key_properties[mapped_key]['actions'] \
+                        .append([action_name, action_args])
 
         return (key_properties, seen_files)