X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/1ccd4f7141e49707ec82ef1fc39904951250d05c..8a654eb43381bf77f3bade5a228809c90217d291:/src/minwii/app.py?ds=sidebyside

diff --git a/src/minwii/app.py b/src/minwii/app.py
index 2ac1d72..c56700a 100755
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -50,6 +50,7 @@ class MinWii(object):
         self.initWiimotes()
         self.firstSong = True
         self.screen = SCREEN_HOME
+        self.playingScreen = None
     
     def initWiimotes(self) :
         if self.wiimoteSupport :
@@ -58,7 +59,7 @@ class MinWii(object):
             global pygame_wiimouse
             from pywiiuse import pygame_wiimouse
             from minwii.config import IR_POSITION
-            pygame_wiimouse.init(2, 5, self.screenResolution, IR_POSITION) # look for 4, wait 5 seconds
+            pygame_wiimouse.init(5, 5, self.screenResolution, IR_POSITION) # look for 5, wait 5 seconds
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT
@@ -84,6 +85,10 @@ class MinWii(object):
                     self.synth.inc_gain()
                 elif wiiuse.is_just_pressed(wm, wiiuse.button['-']) :
                     self.synth.dec_gain()
+                elif wiiuse.is_just_pressed(wm, wiiuse.button['1']) and self.playingScreen :
+                    self.playingScreen.tempoTrimUp()
+                elif wiiuse.is_just_pressed(wm, wiiuse.button['2']) and self.playingScreen :
+                    self.playingScreen.tempoTrimDown()
 
         elif self.screen in (SCREEN_HOME, SCREEN_INSTRUMENTS) :
             pygame_wiimouse._full_mouse_event_cb(wt, id, wmp)
@@ -190,10 +195,11 @@ class MinWii(object):
             playingScreen = PlayingScreen(self.synth)
         else :
             song = musicXml2Song(songFile)
-            playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)
+            self.playingScreen = playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)
         playingScreen.run()
         pygame.event.clear()
         EventDispatcher.reset()
+        self.playingScreen = None
 
 
 class _WTFacade :