diff options
Diffstat (limited to 'helpers/__init__.py')
| -rw-r--r-- | helpers/__init__.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/helpers/__init__.py b/helpers/__init__.py index 0e29f5d..7fe9c35 100644 --- a/helpers/__init__.py +++ b/helpers/__init__.py | |||
| @@ -42,10 +42,17 @@ def parse_config(mapping): | |||
| 42 | if argument == 'file': | 42 | if argument == 'file': |
| 43 | filename = action[action_name]['file'] | 43 | filename = action[action_name]['file'] |
| 44 | if filename not in seen_files: | 44 | if filename not in seen_files: |
| 45 | if 'name' in action[action_name]: | 45 | if filename in config['music_properties']: |
| 46 | seen_files[filename] = MusicFile(filename, file_lock, channel_id, name = action[action_name]['name']) | 46 | seen_files[filename] = MusicFile( |
| 47 | filename, | ||
| 48 | file_lock, | ||
| 49 | channel_id, | ||
| 50 | **config['music_properties'][filename]) | ||
| 47 | else: | 51 | else: |
| 48 | seen_files[filename] = MusicFile(filename, file_lock, channel_id) | 52 | seen_files[filename] = MusicFile( |
| 53 | filename, | ||
| 54 | file_lock, | ||
| 55 | channel_id) | ||
| 49 | channel_id = channel_id + 1 | 56 | channel_id = channel_id + 1 |
| 50 | 57 | ||
| 51 | action_args['music'] = seen_files[filename] | 58 | action_args['music'] = seen_files[filename] |