Mercurial > code > home > repos > light9

changeset 1134:8748f1f47fe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
effect can return a list of outputs Ignore-this: 829d43297718f2257dfd22915b159e63
author drewp@bigasterisk.com
date Sat, 14 Jun 2014 06:34:19 +0000
parents 0923efae4588
children d5c87125225e
files light9/effecteval/effectloop.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/light9/effecteval/effectloop.py	Sat Jun 14 06:34:10 2014 +0000
+++ b/light9/effecteval/effectloop.py	Sat Jun 14 06:34:19 2014 +0000
@@ -119,7 +119,11 @@
         outputs = []
         for e in self.currentEffects:
             try:
-                outputs.append(e.eval(songTime))
+                out = e.eval(songTime)
+                if isinstance(out, (list, tuple)):
+                    outputs.extend(out)
+                else:
+                    outputs.append(out)
             except Exception as exc:
                 now = time.time()
                 if now > self.lastErrorLog + 5: