diff options
| -rw-r--r-- | broadcast.py | 12 | ||||
| -rw-r--r-- | drums.py | 6 | ||||
| -rw-r--r-- | packet.py | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/broadcast.py b/broadcast.py index 6747910..c8682da 100644 --- a/broadcast.py +++ b/broadcast.py @@ -9,7 +9,7 @@ import optparse import random import itertools -from packet import Packet, CMD, itos +from packet import Packet, CMD, itos, OBLIGATE_POLYPHONE parser = optparse.OptionParser() parser.add_option('-t', '--test', dest='test', action='store_true', help='Play a test tone (440, 880) on all clients in sequence (the last overlaps with the first of the next)') @@ -147,6 +147,7 @@ clients = set() targets = set() uid_groups = {} type_groups = {} +ports = {} if not options.dry: s.settimeout(options.wait_time) @@ -170,6 +171,7 @@ for num in xrange(options.tries): data, _ = s.recvfrom(4096) pkt = Packet.FromStr(data) print 'ports', pkt.data[0], + ports[cl] = pkt.data[0] tp = itos(pkt.data[1]) print 'type', tp, uid = ''.join([itos(i) for i in pkt.data[2:]]).rstrip('\x00') @@ -188,6 +190,8 @@ for num in xrange(options.tries): s.sendto(str(Packet(CMD.QUIT)), cl) if options.silence: s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0.0)), cl) + if pkt.data[0] == OBLIGATE_POLYPHONE: + pkt.data[0] = 1 for i in xrange(pkt.data[0]): targets.add(cl+(i,)) @@ -445,7 +449,8 @@ for fname in args: if matches: if options.verbose: print '\tUsing client', matches[0] - self.clients.remove(matches[0]) + if ports.get(matches[0][:2]) != OBLIGATE_POLYPHONE: + self.clients.remove(matches[0]) return matches[0] if options.verbose: print '\tNo matches, moving on...' @@ -469,7 +474,8 @@ for fname in args: print '\tOut of clients, no route matched.' return None cli = list(testset)[0] - self.clients.remove(cli) + if ports.get(cli[:2]) != OBLIGATE_POLYPHONE: + self.clients.remove(cli) if options.verbose: print '\tDefault route to', cli return cli @@ -7,7 +7,7 @@ import cStringIO as StringIO import array import time -from packet import Packet, CMD, stoi +from packet import Packet, CMD, stoi, OBLIGATE_POLYPHONE parser = optparse.OptionParser() parser.add_option('-t', '--test', dest='test', action='store_true', help='As a test, play all samples then exit') @@ -161,12 +161,12 @@ while True: dframes = max(dframes, rframes) if not options.cut: dframes = rframes * ((dframes + rframes - 1) / rframes) - amp = max(min(pkt.as_float(3), 1.0), 0.0) + amp = max(min(options.volume * pkt.as_float(3), 1.0), 0.0) PLAYING.add(SampleReader(rdata, dframes * 4, amp)) #signal.setitimer(signal.ITIMER_REAL, dur) elif pkt.cmd == CMD.CAPS: data = [0] * 8 - data[0] = 255 # XXX More ports? Less? + data[0] = OBLIGATE_POLYPHONE data[1] = stoi(IDENT) for i in xrange(len(options.uid)/4 + 1): data[i+2] = stoi(options.uid[4*i:4*(i+1)]) @@ -31,3 +31,5 @@ def itos(i): def stoi(s): return struct.unpack('>L', s.ljust(4, '\0'))[0] + +OBLIGATE_POLYPHONE = 0xffffffff |