diff options
Diffstat (limited to 'music_sampler.py')
-rw-r--r-- | music_sampler.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/music_sampler.py b/music_sampler.py index 9f14d56..fd03009 100644 --- a/music_sampler.py +++ b/music_sampler.py | |||
@@ -7,23 +7,19 @@ pygame.mixer.pre_init(frequency = 44100) | |||
7 | pygame.init() | 7 | pygame.init() |
8 | 8 | ||
9 | size = width, height = 1024, 600 | 9 | size = width, height = 1024, 600 |
10 | |||
11 | helpers.draw_lock.acquire() | ||
12 | screen = pygame.display.set_mode(size) | 10 | screen = pygame.display.set_mode(size) |
13 | mapping = helpers.Mapping(screen, helpers.draw_lock) | 11 | screen.fill((250, 250, 250)) |
12 | |||
13 | draw_lock = helpers.Lock("draw") | ||
14 | 14 | ||
15 | action_surface = pygame.Surface((600, 250)).convert() | 15 | mapping = helpers.Mapping(screen, draw_lock) |
16 | action_surface.fill((0,0,0)) | ||
17 | helpers.parse_config(mapping) | 16 | helpers.parse_config(mapping) |
18 | helpers.draw_lock.release() | ||
19 | 17 | ||
20 | mapping.draw() | 18 | mapping.draw() |
21 | 19 | ||
22 | helpers.draw_lock.acquire() | 20 | draw_lock.acquire() |
23 | screen.blit(action_surface, (10, 330)) | ||
24 | |||
25 | pygame.display.flip() | 21 | pygame.display.flip() |
26 | helpers.draw_lock.release() | 22 | draw_lock.release() |
27 | 23 | ||
28 | contexts = [ | 24 | contexts = [ |
29 | 'normal' | 25 | 'normal' |
@@ -54,7 +50,9 @@ while 1: | |||
54 | elif event.type == pygame.MOUSEBUTTONUP: | 50 | elif event.type == pygame.MOUSEBUTTONUP: |
55 | key = mapping.find_by_collidepoint(pygame.mouse.get_pos()) | 51 | key = mapping.find_by_collidepoint(pygame.mouse.get_pos()) |
56 | if key is not None: | 52 | if key is not None: |
57 | key.list_actions(action_surface) | 53 | threading.Thread(target=key.list_actions, args = [screen]).start() |
58 | 54 | ||
55 | draw_lock.acquire() | ||
59 | pygame.display.flip() | 56 | pygame.display.flip() |
57 | draw_lock.release() | ||
60 | 58 | ||