Change "keys" hash to "key_properties" in config.yml1.4.0

1 files changed, 169 insertions, 206 deletions

diff --git a/config.yml b/config.yml
index 2e89a0f..56221d9 100644
--- a/config.yml
+++ b/config.yml
@@ -82,52 +82,83 @@ key_properties:
       -  
       - Music 1
     include: light_blue
+    actions:
+      - play:
+          include: music1
+# Play the songs
   'z':
     description:
       -  
       - Music 2
     include: light_blue
+    actions:
+      - play:
+          include: music2
   'e':
     description:
       - 
       - Noise
     include: light_blue
+    actions:
+      - play:
+          include: noise
+# Load the songs
   'q':
     description:
       -  
       - Load
       - Music 1
     include: light_blue
+    actions:
+      - load_music:
+          include: music1
   's':
     description:
       -  
       - Load
       - Music 2
     include: light_blue
+    actions:
+      - load_music:
+          include: music2
   'd':
     description:
       - 
       - Load
       - Noise
     include: light_blue
+    actions:
+      - load_music:
+          include: noise
+# Unload the songs
   'w':
     description:
       -  
       - Unload
       - Music 1
     include: light_blue
+    actions:
+      - unload_music:
+          include: music1
   'x':
     description:
       -  
       - Unload
       - Music 2
     include: light_blue
+    actions:
+      - unload_music:
+          include: music2
   'c':
     description:
       - 
       - Unload
       - Noise
     include: light_blue
+    actions:
+      - unload_music:
+          include: noise
+# Crossfade from any music to music 2
   't':
     description:
       - 
@@ -135,27 +166,70 @@ key_properties:
       - music 2
     include: green
     repeat_delay: 5
+    actions:
+      - stop:
+          fade_out: 5
+      - play:
+          include: music2
+          fade_in: 5
+# Fade out, then wait and start music 2
   'y':
     description:
       - 
       - Stop wait
       - music 2
     include: green
+    actions:
+      - wait:
+          include: music2
 
+# Play music 1, starting at 30 seconds then seeks at 60 after 5 seconds
   'g':
     description:
       - 
       - Music 1
       - Seek 30/60
     include: purple
+    actions:
+      - play: 
+          include: music1
+          start_at: 30
+      - wait: 
+          duration: 5
+      - seek:
+          include: music1
+          delta: false
+          value: 60
 
+# Lowers the volume of music 1 and 2 (if playing), during the duration of noise + 1 second
   'i':
     description:
       -
       - Noise
       - +low vol
     include: green
+    actions:
+      - volume:
+          include: music1
+          value: 50
+      - volume:
+          include: music2
+          value: 50
+      - play:
+          include: noise
+      - wait:
+          include: noise
+          duration: 1
+      - volume:
+          include: music1
+          value: 100
+          fade: 1
+      - volume:
+          include: music2
+          value: 100
+          fade: 1
 
+# Stops all musics, then plays noise repeated twice (3 times)
   'h':
     description:
       -
@@ -163,48 +237,102 @@ key_properties:
       - 3 times
     include: purple
     repeat_delay: 2
+    actions:
+      - stop:
+          fade_out: 0.5
+      - play:
+          include: noise
+          loop: 2
 
+# Play music 1 and 2, after stopping all musics with a fade_out (and wait for this fade out)
   'm':
     description:
       - 
       - Musics
       - 1 & 2
     include: purple
+    actions:
+      - stop:
+          fade_out: 2
+          wait: true
+      - play:
+          include: music1
+      - wait:
+          include: music1
+          set_wait_id: m
+      - play:
+          include: music2
 
+# Lowers the volume of music 1 and 2 (if playing) down to 10% with a 5 seconds fade, then back to 100% 
   'n':
     description:
       -
       - Low vol
       - Up vol
     include: green
+    actions:
+      - volume:
+          include: music1
+          value: 10
+          fade: 5
+      - volume:
+          include: music2
+          value: 10
+          fade: 5
+      - wait:
+          duration: 5
+      - volume:
+          include: music1
+          value: 100
+          fade: 5
+      - volume:
+          include: music2
+          value: 100
+          fade: 5
+# skip waiting for the end of music1
   'ù':
     description:
       - 
       - stop
       - wait
+    actions:
+      - interrupt_wait:
+          wait_id: m
 
   'home':
     description:
       - 
       - vlc
     include: orange
+    actions:
+      - run_command:
+          command: vlc *.mp3
+          wait: true
 
 
 ## Some general useful keys
 
+# Emergency stop!
   'ESC':
     description:
       - "!"
       - STOP!
     include: red
     repeat_delay: 0
+    actions:
+      - stop_all_actions:
+          other_only: true
+      - stop:
 
+# Pause and unpause
   'F5':
     description:
       - "||"
       - PAUSE
     include: light_green
     repeat_delay: 0
+    actions:
+      - pause:
 
   'F6':
     description:
@@ -212,7 +340,10 @@ key_properties:
       - UNPAUSE
     include: light_green
     repeat_delay: 0
+    actions:
+      - unpause:
 
+# Stopping all musics, with a short fade (sounds natural)
   'F1':
     description:
       -   
@@ -220,7 +351,11 @@ key_properties:
       - fade
     include: orange
     repeat_delay: 0
+    actions:
+      - stop:
+          fade_out: 1
 
