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

diff --git a/helpers/mapping.py b/helpers/mapping.py
index 60c7691..cfc2c3f 100644
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -9,7 +9,7 @@ import sys
 
 from .music_file import *
 from .mixer import Mixer
-from . import yml_file,gain
+from . import Config, gain
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
@@ -17,6 +17,10 @@ class Mapping(RelativeLayout):
     ready_color = ListProperty([1, 165/255, 0, 1])
 
     def __init__(self, **kwargs):
+        if Config.no_mixing:
+            self.mixer = None
+        else:
+            self.mixer = Mixer()
         self.key_config, self.open_files = self.parse_config()
         super(Mapping, self).__init__(**kwargs)
         self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
@@ -24,8 +28,6 @@ class Mapping(RelativeLayout):
         self.running = []
         Clock.schedule_interval(self.not_all_keys_ready, 1)
 
-        self.mixer = Mixer()
-
     @property
     def master_gain(self):
         return gain(self.master_volume)
@@ -83,7 +85,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()