X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fkey.py;h=b5c1af95a3901a0a1e095506f4538f52399775c9;hb=62a8b07a2264101fd6d9c201267966e3c5de0cd4;hp=c21f9ae2a0bf8ffa60f927e5646a6f65528c8b50;hpb=b17aed6aba689f484a4932d99b30aff1bdee7176;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/key.py b/helpers/key.py
index c21f9ae..b5c1af9 100644
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -6,6 +6,7 @@ from kivy.uix.behaviors import ButtonBehavior
 from .action import Action
 from . import debug_print
 import time
+import threading
 from transitions.extensions import HierarchicalMachine as Machine
 
 class Key(ButtonBehavior, Widget):
@@ -17,7 +18,12 @@ class Key(ButtonBehavior, Widget):
         'failed',
         {
             'name': 'loaded',
-            'children': ['no_config', 'no_actions', 'running']
+            'children': [
+                'no_config',
+                'no_actions',
+                'running',
+                'protecting_repeat'
+            ]
         }
     ]
 
@@ -79,15 +85,20 @@ class Key(ButtonBehavior, Widget):
             'source': 'loaded',
             'dest': 'loaded_running',
             'after': ['run_actions', 'finish'],
-            # if a child, like loaded_no_actions, has no transitions, then it is
-            # bubbled to the parent, and we don't want that.
+            # if a child, like loaded_no_actions, has no transitions, then it
+            # is bubbled to the parent, and we don't want that.
             'conditions': ['is_loaded']
         },
         {
             'trigger': 'finish',
             'source': 'loaded_running',
+            'dest': 'loaded_protecting_repeat'
+        },
+        {
+            'trigger': 'repeat_protection_finished',
+            'source': 'loaded_protecting_repeat',
             'dest': 'loaded'
-        }
+        },
     ]
 
     key_sym = StringProperty(None)
@@ -111,6 +122,8 @@ class Key(ButtonBehavior, Widget):
     def get_alias_color(self):
         if self.is_loaded_inactive():
             return [1, 1, 1, 1]
+        elif self.is_loaded_protecting_repeat():
+            return [*self.custom_color, 100/255]
         elif self.is_loaded(allow_substates=True):
             return [*self.custom_color, 1]
         elif self.is_failed():
@@ -178,11 +191,20 @@ class Key(ButtonBehavior, Widget):
         for self.current_action in self.actions:
             if self.parent.keep_running(self, start_time):
                 self.list_actions()
-                self.current_action.run()
+                self.current_action.run(start_time)
         self.list_actions(last_action_finished=True)
 
         self.parent.finished_running(self, start_time)
 
+    def on_enter_loaded_protecting_repeat(self, modifiers):
+        if 'repeat_delay' in self.config['properties']:
+            self.protecting_repeat_timer = threading.Timer(
+                    self.config['properties']['repeat_delay'],
+                    self.repeat_protection_finished)
+            self.protecting_repeat_timer.start()
+        else:
+            self.repeat_protection_finished()
+
     # This one cannot be in the Machine state since it would be queued to run
     # *after* the loop is ended...
     def interrupt(self):