X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=config.yml;h=2e89a0f67ec8bd687bff5c5eaf4bbf7f97d2959f;hb=6dc040edf2f31497d4492c159397c4634037be66;hp=e543b041312146aa83ab366a4245932f94ce46c3;hpb=85fdcdb7ca2d03da19dde4cb5ec7d426a6d7be7e;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/config.yml b/config.yml
index e543b04..2e89a0f 100644
--- a/config.yml
+++ b/config.yml
@@ -1,3 +1,31 @@
+#################################
+##### General configuration #####
+## Keep in mind that in-line option override these
+
+#option listed here are the default options.
+config:
+# debug info
+  debug: false
+# languages. Available: fr, en
+  language: fr
+# path to the musics.
+  music_path: .
+# The awful red message that shows up when you lose the focus
+  focus_warning: 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)
+  latency: high
+  blocksize: 0
+  frame_rate: 44100
+  sample_width: 2
+  channels: 2
+
+
+
+
 ###################
 ##### Aliases #####
 
@@ -41,10 +69,14 @@ music_properties:
     name: Crocodile noise
     gain: 1.2
 
-####################################################
-##### Key properties: how do the key look like #####
+###############################################################################
+##### Key properties: how do the key look like, and some other properties #####
 
 key_properties:
+  'common':
+    repeat_delay: 1
+    include: blue
+
   'a':
     description:
       -  
@@ -60,6 +92,42 @@ key_properties:
       - 
       - Noise
     include: light_blue
+  'q':
+    description:
+      -  
+      - Load
+      - Music 1
+    include: light_blue
+  's':
+    description:
+      -  
+      - Load
+      - Music 2
+    include: light_blue
+  'd':
+    description:
+      - 
+      - Load
+      - Noise
+    include: light_blue
+  'w':
+    description:
+      -  
+      - Unload
+      - Music 1
+    include: light_blue
+  'x':
+    description:
+      -  
+      - Unload
+      - Music 2
+    include: light_blue
+  'c':
+    description:
+      - 
+      - Unload
+      - Noise
+    include: light_blue
   't':
     description:
       - 
@@ -73,12 +141,6 @@ key_properties:
       - Stop wait
       - music 2
     include: green
-  'u':
-    description:
-      - 
-      - Noise
-      - + Music 2
-    include: green
 
   'g':
     description:
@@ -115,6 +177,11 @@ key_properties:
       - Low vol
       - Up vol
     include: green
+  'ù':
+    description:
+      - 
+      - stop
+      - wait
 
   'home':
     description:
@@ -130,18 +197,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:
@@ -149,6 +219,7 @@ key_properties:
       - Stop
       - fade
     include: orange
+    repeat_delay: 0
 
   'F2':
     description:
@@ -156,6 +227,7 @@ key_properties:
       - Stop
       - actions
     include: orange
+    repeat_delay: 0
 
   'F4':
     description:
@@ -163,30 +235,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 #####
@@ -203,6 +296,28 @@ keys:
     - 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:
@@ -213,29 +328,10 @@ keys:
 
 # Fade out, then wait and start music 2
   'y':
-    - stop: 
-        fade_out: 3
-        wait: true
-        set_wait_id: y1
     - wait:
-        duration: 3
-        set_wait_id: y2
-    - play: 
         include: music2
 
 # Play the noise, stop music 1, wait a bit then start music 2
-  'u':
-    - play:
-        include: noise
-    - wait:
-        duration: 0.2
-    - stop:
-        include: music1
-    - wait:
-        duration: 3
-        set_wait_id: u
-    - play: 
-        include: music2
 
 # Play music 1, starting at 30 seconds then seeks at 60 after 5 seconds
   'g':
@@ -244,7 +340,6 @@ keys:
         start_at: 30
     - wait: 
         duration: 5
-        set_wait_id: g
     - seek:
         include: music1
         delta: false
@@ -263,6 +358,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:
@@ -276,7 +376,6 @@ keys:
     - wait:
         include: noise
         duration: 1
-        set_wait_id: i
     - volume:
         include: music1
         value: 100
@@ -298,7 +397,6 @@ keys:
         fade: 5
     - wait:
         duration: 5
-        set_wait_id: n
     - volume:
         include: music1
         value: 100
@@ -351,20 +449,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':