X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmapping.py;h=858fe77354fa483b857f77428d2735d501e67d42;hb=2e4049036ec4d90a9daeff606d821d2ac2d023ce;hp=4a1cd980e67546395267044206e0ca415090afe1;hpb=4b2d79ca27dcbb85465829595ad81cec5fc63983;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git diff --git a/helpers/mapping.py b/helpers/mapping.py index 4a1cd98..858fe77 100644 --- a/helpers/mapping.py +++ b/helpers/mapping.py @@ -1,27 +1,44 @@ 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 .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): - self.key_config, self.channel_number, self.open_files = self.parse_config() + 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) self._keyboard.bind(on_key_down=self._on_keyboard_down) self.running = [] + Clock.schedule_interval(self.not_all_keys_ready, 1) + @property + def master_gain(self): + return gain(self.master_volume) - pygame.mixer.init(frequency = 44100) - pygame.mixer.set_num_channels(self.channel_number) + 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) @@ -29,8 +46,15 @@ class Mapping(RelativeLayout): def _on_keyboard_down(self, keyboard, keycode, text, modifiers): key = self.find_by_key_code(keycode) - if key is not None: - threading.Thread(name = "MSKeyAction", target=key.do_actions).start() + 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() + + sys.exit() return True def find_by_key_code(self, key_code): @@ -38,18 +62,20 @@ class Mapping(RelativeLayout): return self.ids["Key_" + str(key_code[0])] return None - def find_by_unicode(self, key_sym): + def not_all_keys_ready(self, dt): 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 + if not key.is_key_ready: + return True + self.ready_color = [0, 1, 0, 1] + 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)) @@ -62,24 +88,31 @@ class Mapping(RelativeLayout): self.running.remove((key, start_time)) def parse_config(self): - stream = open("config.yml", "r") + stream = open(Config.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']: 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": [] } @@ -101,10 +134,14 @@ class Mapping(RelativeLayout): del(action[action_name]['include']) if isinstance(included, str): - action[action_name].update(aliases[included], **action[action_name]) + action[action_name].update( + aliases[included], + **action[action_name]) else: for included_ in included: - action[action_name].update(aliases[included_], **action[action_name]) + action[action_name].update( + aliases[included_], + **action[action_name]) for argument in action[action_name]: if argument == 'file': @@ -113,26 +150,25 @@ 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]) + key_properties[mapped_key]['files'] \ + .append(seen_files[filename]) action_args['music'] = seen_files[filename] else: action_args[argument] = action[action_name][argument] - key_properties[mapped_key]['actions'].append([action_name, action_args]) + key_properties[mapped_key]['actions'] \ + .append([action_name, action_args]) - return (key_properties, channel_id + 1, seen_files) + return (key_properties, seen_files)