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

diff --git a/music_sampler.py b/music_sampler.py
index 9f14d56..d4fc2a7 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -7,23 +7,19 @@ pygame.mixer.pre_init(frequency = 44100)
 pygame.init()
 
 size = width, height = 1024, 600
-
-helpers.draw_lock.acquire()
 screen = pygame.display.set_mode(size)
-mapping = helpers.Mapping(screen, helpers.draw_lock)
+screen.fill((250, 250, 250))
+
+draw_lock = helpers.Lock("draw")
 
-action_surface = pygame.Surface((600, 250)).convert()
-action_surface.fill((0,0,0))
+mapping = helpers.Mapping(screen, draw_lock)
 helpers.parse_config(mapping)
-helpers.draw_lock.release()
 
 mapping.draw()
 
-helpers.draw_lock.acquire()
-screen.blit(action_surface, (10, 330))
-
+draw_lock.acquire()
 pygame.display.flip()
-helpers.draw_lock.release()
+draw_lock.release()
 
 contexts = [
     'normal'
@@ -31,6 +27,7 @@ contexts = [
 
 context = 'normal'
 
+#### Normal workflow ####
 while 1:
     event = pygame.event.wait()
 
@@ -39,7 +36,7 @@ while 1:
             event.mod  == 4160 and
             event.key  == pygame.K_c):
         for thread in threading.enumerate():
-            if thread is threading.current_thread():
+            if thread.getName()[0:2] != "MS":
                 continue
             thread.join()
 
@@ -50,11 +47,18 @@ while 1:
         if event.type == pygame.KEYDOWN:
             key = mapping.find_by_key_num(event.key)
             if key is not None:
-                threading.Thread(target=key.do_actions).start()
+                threading.Thread(name = "MSKeyAction", target=key.do_actions).start()
         elif event.type == pygame.MOUSEBUTTONUP:
             key = mapping.find_by_collidepoint(pygame.mouse.get_pos())
             if key is not None:
-                key.list_actions(action_surface)
+                threading.Thread(name = "MSClic", target=key.list_actions, args = [screen]).start()
 
+    draw_lock.acquire()
     pygame.display.flip()
+    draw_lock.release()
 
+#### In Ipython ####
+# for thread in threading.enumerate():
+#     if thread.getName()[0:2] != "MS":
+#         continue
+#     thread.join()