From 28796422ed09760b8d2ead3f58d8329eb6ea9010 Mon Sep 17 00:00:00 2001 From: Grissess Date: Sun, 23 Aug 2015 23:49:11 -0400 Subject: Partial commit (last from cosi02!) --- broadcast.py | 254 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 143 insertions(+), 111 deletions(-) (limited to 'broadcast.py') diff --git a/broadcast.py b/broadcast.py index 2cff0a3..23b4a2f 100644 --- a/broadcast.py +++ b/broadcast.py @@ -205,119 +205,122 @@ if options.live or options.list_live: del active_set[pitch] deferred_set.clear() -try: - iv = ET.parse(args[0]).getroot() -except IOError: +for fname in args: + try: + iv = ET.parse(fname).getroot() + except IOError: import traceback traceback.print_exc() - print 'Bad file' - exit() + print fname, ': Bad file' + continue -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(groups), 'groups' + 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): - def __init__(self, fattr, fvalue, group, excl=False): - if fattr == 'U': - self.map = uid_groups - elif fattr == 'T': - self.map = type_groups - else: - raise ValueError('Not a valid attribute specifier: %r'%(fattr,)) - self.value = fvalue - if group is not None and group not in groups: - raise ValueError('Not a present group: %r'%(group,)) - self.group = group - self.excl = excl - @classmethod - def Parse(cls, s): - fspecs, _, grpspecs = map(lambda x: x.strip(), s.partition('=')) - fpairs = [] - ret = [] - for fspec in [i.strip() for i in fspecs.split(',')]: - fattr, _, fvalue = map(lambda x: x.strip(), fspec.partition(':')) - fpairs.append((fattr, fvalue)) - for part in [i.strip() for i in grpspecs.split(',')]: - for fattr, fvalue in fpairs: - if part[0] == '+': - ret.append(Route(fattr, fvalue, part[1:], False)) - elif part[0] == '-': - ret.append(Route(fattr, fvalue, part[1:], True)) - elif part[0] == '0': - ret.append(Route(fattr, fvalue, None, True)) - else: - raise ValueError('Not an exclusivity: %r'%(part[0],)) - return ret - def Apply(self, cli): - return cli in self.map.get(self.value, []) - def __repr__(self): - return ''%(self.group, ('U' if self.map is uid_groups else 'T'), self.value) + class Route(object): + def __init__(self, fattr, fvalue, group, excl=False): + if fattr == 'U': + self.map = uid_groups + elif fattr == 'T': + self.map = type_groups + else: + raise ValueError('Not a valid attribute specifier: %r'%(fattr,)) + self.value = fvalue + if group is not None and group not in groups: + raise ValueError('Not a present group: %r'%(group,)) + self.group = group + self.excl = excl + @classmethod + def Parse(cls, s): + fspecs, _, grpspecs = map(lambda x: x.strip(), s.partition('=')) + fpairs = [] + ret = [] + for fspec in [i.strip() for i in fspecs.split(',')]: + fattr, _, fvalue = map(lambda x: x.strip(), fspec.partition(':')) + fpairs.append((fattr, fvalue)) + for part in [i.strip() for i in grpspecs.split(',')]: + for fattr, fvalue in fpairs: + if part[0] == '+': + ret.append(Route(fattr, fvalue, part[1:], False)) + elif part[0] == '-': + ret.append(Route(fattr, fvalue, part[1:], True)) + elif part[0] == '0': + ret.append(Route(fattr, fvalue, None, True)) + else: + raise ValueError('Not an exclusivity: %r'%(part[0],)) + return ret + def Apply(self, cli): + return cli in self.map.get(self.value, []) + def __repr__(self): + return ''%(self.group, ('U' if self.map is uid_groups else 'T'), self.value) -class RouteSet(object): - def __init__(self, clis=None): - if clis is None: - clis = clients[:] - self.clients = clis - self.routes = [] - def Route(self, stream): - testset = self.clients[:] - grp = stream.get('group', 'ALL') - if options.verbose: - print 'Routing', grp, '...' - excl = False - for route in self.routes: - if route.group == grp: - if options.verbose: - print '\tMatches route', route - excl = excl or route.excl - matches = filter(lambda x, route=route: route.Apply(x), testset) - if matches: + class RouteSet(object): + def __init__(self, clis=None): + if clis is None: + clis = clients[:] + self.clients = clis + self.routes = [] + def Route(self, stream): + testset = self.clients[:] + grp = stream.get('group', 'ALL') + if options.verbose: + print 'Routing', grp, '...' + excl = False + for route in self.routes: + if route.group == grp: if options.verbose: - print '\tUsing client', matches[0] - self.clients.remove(matches[0]) - return matches[0] + print '\tMatches route', route + excl = excl or route.excl + matches = filter(lambda x, route=route: route.Apply(x), testset) + if matches: + if options.verbose: + print '\tUsing client', matches[0] + self.clients.remove(matches[0]) + return matches[0] + if options.verbose: + print '\tNo matches, moving on...' + if route.group is None: + if options.verbose: + print 'Encountered NULL route, removing from search space...' + toremove = [] + for cli in testset: + if route.Apply(cli): + toremove.append(cli) + for cli in toremove: + if options.verbose: + print '\tRemoving', cli, '...' + testset.remove(cli) + if excl: if options.verbose: - print '\tNo matches, moving on...' - if route.group is None: + print '\tExclusively routed, no route matched.' + return None + if not testset: if options.verbose: - print 'Encountered NULL route, removing from search space...' - toremove = [] - for cli in testset: - if route.Apply(cli): - toremove.append(cli) - for cli in toremove: - if options.verbose: - print '\tRemoving', cli, '...' - testset.remove(cli) - if excl: - if options.verbose: - print '\tExclusively routed, no route matched.' - return None - if not testset: + print '\tOut of clients, no route matched.' + return None + cli = testset[0] + self.clients.remove(cli) if options.verbose: - print '\tOut of clients, no route matched.' - return None - cli = testset[0] - self.clients.remove(cli) - if options.verbose: - print '\tDefault route to', cli - return cli + print '\tDefault route to', cli + return cli -routeset = RouteSet() -for rspec in options.routes: - try: - routeset.routes.extend(Route.Parse(rspec)) - except Exception: - import traceback - traceback.print_exc() + routeset = RouteSet() + for rspec in options.routes: + try: + routeset.routes.extend(Route.Parse(rspec)) + except Exception: + import traceback + traceback.print_exc() -if options.verbose: - print 'All routes:' - for route in routeset.routes: - print route + if options.verbose: + print 'All routes:' + for route in routeset.routes: + print route +<<<<<<< b1e54746e876a4ed485e2ed1bbc1d8b302e908ab class NSThread(threading.Thread): def drop_missed(self): nsq, cl = self._Thread__args @@ -328,10 +331,14 @@ class NSThread(threading.Thread): if options.verbose: print self, 'dropped', cnt, 'notes due to miss' self._Thread__args = (nsq, cl) +======= + class NSThread(threading.Thread): +>>>>>>> Partial commit (last from cosi02!) def wait_for(self, t): if t <= 0: return time.sleep(t) +<<<<<<< b1e54746e876a4ed485e2ed1bbc1d8b302e908ab def run(self): nsq, cl = self._Thread__args for note in nsq: @@ -345,21 +352,43 @@ class NSThread(threading.Thread): if options.verbose: print (time.time() - BASETIME), cl, ': PLAY', pitch, dur, vel self.wait_for(dur - ((time.time() - BASETIME) - factor*ttime)) +======= + def run(self): + nsq, cl = self._Thread__args + for note in nsq: + ttime = float(note.get('time')) + pitch = int(note.get('pitch')) + vel = int(note.get('vel')) + 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) +>>>>>>> Partial commit (last from cosi02!) if options.verbose: - print '% 6.5f'%(time.time() - BASETIME,), cl, ': DONE' + print (time.time() - BASETIME), cl, ': PLAY', pitch, dur, vel + self.wait_for(dur - ((time.time() - BASETIME) - factor*ttime)) + if options.verbose: + print '% 6.5f'%(time.time() - BASETIME,), cl, ': DONE' -threads = [] -for ns in notestreams: - cli = routeset.Route(ns) - if cli: - nsq = ns.findall('note') - threads.append(NSThread(args=(nsq, cli))) + threads = [] + for ns in notestreams: + cli = routeset.Route(ns) + if cli: + nsq = ns.findall('note') + threads.append(NSThread(args=(nsq, cli))) -if options.verbose: - print 'Playback threads:' + if options.verbose: + print 'Playback threads:' + for thr in threads: + print thr._Thread__args[1] + + BASETIME = time.time() + for thr in threads: + thr.start() for thr in threads: - print thr._Thread__args[1] + thr.join() +<<<<<<< b1e54746e876a4ed485e2ed1bbc1d8b302e908ab BASETIME = time.time() - (options.seek*factor) if options.seek > 0: for thr in threads: @@ -368,3 +397,6 @@ for thr in threads: thr.start() for thr in threads: thr.join() +======= + print fname, ': Done!' +>>>>>>> Partial commit (last from cosi02!) -- cgit v1.2.3-70-g09d2