X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=config.yml;h=36c804b01cddca59a820a7e3b6dc5c93817b3918;hb=d4217fda2ff3991eb1ee9a9bec6acff751798507;hp=8802dcff7f76c0f965c1e848071d0496f8989d16;hpb=16847231fa5a85cbb0f792e6e461392879047c36;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/config.yml b/config.yml
index 8802dcf..36c804b 100644
--- a/config.yml
+++ b/config.yml
@@ -12,8 +12,8 @@ config:
   music_path: .
 # The awful red message that shows up when you lose the focus
   focus_warning: true
-# built-in mixing
-  builtin_mixing: true
+# built-in mixing, try this if your system can't mix the musics by itself
+  builtin_mixing: false
 # Device used for playing musics. Default value depends on your system
 #  device: 
 # Advanced parameters: use at your own risk! (your computer probably won't explode, though)
@@ -73,6 +73,10 @@ music_properties:
 ##### Key properties: how do the key look like, and some other properties #####
 
 key_properties:
+  'common':
+    repeat_delay: 1
+    include: blue
+
   'a':
     description:
       -  
@@ -143,6 +147,11 @@ key_properties:
       - Low vol
       - Up vol
     include: green
+  'ù':
+    description:
+      - 
+      - stop
+      - wait
 
   'home':
     description:
@@ -158,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:
@@ -177,6 +189,7 @@ key_properties:
       - Stop
       - fade
     include: orange
+    repeat_delay: 0
 
   'F2':
     description:
@@ -184,6 +197,7 @@ key_properties:
       - Stop
       - actions
     include: orange
+    repeat_delay: 0
 
   'F4':
     description:
@@ -191,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 #####
@@ -244,10 +279,8 @@ keys:
     - stop: 
         fade_out: 3
         wait: true
-        set_wait_id: y1
     - wait:
         duration: 3
-        set_wait_id: y2
     - play: 
         include: music2
 
@@ -261,7 +294,6 @@ keys:
         include: music1
     - wait:
         duration: 3
-        set_wait_id: u
     - play: 
         include: music2
 
@@ -272,7 +304,6 @@ keys:
         start_at: 30
     - wait: 
         duration: 5
-        set_wait_id: g
     - seek:
         include: music1
         delta: false
@@ -291,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:
@@ -304,7 +340,6 @@ keys:
     - wait:
         include: noise
         duration: 1
-        set_wait_id: i
     - volume:
         include: music1
         value: 100
@@ -326,7 +361,6 @@ keys:
         fade: 5
     - wait:
         duration: 5
-        set_wait_id: n
     - volume:
         include: music1
         value: 100
@@ -379,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':