diff options
Diffstat (limited to 'helpers/mapping.py')
-rw-r--r-- | helpers/mapping.py | 23 |
1 files changed, 16 insertions, 7 deletions
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): | |||
32 | def master_gain(self): | 32 | def master_gain(self): |
33 | return gain(self.master_volume) | 33 | return gain(self.master_volume) |
34 | 34 | ||
35 | def set_master_volume(self, value, delta = False): | 35 | def set_master_volume(self, value, delta=False): |
36 | [db_gain, self.master_volume] = gain(value + int(delta) * self.master_volume, self.master_volume) | 36 | [db_gain, self.master_volume] = gain( |
37 | value + int(delta) * self.master_volume, | ||
38 | self.master_volume) | ||
39 | |||
37 | for music in self.open_files.values(): | 40 | for music in self.open_files.values(): |
38 | music.set_gain(db_gain) | 41 | music.set_gain(db_gain) |
39 | 42 | ||
@@ -44,7 +47,7 @@ class Mapping(RelativeLayout): | |||
44 | def _on_keyboard_down(self, keyboard, keycode, text, modifiers): | 47 | def _on_keyboard_down(self, keyboard, keycode, text, modifiers): |
45 | key = self.find_by_key_code(keycode) | 48 | key = self.find_by_key_code(keycode) |
46 | if len(modifiers) == 0 and key is not None: | 49 | if len(modifiers) == 0 and key is not None: |
47 | threading.Thread(name = "MSKeyAction", target=key.do_actions).start() | 50 | threading.Thread(name="MSKeyAction", target=key.do_actions).start() |
48 | elif 'ctrl' in modifiers and (keycode[0] == 113 or keycode[0] == '99'): | 51 | elif 'ctrl' in modifiers and (keycode[0] == 113 or keycode[0] == '99'): |
49 | for thread in threading.enumerate(): | 52 | for thread in threading.enumerate(): |
50 | if thread.getName()[0:2] != "MS": | 53 | if thread.getName()[0:2] != "MS": |
@@ -131,10 +134,14 @@ class Mapping(RelativeLayout): | |||
131 | del(action[action_name]['include']) | 134 | del(action[action_name]['include']) |
132 | 135 | ||
133 | if isinstance(included, str): | 136 | if isinstance(included, str): |
134 | action[action_name].update(aliases[included], **action[action_name]) | 137 | action[action_name].update( |
138 | aliases[included], | ||
139 | **action[action_name]) | ||
135 | else: | 140 | else: |
136 | for included_ in included: | 141 | for included_ in included: |
137 | action[action_name].update(aliases[included_], **action[action_name]) | 142 | action[action_name].update( |
143 | aliases[included_], | ||
144 | **action[action_name]) | ||
138 | 145 | ||
139 | for argument in action[action_name]: | 146 | for argument in action[action_name]: |
140 | if argument == 'file': | 147 | if argument == 'file': |
@@ -151,14 +158,16 @@ class Mapping(RelativeLayout): | |||
151 | filename) | 158 | filename) |
152 | 159 | ||
153 | if filename not in key_properties[mapped_key]['files']: | 160 | if filename not in key_properties[mapped_key]['files']: |
154 | key_properties[mapped_key]['files'].append(seen_files[filename]) | 161 | key_properties[mapped_key]['files'] \ |
162 | .append(seen_files[filename]) | ||
155 | 163 | ||
156 | action_args['music'] = seen_files[filename] | 164 | action_args['music'] = seen_files[filename] |
157 | 165 | ||
158 | else: | 166 | else: |
159 | action_args[argument] = action[action_name][argument] | 167 | action_args[argument] = action[action_name][argument] |
160 | 168 | ||
161 | key_properties[mapped_key]['actions'].append([action_name, action_args]) | 169 | key_properties[mapped_key]['actions'] \ |
170 | .append([action_name, action_args]) | ||
162 | 171 | ||
163 | return (key_properties, seen_files) | 172 | return (key_properties, seen_files) |
164 | 173 | ||