From: Pi user <pi@njae.me.uk>
Date: Mon, 21 Oct 2013 13:02:35 +0000 (+0100)
Subject: Merged in use of dict
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;ds=sidebyside;h=a33eed607f80380ca4f5f4fe6a56e97734834963;p=pi-music.git

Merged in use of dict
---

a33eed607f80380ca4f5f4fe6a56e97734834963
diff --cc glove.py
index 942d83b,22e8cbf..b2f2075
--- a/glove.py
+++ b/glove.py
@@@ -1,23 -1,38 +1,25 @@@
  import pygame
  import RPi.GPIO as gpio
 -import logging
 -
 -logger = logging.getLogger(__name__)
 -loggerFileHandler = logging.FileHandler('glove.log')
 -loggerFileHandlerFormatter = logging.Formatter('%(asctime)s %(levelname)-8s  %(message)s')
 -loggerFileHandler.setFormatter(loggerFileHandlerFormatter)
 -logger.addHandler(loggerFileHandler)
 -logger.setLevel(logging.WARNING)
 -logger.setLevel(logging.INFO)
  
+ gpio.setmode(gpio.BCM)
+ pins = [25, 24, 18, 22]
 -# pins = [25]
+ 
  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()
 -        logger.info("Started playing {0}".format(pins.index(pin)))
      else:
-         sounds[pins.index(pin)].stop()
- 
- gpio.setmode(gpio.BCM)
- pins = [25, 24, 18, 22]
+         sounds[pin].stop()
 -        logger.info("Stopped playing {0}".format(pins.index(pin)))
  
  for pin in pins:
      gpio.setup(pin, gpio.IN)