X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fmapping.py;h=95c9d670a26488684d9d803b8b8b3c66d736eba7;hb=29597680758e4924aa71fc021465189e153f2016;hp=dd512466cd8c7d81379659ce2c62c68ffc392ba1;hpb=9b9dd12a0253f2e65c5934068d91b544f7679f12;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/mapping.py b/helpers/mapping.py
index dd51246..95c9d67 100644
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -4,11 +4,9 @@ from kivy.core.window import Window
 from kivy.clock import Clock
 
 import threading
-import pygame
 import yaml
 import sys
 
-from .lock import *
 from .music_file import *
 from . import yml_file
 
@@ -17,7 +15,7 @@ class Mapping(RelativeLayout):
     ready_color = ListProperty([1, 165/255, 0, 1])
 
     def __init__(self, **kwargs):
-        self.key_config, self.channel_number, self.open_files = self.parse_config()
+        self.key_config, self.open_files = self.parse_config()
         super(Mapping, self).__init__(**kwargs)
         self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
         self._keyboard.bind(on_key_down=self._on_keyboard_down)
@@ -25,9 +23,6 @@ class Mapping(RelativeLayout):
         Clock.schedule_interval(self.not_all_keys_ready, 1)
 
 
-        pygame.mixer.init(frequency = 44100)
-        pygame.mixer.set_num_channels(self.channel_number)
-
     def _keyboard_closed(self):
         self._keyboard.unbind(on_key_down=self._on_keyboard_down)
         self._keyboard = None
@@ -42,7 +37,6 @@ class Mapping(RelativeLayout):
                     continue
                 thread.join()
 
-            pygame.quit()
             sys.exit()
         return True
 
@@ -91,10 +85,6 @@ class Mapping(RelativeLayout):
         aliases = config['aliases']
         seen_files = {}
 
-        file_lock = Lock("file")
-
-        channel_id = 0
-
         key_properties = {}
 
         for key in config['key_properties']:
@@ -146,15 +136,10 @@ class Mapping(RelativeLayout):
                             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)
-                            channel_id = channel_id + 1
+                                        filename)
 
                         if filename not in key_properties[mapped_key]['files']:
                             key_properties[mapped_key]['files'].append(seen_files[filename])
@@ -166,6 +151,6 @@ class Mapping(RelativeLayout):
 
                 key_properties[mapped_key]['actions'].append([action_name, action_args])
 
-        return (key_properties, channel_id + 1, seen_files)
+        return (key_properties, seen_files)