wait actions are now pausable and resettable

[perso/Immae/Projets/Python/MusicSampler.git] / config.yml

diff --git a/config.yml b/config.yml
index 37e085a87573c78a254df1c7a87213f97234ed33..36c804b01cddca59a820a7e3b6dc5c93817b3918 100644 (file)
--- a/config.yml
+++ b/config.yml
@@ -75,6 +75,8 @@ music_properties:
 key_properties:
   'common':
     repeat_delay: 1
+    include: blue
+
   'a':
     description:
       -  
@@ -145,6 +147,11 @@ key_properties:
       - Low vol
       - Up vol
     include: green
+  'ù':
+    description:
+      - 
+      - stop
+      - wait
 
   'home':
     description:
@@ -160,18 +167,21 @@ key_properties:
       - "!"
       - STOP!
     include: red
+    repeat_delay: 0
 
   'F5':
     description:
       - "||"
       - PAUSE
     include: light_green
+    repeat_delay: 0
 
   'F6':
     description:
       - ">"
       - UNPAUSE
     include: light_green
+    repeat_delay: 0
 
   'F1':
     description:
@@ -179,6 +189,7 @@ key_properties:
       - Stop
       - fade
     include: orange
+    repeat_delay: 0
 
   'F2':
     description:
@@ -186,6 +197,7 @@ key_properties:
       - Stop
       - actions
     include: orange
+    repeat_delay: 0
 
   'F4':
     description:
@@ -193,30 +205,51 @@ key_properties:
       - Skip
       - wait
     include: pink
+    repeat_delay: 0
+
+  'F8':
+    description:
+      - 
+      - Pause
+      - wait
+  'F9':
+    description:
+      - 
+      - Unpause
+      - wait
+  'F10':
+    description:
+      - 
+      - Reset
+      - wait
 
   'F12':
     description:
       - 
       - vol+
     include: yellow
+    repeat_delay: 0
 
   'F11':
     description:
       - 
       - "vol-"
     include: yellow
+    repeat_delay: 0
 
   'right':
     description:
       - 
       - +10s
     include: blue
+    repeat_delay: 0
 
   'left':
     description:
       - 
       - -10s
     include: blue
+    repeat_delay: 0
 
 #################################################################
 ##### Keys: what do the key actually do when you press them #####
@@ -246,10 +279,8 @@ keys:
     - stop: 
         fade_out: 3
         wait: true
-        set_wait_id: y1
     - wait:
         duration: 3
-        set_wait_id: y2
     - play: 
         include: music2
 
@@ -263,7 +294,6 @@ keys:
         include: music1
     - wait:
         duration: 3
-        set_wait_id: u
     - play: 
         include: music2
 
@@ -274,7 +304,6 @@ keys:
         start_at: 30
     - wait: 
         duration: 5
-        set_wait_id: g
     - seek:
         include: music1
         delta: false
@@ -293,6 +322,11 @@ keys:
     - play:
         include: music2
 
+# skip waiting for the end of music1
+  'ù':
+    - interrupt_wait:
+        wait_id: m
+
 # Lowers the volume of music 1 and 2 (if playing), during the duration of noise + 1 second
   'i':
     - volume:
@@ -306,7 +340,6 @@ keys:
     - wait:
         include: noise
         duration: 1
-        set_wait_id: i
     - volume:
         include: music1
         value: 100
@@ -328,7 +361,6 @@ keys:
         fade: 5
     - wait:
         duration: 5
-        set_wait_id: n
     - volume:
         include: music1
         value: 100
@@ -381,20 +413,15 @@ keys:
 # Skip wait
   'F4':
     - interrupt_wait:
-        wait_id: n
-    - interrupt_wait:
-        wait_id: m
-    - interrupt_wait:
-        wait_id: i
-    - interrupt_wait:
-        wait_id: y1
-    - interrupt_wait:
-        wait_id: y2
-    - interrupt_wait:
-        wait_id: u
-    - interrupt_wait:
-        wait_id: g
 
+  'F8':
+    - pause_wait:
+
+  'F9':
+    - unpause_wait:
+
+  'F10':
+    - reset_wait:
 
 # Changing volume
   'F12':