X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2F__init__.py;h=7fe9c35236806b009f4d06057c60757e25709385;hb=87f211fb622ef640249628b65d0bc8daca889f2c;hp=0e29f5dbde1717b11496460f5b9fd461df526e83;hpb=92cc4ce2e6d3372c167117c55069cad8a2e69965;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

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):
                 if argument == 'file':
                     filename = action[action_name]['file']
                     if filename not in seen_files:
-                        if 'name' in action[action_name]:
-                            seen_files[filename] = MusicFile(filename, file_lock, channel_id, name = action[action_name]['name'])
+                        if filename in config['music_properties']:
+                            seen_files[filename] = MusicFile(
+                                    filename,
+                                    file_lock,
+                                    channel_id, 
+                                    **config['music_properties'][filename])
                         else:
-                            seen_files[filename] = MusicFile(filename, file_lock, channel_id)
+                            seen_files[filename] = MusicFile(
+                                    filename,
+                                    file_lock,
+                                    channel_id)
                         channel_id = channel_id + 1
 
                     action_args['music'] = seen_files[filename]