diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-08-12 18:21:22 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-08-12 18:23:02 +0200 |
commit | d4217fda2ff3991eb1ee9a9bec6acff751798507 (patch) | |
tree | 5a7606c28aa5845d1ffebb78742e2d2c2fe39c5a /config.yml | |
parent | 51f6ce0fdb32061b681d63e8de4d96eb8b59e1e9 (diff) | |
download | MusicSampler-d4217fda2ff3991eb1ee9a9bec6acff751798507.tar.gz MusicSampler-d4217fda2ff3991eb1ee9a9bec6acff751798507.tar.zst MusicSampler-d4217fda2ff3991eb1ee9a9bec6acff751798507.zip |
wait actions are now pausable and resettable1.2.3
This fixes https://git.immae.eu/mantisbt/view.php?id=6
Diffstat (limited to 'config.yml')
-rw-r--r-- | config.yml | 65 |
1 files changed, 46 insertions, 19 deletions
@@ -75,6 +75,8 @@ music_properties: | |||
75 | key_properties: | 75 | key_properties: |
76 | 'common': | 76 | 'common': |
77 | repeat_delay: 1 | 77 | repeat_delay: 1 |
78 | include: blue | ||
79 | |||
78 | 'a': | 80 | 'a': |
79 | description: | 81 | description: |
80 | - | 82 | - |
@@ -145,6 +147,11 @@ key_properties: | |||
145 | - Low vol | 147 | - Low vol |
146 | - Up vol | 148 | - Up vol |
147 | include: green | 149 | include: green |
150 | 'ù': | ||
151 | description: | ||
152 | - | ||
153 | - stop | ||
154 | - wait | ||
148 | 155 | ||
149 | 'home': | 156 | 'home': |
150 | description: | 157 | description: |
@@ -160,18 +167,21 @@ key_properties: | |||
160 | - "!" | 167 | - "!" |
161 | - STOP! | 168 | - STOP! |
162 | include: red | 169 | include: red |
170 | repeat_delay: 0 | ||
163 | 171 | ||
164 | 'F5': | 172 | 'F5': |
165 | description: | 173 | description: |
166 | - "||" | 174 | - "||" |
167 | - PAUSE | 175 | - PAUSE |
168 | include: light_green | 176 | include: light_green |
177 | repeat_delay: 0 | ||
169 | 178 | ||
170 | 'F6': | 179 | 'F6': |
171 | description: | 180 | description: |
172 | - ">" | 181 | - ">" |
173 | - UNPAUSE | 182 | - UNPAUSE |
174 | include: light_green | 183 | include: light_green |
184 | repeat_delay: 0 | ||
175 | 185 | ||
176 | 'F1': | 186 | 'F1': |
177 | description: | 187 | description: |
@@ -179,6 +189,7 @@ key_properties: | |||
179 | - Stop | 189 | - Stop |
180 | - fade | 190 | - fade |
181 | include: orange | 191 | include: orange |
192 | repeat_delay: 0 | ||
182 | 193 | ||
183 | 'F2': | 194 | 'F2': |
184 | description: | 195 | description: |
@@ -186,6 +197,7 @@ key_properties: | |||
186 | - Stop | 197 | - Stop |
187 | - actions | 198 | - actions |
188 | include: orange | 199 | include: orange |
200 | repeat_delay: 0 | ||
189 | 201 | ||
190 | 'F4': | 202 | 'F4': |
191 | description: | 203 | description: |
@@ -193,30 +205,51 @@ key_properties: | |||
193 | - Skip | 205 | - Skip |
194 | - wait | 206 | - wait |
195 | include: pink | 207 | include: pink |
208 | repeat_delay: 0 | ||
209 | |||
210 | 'F8': | ||
211 | description: | ||
212 | - | ||
213 | - Pause | ||
214 | - wait | ||
215 | 'F9': | ||
216 | description: | ||
217 | - | ||
218 | - Unpause | ||
219 | - wait | ||
220 | 'F10': | ||
221 | description: | ||
222 | - | ||
223 | - Reset | ||
224 | - wait | ||
196 | 225 | ||
197 | 'F12': | 226 | 'F12': |
198 | description: | 227 | description: |
199 | - | 228 | - |
200 | - vol+ | 229 | - vol+ |
201 | include: yellow | 230 | include: yellow |
231 | repeat_delay: 0 | ||
202 | 232 | ||
203 | 'F11': | 233 | 'F11': |
204 | description: | 234 | description: |
205 | - | 235 | - |
206 | - "vol-" | 236 | - "vol-" |
207 | include: yellow | 237 | include: yellow |
238 | repeat_delay: 0 | ||
208 | 239 | ||
209 | 'right': | 240 | 'right': |
210 | description: | 241 | description: |
211 | - | 242 | - |
212 | - +10s | 243 | - +10s |
213 | include: blue | 244 | include: blue |
245 | repeat_delay: 0 | ||
214 | 246 | ||
215 | 'left': | 247 | 'left': |
216 | description: | 248 | description: |
217 | - | 249 | - |
218 | - -10s | 250 | - -10s |
219 | include: blue | 251 | include: blue |
252 | repeat_delay: 0 | ||
220 | 253 | ||
221 | ################################################################# | 254 | ################################################################# |
222 | ##### Keys: what do the key actually do when you press them ##### | 255 | ##### Keys: what do the key actually do when you press them ##### |
@@ -246,10 +279,8 @@ keys: | |||
246 | - stop: | 279 | - stop: |
247 | fade_out: 3 | 280 | fade_out: 3 |
248 | wait: true | 281 | wait: true |
249 | set_wait_id: y1 | ||
250 | - wait: | 282 | - wait: |
251 | duration: 3 | 283 | duration: 3 |
252 | set_wait_id: y2 | ||
253 | - play: | 284 | - play: |
254 | include: music2 | 285 | include: music2 |
255 | 286 | ||
@@ -263,7 +294,6 @@ keys: | |||
263 | include: music1 | 294 | include: music1 |
264 | - wait: | 295 | - wait: |
265 | duration: 3 | 296 | duration: 3 |
266 | set_wait_id: u | ||
267 | - play: | 297 | - play: |
268 | include: music2 | 298 | include: music2 |
269 | 299 | ||
@@ -274,7 +304,6 @@ keys: | |||
274 | start_at: 30 | 304 | start_at: 30 |
275 | - wait: | 305 | - wait: |
276 | duration: 5 | 306 | duration: 5 |
277 | set_wait_id: g | ||
278 | - seek: | 307 | - seek: |
279 | include: music1 | 308 | include: music1 |
280 | delta: false | 309 | delta: false |
@@ -293,6 +322,11 @@ keys: | |||
293 | - play: | 322 | - play: |
294 | include: music2 | 323 | include: music2 |
295 | 324 | ||
325 | # skip waiting for the end of music1 | ||
326 | 'ù': | ||
327 | - interrupt_wait: | ||
328 | wait_id: m | ||
329 | |||
296 | # Lowers the volume of music 1 and 2 (if playing), during the duration of noise + 1 second | 330 | # Lowers the volume of music 1 and 2 (if playing), during the duration of noise + 1 second |
297 | 'i': | 331 | 'i': |
298 | - volume: | 332 | - volume: |
@@ -306,7 +340,6 @@ keys: | |||
306 | - wait: | 340 | - wait: |
307 | include: noise | 341 | include: noise |
308 | duration: 1 | 342 | duration: 1 |
309 | set_wait_id: i | ||
310 | - volume: | 343 | - volume: |
311 | include: music1 | 344 | include: music1 |
312 | value: 100 | 345 | value: 100 |
@@ -328,7 +361,6 @@ keys: | |||
328 | fade: 5 | 361 | fade: 5 |
329 | - wait: | 362 | - wait: |
330 | duration: 5 | 363 | duration: 5 |
331 | set_wait_id: n | ||
332 | - volume: | 364 | - volume: |
333 | include: music1 | 365 | include: music1 |
334 | value: 100 | 366 | value: 100 |
@@ -381,20 +413,15 @@ keys: | |||
381 | # Skip wait | 413 | # Skip wait |
382 | 'F4': | 414 | 'F4': |
383 | - interrupt_wait: | 415 | - interrupt_wait: |
384 | wait_id: n | ||
385 | - interrupt_wait: | ||
386 | wait_id: m | ||
387 | - interrupt_wait: | ||
388 | wait_id: i | ||
389 | - interrupt_wait: | ||
390 | wait_id: y1 | ||
391 | - interrupt_wait: | ||
392 | wait_id: y2 | ||
393 | - interrupt_wait: | ||
394 | wait_id: u | ||
395 | - interrupt_wait: | ||
396 | wait_id: g | ||
397 | 416 | ||
417 | 'F8': | ||
418 | - pause_wait: | ||
419 | |||
420 | 'F9': | ||
421 | - unpause_wait: | ||
422 | |||
423 | 'F10': | ||
424 | - reset_wait: | ||
398 | 425 | ||
399 | # Changing volume | 426 | # Changing volume |
400 | 'F12': | 427 | 'F12': |