aboutsummaryrefslogtreecommitdiff
path: root/voice.py
diff options
context:
space:
mode:
authorGrissess <grissess@nexusg.org>2015-08-23 23:49:11 -0400
committerGrissess <grissess@nexusg.org>2015-12-17 04:57:31 -0500
commit28796422ed09760b8d2ead3f58d8329eb6ea9010 (patch)
tree01b1a9f4bdebd470be4d4d6407b15fb1f6400bce /voice.py
parentb1e54746e876a4ed485e2ed1bbc1d8b302e908ab (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()