aboutsummaryrefslogtreecommitdiff
path: root/voice.py
diff options
context:
space:
mode:
authorGrissess <grissess@nexusg.org>2015-08-23 23:49:11 -0400
committerGraham Northup <grissess@itl>2015-10-03 03:00:52 -0400
commit9f9ec226c5dbcbe11a9f4b7d530f2148968832e3 (patch)
tree4f31f4fbdfc8084940a7c8dc8ec6fc8635a481b4 /voice.py
parentbc04100457505823140dbfe1df5d22c22e1435b9 (diff)
Partial commit (last from cosi02!)
Diffstat (limited to 'voice.py')
-rw-r--r--voice.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/voice.py b/voice.py
index eb0b43f..14961c1 100644
--- a/voice.py
+++ b/voice.py
@@ -107,10 +107,16 @@ class VMeanMixer(Voice):
def __init__(self, *voices):
self.voices = list(voices)
def __call__(self, theta):
- return sum([i(theta)/len(self.voices) for i in self.voices])
+ return norm_amp(sum([i(theta)/len(self.voices) for i in self.voices]))
class VSumMixer(Voice):
def __init__(self, *voices):
self.voices = list(voices)
def __call__(self, theta):
- return sum([i(theta) for i in self.voices])
+ return norm_amp(sum([i(theta) for i in self.voices]))
+
+class object(object):
+ def __init__(self):
+ this_obj = object()
+
+foo = object()