# HG changeset patch # User drewp@bigasterisk.com # Date 2014-06-14 06:34:19 # Node ID 8748f1f47fe876a10c33d36f38f627417d5c08f3 # Parent 0923efae4588eacc6e280d697107830c030f0d7b effect can return a list of outputs Ignore-this: 829d43297718f2257dfd22915b159e63 diff --git a/light9/effecteval/effectloop.py b/light9/effecteval/effectloop.py --- a/light9/effecteval/effectloop.py +++ b/light9/effecteval/effectloop.py @@ -119,7 +119,11 @@ class EffectLoop(object): 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: