aboutsummaryrefslogtreecommitdiff
path: root/run.py
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-06-13 23:05:00 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-06-13 23:05:00 +0200
commit8f88a3e417d6eff7666571eccf0b6ad453c88ccd (patch)
treef67918bcb3feaa3356d45932abcd6c599db03028 /run.py
parent1df30f075c186c4c3d41d5f6014817b1b6b7b1ae (diff)
downloadMusicSampler-8f88a3e417d6eff7666571eccf0b6ad453c88ccd.tar.gz
MusicSampler-8f88a3e417d6eff7666571eccf0b6ad453c88ccd.tar.zst
MusicSampler-8f88a3e417d6eff7666571eccf0b6ad453c88ccd.zip
Add actions
Diffstat (limited to 'run.py')
-rw-r--r--run.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/run.py b/run.py
index 88afaad..69494d7 100644
--- a/run.py
+++ b/run.py
@@ -1,7 +1,9 @@
1import pygame 1import pygame
2import pydub
2import sys 3import sys
3import helpers 4import helpers
4 5
6pygame.mixer.pre_init(frequency = 44100)
5pygame.init() 7pygame.init()
6 8
7size = width, height = 1024, 600 9size = width, height = 1024, 600
@@ -11,8 +13,10 @@ background = pygame.Surface(screen.get_size())
11background = background.convert() 13background = background.convert()
12background.fill((250, 250, 250)) 14background.fill((250, 250, 250))
13 15
14for key_name in helpers.keys: 16helpers.parse_config()
15 key = helpers.keys[key_name] 17
18for key_name in helpers.Mapping.KEYS:
19 key = helpers.Mapping.KEYS[key_name]
16 key.draw(background) 20 key.draw(background)
17 21
18screen.blit(background, (0, 0)) 22screen.blit(background, (0, 0))
@@ -34,12 +38,12 @@ while 1:
34 sys.exit() 38 sys.exit()
35 39
36 if context == 'normal': 40 if context == 'normal':
37 if event.type == pygame.KEYDOWN and event.key in helpers.keys: 41 if event.type == pygame.KEYDOWN and event.key in helpers.Mapping.KEYS:
38 helpers.keys[event.key].do_actions() 42 helpers.Mapping.KEYS[event.key].do_actions()
39 if event.type == pygame.MOUSEBUTTONUP: 43 if event.type == pygame.MOUSEBUTTONUP:
40 for key in helpers.keys: 44 for key in helpers.Mapping.KEYS:
41 if helpers.keys[key].collidepoint(pygame.mouse.get_pos()): 45 if helpers.Mapping.KEYS[key].collidepoint(pygame.mouse.get_pos()):
42 helpers.keys[key].do_actions() 46 helpers.Mapping.KEYS[key].do_actions()
43 47
44 pygame.display.flip() 48 pygame.display.flip()
45 49