diff options
Diffstat (limited to 'broadcast.py')
| -rw-r--r-- | broadcast.py | 62 |
1 files changed, 46 insertions, 16 deletions
diff --git a/broadcast.py b/broadcast.py index 5606137..3b163b1 100644 --- a/broadcast.py +++ b/broadcast.py @@ -24,12 +24,13 @@ parser.add_option('-P', '--play-async', dest='play_async', action='store_true', parser.add_option('-D', '--duration', dest='duration', type='float', help='How long to play this note for') parser.add_option('-V', '--volume', dest='volume', type='int', help='Master volume (0-255)') parser.add_option('-s', '--silence', dest='silence', action='store_true', help='Instruct all clients to stop playing any active tones') +parser.add_option('-S', '--seek', dest='seek', type='float', help='Start time in seconds (scaled by --factor)') parser.add_option('-f', '--factor', dest='factor', type='float', help='Rescale time by this factor (0<f<1 are faster; 0.5 is twice the speed, 2 is half)') parser.add_option('-r', '--route', dest='routes', action='append', help='Add a routing directive (see --route-help)') parser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Be verbose; dump events and actual time (can slow down performance!)') parser.add_option('-W', '--wait-time', dest='wait_time', type='float', help='How long to wait for clients to initially respond (delays all broadcasts)') parser.add_option('--help-routes', dest='help_routes', action='store_true', help='Show help about routing directives') -parser.set_defaults(routes=[], random=0.0, rand_low=80, rand_high=2000, live=None, factor=1.0, duration=1.0, volume=255, wait_time=0.25, play=[], transpose=0) +parser.set_defaults(routes=[], random=0.0, rand_low=80, rand_high=2000, live=None, factor=1.0, duration=1.0, volume=255, wait_time=0.25, play=[], transpose=0, seek=0.0) options, args = parser.parse_args() if options.help_routes: @@ -70,6 +71,8 @@ try: except socket.timeout: pass +print len(clients), 'detected clients' + print 'Clients:' for cl in clients: print cl, @@ -86,10 +89,10 @@ for cl in clients: uid_groups.setdefault(uid, []).append(cl) type_groups.setdefault(tp, []).append(cl) if options.test: - s.sendto(str(Packet(CMD.PLAY, 0, 250000, 440, 255)), cl) + s.sendto(str(Packet(CMD.PLAY, 0, 250000, 440, options.volume)), cl) if not options.sync_test: time.sleep(0.25) - s.sendto(str(Packet(CMD.PLAY, 0, 250000, 880, 255)), cl) + s.sendto(str(Packet(CMD.PLAY, 0, 250000, 880, options.volume)), cl) if options.quit: s.sendto(str(Packet(CMD.QUIT)), cl) if options.silence: @@ -132,7 +135,7 @@ if options.live or options.list_live: exit() seq = sequencer.SequencerRead(sequencer_resolution=120) client_set = set(clients) - active_set = {} # note (pitch) -> client + active_set = {} # note (pitch) -> [client] deferred_set = set() # pitches held due to sustain sustain_status = False client, _, port = options.live.partition(',') @@ -154,7 +157,7 @@ if options.live or options.list_live: elif ev.type == S.SND_SEQ_EVENT_CONTROLLER: event = midi.ControlChangeEvent(channel = ev.data.control.channel, control = ev.data.control.param, value = ev.data.control.value) elif ev.type == S.SND_SEQ_EVENT_PGMCHANGE: - event = midi.ProgramChangeEvent(channel = ev.data.control.channel, pitch = ev.data.control.value) + event = midi.ProgramChangeEvent(channel = ev.data.control.channel, value = ev.data.control.value) elif ev.type == S.SND_SEQ_EVENT_PITCHBEND: event = midi.PitchWheelEvent(channel = ev.data.control.channel, pitch = ev.data.control.value) elif options.verbose: @@ -169,34 +172,36 @@ if options.live or options.list_live: if event.pitch in active_set: if sustain_status: deferred_set.discard(event.pitch) - else: - print 'WARNING: Note already activated: %r'%(event.pitch,), - continue - inactive_set = client_set - set(active_set.values()) + inactive_set = client_set - set(sum(active_set.values(), [])) if not inactive_set: print 'WARNING: Out of clients to do note %r; dropped'%(event.pitch,) continue - cli = random.choice(list(inactive_set)) + cli = sorted(inactive_set)[0] s.sendto(str(Packet(CMD.PLAY, 65535, 0, int(440.0 * 2**((event.pitch-69)/12.0)), 2*event.velocity)), cli) - active_set[event.pitch] = cli + active_set.setdefault(event.pitch, []).append(cli) + if options.verbose: + print 'LIVE:', event.pitch, '+ =>', active_set[event.pitch] elif isinstance(event, midi.NoteOffEvent): - if event.pitch not in active_set: + if event.pitch not in active_set or not active_set[event.pitch]: print 'WARNING: Deactivating inactive note %r'%(event.pitch,) continue if sustain_status: deferred_set.add(event.pitch) continue - s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0)), active_set[event.pitch]) - del active_set[event.pitch] + cli = active_set[event.pitch].pop() + s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0)), cli) + if options.verbose: + print 'LIVE:', event.pitch, '- =>', active_set[event.pitch] elif isinstance(event, midi.ControlChangeEvent): if event.control == 64: sustain_status = (event.value >= 64) if not sustain_status: for pitch in deferred_set: - if pitch not in active_set: + if pitch not in active_set or not active_set[pitch]: print 'WARNING: Attempted deferred removal of inactive note %r'%(pitch,) continue - s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0)), active_set[pitch]) + for cli in active_set[pitch]: + s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0)), cli) del active_set[pitch] deferred_set.clear() @@ -315,7 +320,20 @@ for fname in args: for route in routeset.routes: print route +<<<<<<< HEAD +class NSThread(threading.Thread): + def drop_missed(self): + nsq, cl = self._Thread__args + cnt = 0 + while nsq and float(nsq[0].get('time'))*factor < time.time() - BASETIME: + nsq.pop(0) + cnt += 1 + if options.verbose: + print self, 'dropped', cnt, 'notes due to miss' + self._Thread__args = (nsq, cl) +======= class NSThread(threading.Thread): +>>>>>>> 7c9661d892f6145d123d91924b720d9d87b69502 def wait_for(self, t): if t <= 0: return @@ -347,6 +365,17 @@ for fname in args: print 'Playback threads:' for thr in threads: print thr._Thread__args[1] +<<<<<<< HEAD + + BASETIME = time.time() - (options.seek*factor) + if options.seek > 0: + for thr in threads: + thr.drop_missed() + for thr in threads: + thr.start() + for thr in threads: + thr.join() +======= BASETIME = time.time() for thr in threads: @@ -354,4 +383,5 @@ for fname in args: for thr in threads: thr.join() +>>>>>>> 7c9661d892f6145d123d91924b720d9d87b69502 print fname, ': Done!' |