Add actions

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

diff --git a/run.py b/run.py
index 88afaad2406eb3a9cbf8d32df3080895ffa92c82..69494d76a793de54d68e7f3d19ccdd6fc44b9b96 100644 (file)
--- a/run.py
+++ b/run.py
@@ -1,7 +1,9 @@
 import pygame
+import pydub
 import sys
 import helpers
 
+pygame.mixer.pre_init(frequency = 44100)
 pygame.init()
 
 size = width, height = 1024, 600
@@ -11,8 +13,10 @@ background = pygame.Surface(screen.get_size())
 background = background.convert()
 background.fill((250, 250, 250))
 
-for key_name in helpers.keys:
-    key = helpers.keys[key_name]
+helpers.parse_config()
+
+for key_name in helpers.Mapping.KEYS:
+    key = helpers.Mapping.KEYS[key_name]
     key.draw(background)
 
 screen.blit(background, (0, 0))
@@ -34,12 +38,12 @@ while 1:
         sys.exit()
 
     if context == 'normal':
-        if event.type == pygame.KEYDOWN and event.key in helpers.keys:
-            helpers.keys[event.key].do_actions()
+        if event.type == pygame.KEYDOWN and event.key in helpers.Mapping.KEYS:
+            helpers.Mapping.KEYS[event.key].do_actions()
         if event.type == pygame.MOUSEBUTTONUP:
-            for key in helpers.keys:
-                if helpers.keys[key].collidepoint(pygame.mouse.get_pos()): 
-                    helpers.keys[key].do_actions()
+            for key in helpers.Mapping.KEYS:
+                if helpers.Mapping.KEYS[key].collidepoint(pygame.mouse.get_pos()): 
+                    helpers.Mapping.KEYS[key].do_actions()
 
     pygame.display.flip()