From 7ead0eda951d6e3e5f90eab72d17ba881165a45a Mon Sep 17 00:00:00 2001 From: Graham Northup Date: Sat, 10 Oct 2015 10:03:26 -0400 Subject: Volume --- broadcast.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/broadcast.py b/broadcast.py index 279471b..0d7b979 100644 --- a/broadcast.py +++ b/broadcast.py @@ -72,6 +72,8 @@ try: except socket.timeout: pass +print len(clients), 'detected clients' + print 'Clients:' for cl in clients: print cl, @@ -211,7 +213,6 @@ except IOError: notestreams = iv.findall("./streams/stream[@type='ns']") groups = set([ns.get('group') for ns in notestreams if 'group' in ns.keys()]) print len(notestreams), 'notestreams' -print len(clients), 'clients' print len(groups), 'groups' class Route(object): @@ -337,7 +338,7 @@ class NSThread(threading.Thread): dur = factor*float(note.get('dur')) while time.time() - BASETIME < factor*ttime: self.wait_for(factor*ttime - (time.time() - BASETIME)) - s.sendto(str(Packet(CMD.PLAY, int(dur), int((dur*1000000)%1000000), int(440.0 * 2**((pitch-69)/12.0)), vel*2)), cl) + s.sendto(str(Packet(CMD.PLAY, int(dur), int((dur*1000000)%1000000), int(440.0 * 2**((pitch-69)/12.0)), vel * 2 * (options.volume / 255.0))), cl) if options.verbose: print (time.time() - BASETIME), cl, ': PLAY', pitch, dur, vel self.wait_for(dur - ((time.time() - BASETIME) - factor*ttime)) -- cgit v1.2.3-70-g09d2