aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-09-19 13:57:38 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-09-19 13:57:38 +0200
commitd88794ab3f5e9ce896fa58224dd8c6b1ec33b8b6 (patch)
treec9df79e7c5223e2a257380ff73635f74b0d7870a
parent045a1b6343dc1a1ec4b27f5ae11856b8a422c9db (diff)
downloadMusicSampler-d88794ab3f5e9ce896fa58224dd8c6b1ec33b8b6.tar.gz
MusicSampler-d88794ab3f5e9ce896fa58224dd8c6b1ec33b8b6.tar.zst
MusicSampler-d88794ab3f5e9ce896fa58224dd8c6b1ec33b8b6.zip
bump config.yml
-rw-r--r--config.yml80
1 files changed, 58 insertions, 22 deletions
diff --git a/config.yml b/config.yml
index 36c804b..2e89a0f 100644
--- a/config.yml
+++ b/config.yml
@@ -92,6 +92,42 @@ key_properties:
92 - 92 -
93 - Noise 93 - Noise
94 include: light_blue 94 include: light_blue
95 'q':
96 description:
97 -
98 - Load
99 - Music 1
100 include: light_blue
101 's':
102 description:
103 -
104 - Load
105 - Music 2
106 include: light_blue
107 'd':
108 description:
109 -
110 - Load
111 - Noise
112 include: light_blue
113 'w':
114 description:
115 -
116 - Unload
117 - Music 1
118 include: light_blue
119 'x':
120 description:
121 -
122 - Unload
123 - Music 2
124 include: light_blue
125 'c':
126 description:
127 -
128 - Unload
129 - Noise
130 include: light_blue
95 't': 131 't':
96 description: 132 description:
97 - 133 -
@@ -105,12 +141,6 @@ key_properties:
105 - Stop wait 141 - Stop wait
106 - music 2 142 - music 2
107 include: green 143 include: green
108 'u':
109 description:
110 -
111 - Noise
112 - + Music 2
113 include: green
114 144
115 'g': 145 'g':
116 description: 146 description:
@@ -266,6 +296,28 @@ keys:
266 - play: 296 - play:
267 include: noise 297 include: noise
268 298
299# Load the songs
300 'q':
301 - load_music:
302 include: music1
303 's':
304 - load_music:
305 include: music2
306 'd':
307 - load_music:
308 include: noise
309
310# Unload the songs
311 'w':
312 - unload_music:
313 include: music1
314 'x':
315 - unload_music:
316 include: music2
317 'c':
318 - unload_music:
319 include: noise
320
269# Crossfade from any music to music 2 321# Crossfade from any music to music 2
270 't': 322 't':
271 - stop: 323 - stop:
@@ -276,26 +328,10 @@ keys:
276 328
277# Fade out, then wait and start music 2 329# Fade out, then wait and start music 2
278 'y': 330 'y':
279 - stop:
280 fade_out: 3
281 wait: true
282 - wait: 331 - wait:
283 duration: 3
284 - play:
285 include: music2 332 include: music2
286 333
287# Play the noise, stop music 1, wait a bit then start music 2 334# Play the noise, stop music 1, wait a bit then start music 2
288 'u':
289 - play:
290 include: noise
291 - wait:
292 duration: 0.2
293 - stop:
294 include: music1
295 - wait:
296 duration: 3
297 - play:
298 include: music2
299 335
300# Play music 1, starting at 30 seconds then seeks at 60 after 5 seconds 336# Play music 1, starting at 30 seconds then seeks at 60 after 5 seconds
301 'g': 337 'g':