Invert no_mixing flag

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

diff --git a/helpers/mapping.py b/helpers/mapping.py
index ea9d0757b0244eef6f9ef2f6d949b02790424d37..bc8ccba3a84721e83d6ce96c7b27c668314b57d7 100644 (file)
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -8,13 +8,19 @@ import yaml
 import sys
 
 from .music_file import *
-from . import yml_file
+from .mixer import Mixer
+from . import Config, gain
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
+    master_volume = NumericProperty(100)
     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)
@@ -22,6 +28,14 @@ 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, 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)
 
     def _keyboard_closed(self):
         self._keyboard.unbind(on_key_down=self._on_keyboard_down)
@@ -45,16 +59,6 @@ class Mapping(RelativeLayout):
             return self.ids["Key_" + str(key_code[0])]
         return None
 
-    def find_by_unicode(self, key_sym):
-        for key in self.children:
-            if not type(key).__name__ == "Key":
-                continue
-            print(key.key_sym, key_sym)
-            if key.key_sym == key_sym:
-                print("found")
-                return key
-        return None
-
     def not_all_keys_ready(self, dt):
         for key in self.children:
             if not type(key).__name__ == "Key":
@@ -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()
 
@@ -139,9 +143,11 @@ class Mapping(RelativeLayout):
                             if filename in config['music_properties']:
                                 seen_files[filename] = MusicFile(
                                         filename,
+                                        self,
                                         **config['music_properties'][filename])
                             else:
                                 seen_files[filename] = MusicFile(
+                                        self,
                                         filename)
 
                         if filename not in key_properties[mapped_key]['files']: