aboutsummaryrefslogtreecommitdiff
path: root/music_sampler.py
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-06-18 22:13:19 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-06-18 22:13:19 +0200
commitbe27763f8be0f647cbe17ecee8c782901ce2cede (patch)
tree30e02392fa946f92755c83454f85c4572f2d4e77 /music_sampler.py
parent98fee7ff51eac3660f05aefcb18bbd9c2d32c35c (diff)
downloadMusicSampler-be27763f8be0f647cbe17ecee8c782901ce2cede.tar.gz
MusicSampler-be27763f8be0f647cbe17ecee8c782901ce2cede.tar.zst
MusicSampler-be27763f8be0f647cbe17ecee8c782901ce2cede.zip
Move classes to separate file
Diffstat (limited to 'music_sampler.py')
-rw-r--r--music_sampler.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/music_sampler.py b/music_sampler.py
index 6cc49df..9f14d56 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -10,7 +10,7 @@ size = width, height = 1024, 600
10 10
11helpers.draw_lock.acquire() 11helpers.draw_lock.acquire()
12screen = pygame.display.set_mode(size) 12screen = pygame.display.set_mode(size)
13mapping = helpers.Mapping(screen) 13mapping = helpers.Mapping(screen, helpers.draw_lock)
14 14
15action_surface = pygame.Surface((600, 250)).convert() 15action_surface = pygame.Surface((600, 250)).convert()
16action_surface.fill((0,0,0)) 16action_surface.fill((0,0,0))
@@ -38,6 +38,11 @@ while 1:
38 event.type == pygame.KEYDOWN and 38 event.type == pygame.KEYDOWN and
39 event.mod == 4160 and 39 event.mod == 4160 and
40 event.key == pygame.K_c): 40 event.key == pygame.K_c):
41 for thread in threading.enumerate():
42 if thread is threading.current_thread():
43 continue
44 thread.join()
45
41 pygame.quit() 46 pygame.quit()
42 sys.exit() 47 sys.exit()
43 48