Cleanup fonts

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

diff --git a/helpers/__init__.py b/helpers/__init__.py
index b7acbf55ee89683d447daee097d4bc78effb0d5b..0e29f5dbde1717b11496460f5b9fd461df526e83 100644 (file)
--- a/helpers/__init__.py
+++ b/helpers/__init__.py
@@ -2,6 +2,7 @@
 from .music_file import *
 from .mapping import *
 from .lock import *
+from .font import *
 import yaml
 
 def parse_config(mapping):
@@ -14,6 +15,8 @@ def parse_config(mapping):
 
     file_lock = Lock("file")
 
+    channel_id = 0
+
     for mapped_key in config['keys']:
         key = mapping.find_by_unicode(mapped_key)
         if key is None:
@@ -39,7 +42,11 @@ 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)
+                        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]
 
@@ -57,3 +64,6 @@ def parse_config(mapping):
             key.set_description(config['key_properties'][key_property]['description'])
         if 'color' in config['key_properties'][key_property]:
             key.set_color(config['key_properties'][key_property]['color'])
+
+    # Return the number of channels reserved
+    return (channel_id + 1, seen_files)