X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git;a=blobdiff_plain;f=helpers%2Fmapping.py;h=858fe77354fa483b857f77428d2735d501e67d42;hp=bc8ccba3a84721e83d6ce96c7b27c668314b57d7;hb=2e4049036ec4d90a9daeff606d821d2ac2d023ce;hpb=ccda4cb91686d4c2b70f0c26d21c26ac3d03c3b9 diff --git a/helpers/mapping.py b/helpers/mapping.py index bc8ccba..858fe77 100644 --- a/helpers/mapping.py +++ b/helpers/mapping.py @@ -32,8 +32,11 @@ class Mapping(RelativeLayout): 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) + 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) @@ -44,7 +47,7 @@ class Mapping(RelativeLayout): def _on_keyboard_down(self, keyboard, keycode, text, modifiers): key = self.find_by_key_code(keycode) if len(modifiers) == 0 and key is not None: - threading.Thread(name = "MSKeyAction", target=key.do_actions).start() + 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": @@ -131,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': @@ -151,14 +158,16 @@ class Mapping(RelativeLayout): 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, seen_files)