From 9de92b6dd2bd906f6a64fce7c90a6aff0dbb27a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 20 Jun 2016 23:08:22 +0200 Subject: Added music name, currently playing musics, pause/unpause --- helpers/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'helpers/__init__.py') diff --git a/helpers/__init__.py b/helpers/__init__.py index d0d3f46..b3ab1eb 100644 --- a/helpers/__init__.py +++ b/helpers/__init__.py @@ -41,7 +41,10 @@ def parse_config(mapping): if argument == 'file': filename = action[action_name]['file'] if filename not in seen_files: - seen_files[filename] = MusicFile(filename, file_lock, channel_id) + if 'name' in action[action_name]: + seen_files[filename] = MusicFile(filename, file_lock, channel_id, name = action[action_name]['name']) + else: + seen_files[filename] = MusicFile(filename, file_lock, channel_id) channel_id = channel_id + 1 action_args['music'] = seen_files[filename] @@ -62,4 +65,4 @@ def parse_config(mapping): key.set_color(config['key_properties'][key_property]['color']) # Return the number of channels reserved - return channel_id + 1 + return (channel_id + 1, seen_files) -- cgit v1.2.3