X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmapping.py;h=bc8ccba3a84721e83d6ce96c7b27c668314b57d7;hb=d6290f14246b69e10a73e2798dd3905e866b3e88;hp=d9b7ba0e242d50bab6271a0964e622638b3db803;hpb=1b4b78f5b6df7182ac066fcc26a7b4f0e8586a47;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/mapping.py b/helpers/mapping.py
index d9b7ba0..bc8ccba 100644
--- 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,12 @@ 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)
 
@@ -81,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()