X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=glove.py;h=b2f2075aedd0221278856edaad8e1856933b97d1;hb=48acea5a554a1cdb9b99f0927c4e6893fc303cfc;hp=942d83bb0b1b7bfb0e3fd65bed58cbf284f5cddc;hpb=6470db67887388e51816186ccd08c5ed232b8417;p=pi-music.git

diff --git a/glove.py b/glove.py
index 942d83b..b2f2075 100644
--- a/glove.py
+++ b/glove.py
@@ -1,23 +1,25 @@
 import pygame
 import RPi.GPIO as gpio
 
+gpio.setmode(gpio.BCM)
+pins = [25, 24, 18, 22]
+
 guitars = ['sounds/guitar1.wav',
            'sounds/guitar2.wav',
            'sounds/guitar3.wav',
-           'sounds/guitar4.wav',
-           'sounds/guitar5.wav']
+           'sounds/guitar4.wav']
 
 pygame.mixer.init()
-sounds = [pygame.mixer.Sound(g) for g in guitars]
+
+sounds = {}
+for pin, wav in zip(pins, guitars):
+    sounds[pin] = pygame.mixer.Sound(wav)
 
 def handle_sound(pin):
     if not gpio.input(pin):
-        sounds[pins.index(pin)].play()
+        sounds[pin].play()
     else:
-        sounds[pins.index(pin)].stop()
-
-gpio.setmode(gpio.BCM)
-pins = [25, 24, 18, 22]
+        sounds[pin].stop()
 
 for pin in pins:
     gpio.setup(pin, gpio.IN)