Some new features:

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

diff --git a/helpers/mapping.py b/helpers/mapping.py
index e800778f9ad0f5d9fee7b3a5a0fe85cdd992808f..d9b7ba0e242d50bab6271a0964e622638b3db803 100644 (file)
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -4,19 +4,19 @@ from kivy.core.window import Window
 from kivy.clock import Clock
 
 import threading
-import pygame
 import yaml
 import sys
 
-from .lock import *
 from .music_file import *
+from . import yml_file,gain
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
+    master_volume = NumericProperty(100)
     ready_color = ListProperty([1, 165/255, 0, 1])
 
     def __init__(self, **kwargs):
-        self.key_config, self.channel_number, self.open_files = self.parse_config()
+        self.key_config, self.open_files = self.parse_config()
         super(Mapping, self).__init__(**kwargs)
         self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
         self._keyboard.bind(on_key_down=self._on_keyboard_down)
@@ -24,8 +24,14 @@ class Mapping(RelativeLayout):
         Clock.schedule_interval(self.not_all_keys_ready, 1)
 
 
-        pygame.mixer.init(frequency = 44100)
-        pygame.mixer.set_num_channels(self.channel_number)
+    @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)
+        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)
@@ -41,7 +47,6 @@ class Mapping(RelativeLayout):
                     continue
                 thread.join()
 
-            pygame.quit()
             sys.exit()
         return True
 
@@ -50,16 +55,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":
@@ -70,7 +65,10 @@ class Mapping(RelativeLayout):
         return False
 
     def stop_all_running(self):
+        running = self.running
         self.running = []
+        for (key, start_time) in running:
+            key.interrupt_action()
 
     def start_running(self, key, start_time):
         self.running.append((key, start_time))
@@ -83,17 +81,13 @@ class Mapping(RelativeLayout):
             self.running.remove((key, start_time))
 
     def parse_config(self):
-        stream = open("config.yml", "r")
+        stream = open(yml_file(), "r")
         config = yaml.load(stream)
         stream.close()
 
         aliases = config['aliases']
         seen_files = {}
 
-        file_lock = Lock("file")
-
-        channel_id = 0
-
         key_properties = {}
 
         for key in config['key_properties']:
@@ -145,15 +139,12 @@ class Mapping(RelativeLayout):
                             if filename in config['music_properties']:
                                 seen_files[filename] = MusicFile(
                                         filename,
-                                        file_lock,
-                                        channel_id,
+                                        self,
                                         **config['music_properties'][filename])
                             else:
                                 seen_files[filename] = MusicFile(
-                                        filename,
-                                        file_lock,
-                                        channel_id)
-                            channel_id = channel_id + 1
+                                        self,
+                                        filename)
 
                         if filename not in key_properties[mapped_key]['files']:
                             key_properties[mapped_key]['files'].append(seen_files[filename])
@@ -165,6 +156,6 @@ class Mapping(RelativeLayout):
 
                 key_properties[mapped_key]['actions'].append([action_name, action_args])
 
-        return (key_properties, channel_id + 1, seen_files)
+        return (key_properties, seen_files)