X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler.py;h=9f14d561fe127c419f4b0955f5f05ad78ee1b1ca;hb=be27763f8be0f647cbe17ecee8c782901ce2cede;hp=9797c918073f4baa8033f85634b9c5163efc34e9;hpb=532454ebada0ca776e8136450ed8810bc22d210b;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler.py b/music_sampler.py
index 9797c91..9f14d56 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -1,34 +1,29 @@
 import sys
-
-if getattr(sys, 'frozen', False):
-    os.chdir(sys._MEIPASS)
-
 import pygame
-import pydub
 import helpers
+import threading
 
 pygame.mixer.pre_init(frequency = 44100)
 pygame.init()
 
 size = width, height = 1024, 600
 
+helpers.draw_lock.acquire()
 screen = pygame.display.set_mode(size)
-background = pygame.Surface(screen.get_size())
-background = background.convert()
-background.fill((250, 250, 250))
+mapping = helpers.Mapping(screen, helpers.draw_lock)
 
 action_surface = pygame.Surface((600, 250)).convert()
 action_surface.fill((0,0,0))
-helpers.parse_config()
+helpers.parse_config(mapping)
+helpers.draw_lock.release()
 
-for key_name in helpers.Mapping.KEYS:
-    key = helpers.Mapping.KEYS[key_name]
-    key.draw(background)
+mapping.draw()
 
-screen.blit(background, (0, 0))
+helpers.draw_lock.acquire()
 screen.blit(action_surface, (10, 330))
 
 pygame.display.flip()
+helpers.draw_lock.release()
 
 contexts = [
     'normal'
@@ -38,20 +33,26 @@ context = 'normal'
 
 while 1:
     event = pygame.event.wait()
+
     if event.type == pygame.QUIT or (
             event.type == pygame.KEYDOWN and 
             event.mod  == 4160 and
             event.key  == pygame.K_c):
+        for thread in threading.enumerate():
+            if thread is threading.current_thread():
+                continue
+            thread.join()
+
         pygame.quit()
         sys.exit()
 
     if context == 'normal':
         if event.type == pygame.KEYDOWN:
-            key = helpers.Key.find_by_key_num(event.key)
+            key = mapping.find_by_key_num(event.key)
             if key is not None:
-                key.do_actions()
+                threading.Thread(target=key.do_actions).start()
         elif event.type == pygame.MOUSEBUTTONUP:
-            key = helpers.Key.find_by_collidepoint(pygame.mouse.get_pos())
+            key = mapping.find_by_collidepoint(pygame.mouse.get_pos())
             if key is not None:
                 key.list_actions(action_surface)