From e7f8dab4980d8a477f305e3565ca3c80abd7d790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 18 Jun 2016 00:29:15 +0200 Subject: Modifications to mapping/keys --- music_sampler.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'music_sampler.py') diff --git a/music_sampler.py b/music_sampler.py index 7933d50..6cc49df 100644 --- 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) -- cgit v1.2.3