Added music name, currently playing musics, pause/unpause

[perso/Immae/Projets/Python/MusicSampler.git] / helpers / __init__.py

diff --git a/helpers/__init__.py b/helpers/__init__.py
index d0d3f46f5588d92677ecd7bc3e4a072fc103a9b3..b3ab1eba61d302a2cd249fd17c39fd4754a2c323 100644 (file)
--- 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)