Modifications to mapping/keys

[perso/Immae/Projets/Python/MusicSampler.git] / music_sampler.py

diff --git a/music_sampler.py b/music_sampler.py
index 7933d50acfb1f701bf00acbab5a9c0af4057b413..6cc49dff4884a7f0391f796ddd097321afe146b0 100644 (file)
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -1,30 +1,29 @@
 import sys
 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)
 
 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'
@@ -34,6 +33,7 @@ context = 'normal'
 
 while 1:
     event = pygame.event.wait()
+
     if event.type == pygame.QUIT or (
             event.type == pygame.KEYDOWN and 
             event.mod  == 4160 and
@@ -43,11 +43,11 @@ while 1:
 
     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)