# HG changeset patch
# User Drew Perttula <drewp@bigasterisk.com>
# Date 2017-05-30 07:37:17
# Node ID d5761661ac31e4c28193601cae1881c7befe8626
# Parent  30c79f1dc4f869bd09bbfe287d05734a7a80cf0a

fix sequencer to use DeviceSettings
Ignore-this: d317447acc51379a6d06622aea7213a6

diff --git a/light9/effect/effecteval.py b/light9/effect/effecteval.py
--- a/light9/effect/effecteval.py
+++ b/light9/effect/effecteval.py
@@ -8,6 +8,8 @@ import math
 from noise import pnoise1
 import logging
 import time
+from light9.effect.settings import DeviceSettings
+
 
 log = logging.getLogger('effecteval')
 
@@ -75,6 +77,10 @@ class EffectEval(object):
                 sv = self.graph.value(setting, L9['scaledValue'])
                 if not (bool(v) ^ bool(sv)):
                     raise NotImplementedError
+                if d is None:
+                    raise TypeError('no device on %s' % effect)
+                if a is None:
+                    raise TypeError('no attr on %s' % effect)
 
                 settings.append((d, a, v if v is not None else sv, bool(sv)))
 
@@ -93,7 +99,7 @@ class EffectEval(object):
 
         strength = float(effectSettings[L9['strength']])
         if strength <= 0:
-            return []
+            return DeviceSettings(self.graph, [])
 
         out = {} # (dev, attr): value
 
@@ -109,11 +115,8 @@ class EffectEval(object):
             else:
                 out.update(func(effectSettings, strength, songTime, noteTime))
 
-        # todo: callers should prefer the dict form too
         outList = [(d, a, v) for (d, a), v in out.iteritems()]
-        outList.sort()
-        #import pprint; pprint.pprint(outList, width=170)
-        return outList
+        return DeviceSettings(self.graph, outList)
                             
     def simpleOutput(self, strength, colorScale):
         out = {}
diff --git a/light9/effect/sequencer.py b/light9/effect/sequencer.py
--- a/light9/effect/sequencer.py
+++ b/light9/effect/sequencer.py
@@ -172,7 +172,7 @@ class Sequencer(object):
         g = self.graph
 
         sharedEffectOutputs = {}
-        
+
         for song in g.subjects(RDF.type, L9['Song']):
             self.notes[song] = []
             for note in g.objects(song, L9['note']):
@@ -199,7 +199,5 @@ class Sequencer(object):
         settings = []
         
         for note in self.notes.get(song, []):
-            outs = note.outputSettings(t)
-            #print 'out', outs
-            settings.extend(outs)
-        self.sendToCollector(settings)
+            settings.append(note.outputSettings(t))
+        self.sendToCollector(DeviceSettings.fromList(self.graph, settings))
diff --git a/light9/effect/settings.py b/light9/effect/settings.py
--- a/light9/effect/settings.py
+++ b/light9/effect/settings.py
@@ -71,6 +71,19 @@ class _Settings(object):
             compiled.setdefault(d, {})[a] = v
         return cls._fromCompiled(graph, compiled)
 
+    @classmethod
+    def fromList(cls, graph, others):
+        out = cls(graph, [])
+        for s in others:
+            if not isinstance(s, cls):
+                raise TypeError(s)
+            for row in s.asList(): # could work straight from s._compiled
+                if row[0] is None:
+                    raise TypeError('bad row %r' % (row,))
+                out._compiled.setdefault(row[0], {})[row[1]] = row[2]
+        out._delZeros()
+        return out
+        
     def _zeroForAttr(self, attr):
         if attr == L9['color']:
             return '#000000'