+# Stopping all actions
   'F2':
     description:
       - 
@@ -228,7 +363,10 @@ key_properties:
       - actions
     include: orange
     repeat_delay: 0
+    actions:
+      - stop_all_actions:
 
+# Skip wait
   'F4':
     description:
       -   
@@ -236,29 +374,45 @@ key_properties:
       - wait
     include: pink
     repeat_delay: 0
+    actions:
+      - interrupt_wait:
 
   'F8':
     description:
       - 
       - Pause
       - wait
+    actions:
+      - pause_wait:
+
   'F9':
     description:
       - 
       - Unpause
       - wait
+    actions:
+      - unpause_wait:
+
   'F10':
     description:
       - 
       - Reset
       - wait
+    actions:
+      - reset_wait:
 
+# Changing volume
   'F12':
     description:
       - 
       - vol+
     include: yellow
     repeat_delay: 0
+    actions:
+      - volume:
+          delta: true
+          value: +10
+          fade: 0.5
 
   'F11':
     description:
@@ -266,13 +420,23 @@ key_properties:
       - "vol-"
     include: yellow
     repeat_delay: 0
-
+    actions:
+      - volume:
+          delta: true
+          value: -10
+          fade: 0.5
+ 
+# Seek +- 10 seconds
   'right':
     description:
       - 
       - +10s
     include: blue
     repeat_delay: 0
+    actions:
+      - seek:
+          value: 10
+          delta: true
 
   'left':
     description:
@@ -280,208 +444,7 @@ key_properties:
       - -10s
     include: blue
     repeat_delay: 0
-
-#################################################################
-##### Keys: what do the key actually do when you press them #####
-
-keys:
-# Play the songs
-  'a':
-    - play:
-        include: music1
-  'z': 
-    - play:
-        include: music2
-  'e':
-    - play:
-        include: noise
-
-# Load the songs
-  'q':
-    - load_music:
-        include: music1
-  's': 
-    - load_music:
-        include: music2
-  'd':
-    - load_music:
-        include: noise
-
-# Unload the songs
-  'w':
-    - unload_music:
-        include: music1
-  'x': 
-    - unload_music:
-        include: music2
-  'c':
-    - unload_music:
-        include: noise
-
-# Crossfade from any music to music 2
-  't':
-    - stop:
-        fade_out: 5
-    - play:
-        include: music2
-        fade_in: 5
-
-# Fade out, then wait and start music 2
-  'y':
-    - wait:
-        include: music2
-
-# Play the noise, stop music 1, wait a bit then start music 2
-
-# Play music 1, starting at 30 seconds then seeks at 60 after 5 seconds
-  'g':
-    - play: 
-        include: music1
-        start_at: 30
-    - wait: 
-        duration: 5
-    - seek:
-        include: music1
-        delta: false
-        value: 60
-
-# Play music 1 and 2, after stopping all musics with a fade_out (and wait for this fade out)
-  'm':
-    - stop:
-        fade_out: 2
-        wait: true
-    - play:
-        include: music1
-    - wait:
-        include: music1
-        set_wait_id: m
-    - 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:
-        include: music1
-        value: 50
-    - volume:
-        include: music2
-        value: 50
-    - play:
-        include: noise
-    - wait:
-        include: noise
-        duration: 1
-    - volume:
-        include: music1
-        value: 100
-        fade: 1
-    - volume:
-        include: music2
-        value: 100
-        fade: 1
-
-# Lowers the volume of music 1 and 2 (if playing) down to 10% with a 5 seconds fade, then back to 100% 
-  'n' :
-    - volume:
-        include: music1
-        value: 10
-        fade: 5
-    - volume:
-        include: music2
-        value: 10
-        fade: 5
-    - wait:
-        duration: 5
-    - volume:
-        include: music1
-        value: 100
-        fade: 5
-    - volume:
-        include: music2
-        value: 100
-        fade: 5
-
-# Stops all musics, then plays noise repeated twice (3 times)
-  'h':
-    - stop:
-        fade_out: 0.5
-    - play:
-        include: noise
-        loop: 2
-
-  'home':
-    - run_command:
-        command: vlc *.mp3
-        wait: true
-
-
-##### Useful keys (good to have them all the time)
-
-# Emergency stop!
-  'ESC':
-    - stop_all_actions:
-        other_only: true
-    - stop:
-
-
-
-# Pause and unpause
-  'F5': 
-    - pause:
-
-  'F6':
-    - unpause:
-
-# Stopping all musics, with a short fade (sounds natural)
-  'F1':
-    - stop:
-        fade_out: 1
-
-# Stopping all actions
-  'F2':
-    - stop_all_actions:
-
-# Skip wait
-  'F4':
-    - interrupt_wait:
-
-  'F8':
-    - pause_wait:
-
-  'F9':
-    - unpause_wait:
-
-  'F10':
-    - reset_wait:
-
-# Changing volume
-  'F12':
-    - volume:
-        delta: true
-        value: +10
-        fade: 0.5
-
-  'F11':
-    - volume:
-        delta: true
-        value: -10
-        fade: 0.5
-  
-
-# Seek +- 10 seconds
-  'right':
-    - seek:
-        value: 10
-        delta: true
-
-  'left':
-    - seek:
-        value: -10
-        delta: true
-
-
+    actions:
+      - seek:
+          value: -10
+          delta: true