Coding styles

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

diff --git a/helpers/mapping.py b/helpers/mapping.py
index d9b7ba0e242d50bab6271a0964e622638b3db803..858fe77354fa483b857f77428d2735d501e67d42 100644 (file)
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -8,7 +8,8 @@ import yaml
 import sys
 
 from .music_file import *
-from . import yml_file,gain
+from .mixer import Mixer
+from . import Config, gain
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
@@ -16,6 +17,10 @@ class Mapping(RelativeLayout):
     ready_color = ListProperty([1, 165/255, 0, 1])
 
     def __init__(self, **kwargs):
+        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)
@@ -23,13 +28,15 @@ class Mapping(RelativeLayout):
         self.running = []
         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, add = False):
-        [db_gain, self.master_volume] = gain(value + int(add) * self.master_volume, 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)
+
         for music in self.open_files.values():
             music.set_gain(db_gain)
 
@@ -40,7 +47,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":
@@ -81,7 +88,7 @@ class Mapping(RelativeLayout):
             self.running.remove((key, start_time))
 
     def parse_config(self):
-        stream = open(yml_file(), "r")
+        stream = open(Config.yml_file, "r")
         config = yaml.load(stream)
         stream.close()
 
@@ -127,10 +134,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':
@@ -147,14 +158,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)