X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmapping.py;h=dd512466cd8c7d81379659ce2c62c68ffc392ba1;hb=9b9dd12a0253f2e65c5934068d91b544f7679f12;hp=4a1cd980e67546395267044206e0ca415090afe1;hpb=4b2d79ca27dcbb85465829595ad81cec5fc63983;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/mapping.py b/helpers/mapping.py
index 4a1cd98..dd51246 100644
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -1,16 +1,20 @@
 from kivy.uix.relativelayout import RelativeLayout
-from kivy.properties import NumericProperty
+from kivy.properties import NumericProperty, ListProperty
 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
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
+    ready_color = ListProperty([1, 165/255, 0, 1])
 
     def __init__(self, **kwargs):
         self.key_config, self.channel_number, self.open_files = self.parse_config()
@@ -18,6 +22,7 @@ class Mapping(RelativeLayout):
         self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
         self._keyboard.bind(on_key_down=self._on_keyboard_down)
         self.running = []
+        Clock.schedule_interval(self.not_all_keys_ready, 1)
 
 
         pygame.mixer.init(frequency = 44100)
@@ -29,8 +34,16 @@ class Mapping(RelativeLayout):
 
     def _on_keyboard_down(self, keyboard, keycode, text, modifiers):
         key = self.find_by_key_code(keycode)
-        if key is not None:
+        if len(modifiers) == 0 and key is not None:
             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":
+                    continue
+                thread.join()
+
+            pygame.quit()
+            sys.exit()
         return True
 
     def find_by_key_code(self, key_code):
@@ -48,6 +61,15 @@ class Mapping(RelativeLayout):
                 return key
         return None
 
+    def not_all_keys_ready(self, dt):
+        for key in self.children:
+            if not type(key).__name__ == "Key":
+                continue
+            if not key.is_key_ready:
+                return True
+        self.ready_color = [0, 1, 0, 1]
+        return False
+
     def stop_all_running(self):
         self.running = []
 
@@ -62,7 +84,7 @@ 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()
 
@@ -77,9 +99,20 @@ class Mapping(RelativeLayout):
 
         for key in config['key_properties']:
             if key not in key_properties:
+                key_prop = config['key_properties'][key]
+                if 'include' in key_prop:
+                    included = key_prop['include']
+                    del(key_prop['include'])
+
+                    if isinstance(included, str):
+                        key_prop.update(aliases[included], **key_prop)
+                    else:
+                        for included_ in included:
+                            key_prop.update(aliases[included_], **key_prop)
+
                 key_properties[key] = {
                     "actions":    [],
-                    "properties": config['key_properties'][key],
+                    "properties": key_prop,
                     "files":      []
                 }