Fix channels and description with blank lines

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

diff --git a/music_sampler.py b/music_sampler.py
index 6cc49dff4884a7f0391f796ddd097321afe146b0..8dbbc28de8e35a9e10e3ba08f08a1a2a96a89c1c 100644 (file)
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -7,23 +7,20 @@ 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)
+screen.fill((250, 250, 250))
 
-action_surface = pygame.Surface((600, 250)).convert()
-action_surface.fill((0,0,0))
-helpers.parse_config(mapping)
-helpers.draw_lock.release()
+draw_lock = helpers.Lock("draw")
 
-mapping.draw()
+mapping = helpers.Mapping(screen, draw_lock)
+channel_number = helpers.parse_config(mapping)
+pygame.mixer.set_num_channels(channel_number)
 
-helpers.draw_lock.acquire()
-screen.blit(action_surface, (10, 330))
+mapping.draw()
 
+draw_lock.acquire()
 pygame.display.flip()
-helpers.draw_lock.release()
+draw_lock.release()
 
 contexts = [
     'normal'
@@ -31,6 +28,7 @@ contexts = [
 
 context = 'normal'
 
+#### Normal workflow ####
 while 1:
     event = pygame.event.wait()
 
@@ -38,6 +36,11 @@ while 1:
             event.type == pygame.KEYDOWN and 
             event.mod  == 4160 and
             event.key  == pygame.K_c):
+        for thread in threading.enumerate():
+            if thread.getName()[0:2] != "MS":
+                continue
+            thread.join()
+
         pygame.quit()
         sys.exit()
 
@@ -45,11 +48,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()