Live performance, silence/play, percussion recognition, and some bugfixes

2 files changed, 160 insertions, 20 deletions

diff --git a/broadcast.py b/broadcast.py
index ad27283..f0b987b 100644
--- a/broadcast.py
+++ b/broadcast.py
@@ -5,18 +5,30 @@ import time
 import xml.etree.ElementTree as ET
 import threading
 import optparse
+import random
 
 from packet import Packet, CMD, itos
 
 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)')
 parser.add_option('-T', '--sync-test', dest='sync_test', action='store_true', help='Don\'t wait for clients to play tones properly--have them all test tone at the same time')
+parser.add_option('-R', '--random', dest='random', type='float', help='Generate random notes at approximately this period')
+parser.add_option('--rand-low', dest='rand_low', type='int', help='Low frequency to randomly sample')
+parser.add_option('--rand-high', dest='rand_high', type='int', help='High frequency to randomly sample')
+parser.add_option('-l', '--live', dest='live', help='Enter live mode (play from a controller in real time), specifying the port to connect to as "client,port"; use just "," to manually subscribe later')
+parser.add_option('-L', '--list-live', dest='list_live', action='store_true', help='List all the clients and ports that can be connected to for live performance')
 parser.add_option('-q', '--quit', dest='quit', action='store_true', help='Instruct all clients to quit')
-parser.add_option('-f', '--factor', dest='factor', type='float', default=1.0, help='Rescale time by this factor (0<f<1 are faster; 0.5 is twice the speed, 2 is half)')
+parser.add_option('-p', '--play', dest='play', action='append', help='Play a single tone or chord (specified multiple times) on all listening clients (either "midi pitch" or "@frequency")')
+parser.add_option('-P', '--play-async', dest='play_async', action='store_true', help='Don\'t wait for the tone to finish using the local clock')
+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='How loud to play this note (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('-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=[])
+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=[])
 options, args = parser.parse_args()
 
 if options.help_routes:
@@ -30,9 +42,9 @@ Routes are fully specified by:
 
 The syntax for that specification resembles the following:
 
-    broadcast.py -r U:bass=+bass -r U:treble1,U:treble2=+treble -r T:BEEP=-beeps,-trk3,-trk5
+    broadcast.py -r U:bass=+bass -r U:treble1,U:treble2=+treble -r T:BEEP=-beeps,-trk3,-trk5 -r U:noise=0
 
-The specifier consists of a comma-separated list of attribute-colon-value pairs, followed by an equal sign. After this is a comma-separated list of exclusivities paired with the name of a stream group as specified in the file. The above example shows that stream groups "bass", "treble", and "beeps" will be routed to clients with UID "bass", "treble", and TYPE "BEEP" respectively. Additionally, TYPE "BEEP" will receive tracks 4 and 6 (indices 3 and 5) of the MIDI file (presumably split with -T), and that these three groups are exclusively to be routed to TYPE "BEEP" clients only (the broadcaster will drop the stream if no more are available), as opposed to the preference of the bass and treble groups, which may be routed onto other stream clients if they are available.'''
+The specifier consists of a comma-separated list of attribute-colon-value pairs, followed by an equal sign. After this is a comma-separated list of exclusivities paired with the name of a stream group as specified in the file. The above example shows that stream groups "bass", "treble", and "beeps" will be routed to clients with UID "bass", "treble", and TYPE "BEEP" respectively. Additionally, TYPE "BEEP" will receive tracks 4 and 6 (indices 3 and 5) of the MIDI file (presumably split with -T), and that these three groups are exclusively to be routed to TYPE "BEEP" clients only (the broadcaster will drop the stream if no more are available), as opposed to the preference of the bass and treble groups, which may be routed onto other stream clients if they are available. Finally, the last route says that all "noise" UID clients should not proceed any further (receiving "null" streams) instead. Order is important; if a "noise" client already received a stream (such as "+beeps"), then it would receive that route with priority.'''
     exit()
 
 PORT = 13676
@@ -48,7 +60,7 @@ uid_groups = {}
 type_groups = {}
 
 s.sendto(str(Packet(CMD.PING)), ('255.255.255.255', PORT))
-s.settimeout(0.5)
+s.settimeout(options.wait_time)
 
 try:
 	while True:
@@ -79,20 +91,117 @@ for cl in clients:
                     s.sendto(str(Packet(CMD.PLAY, 0, 250000, 880, 255)), cl)
 	if options.quit:
 		s.sendto(str(Packet(CMD.QUIT)), cl)
+        if options.silence:
+                s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0)), cl)
+
+if options.play:
+    for i, val in enumerate(options.play):
+        if val.startswith('@'):
+            options.play[i] = int(val[1:])
+        else:
+            options.play[i] = int(440.0 * 2**((int(val) - 69)/12.0))
+    for i, cl in enumerate(clients):
+        s.sendto(str(Packet(CMD.PLAY, int(options.duration), int(1000000*(options.duration-int(options.duration))), options.play[i%len(options.play)], options.volume)), cl)
+    if not options.play_async:
+        time.sleep(options.duration)
+    exit()
 
 if options.test and options.sync_test:
     time.sleep(0.25)
     for cl in clients:
         s.sendto(str(Packet(CMD.PLAY, 0, 250000, 880, 255)), cl)
 
-if options.test or options.quit:
+if options.test or options.quit or options.silence:
     print uid_groups
     print type_groups
     exit()
 
+if options.random > 0:
+    while True:
+        for cl in clients:
+            s.sendto(str(Packet(CMD.PLAY, int(options.random), int(1000000*(options.random-int(options.random))), random.randint(options.rand_low, options.rand_high), 255)), cl)
+        time.sleep(options.random)
+
+if options.live or options.list_live:
+    import midi
+    from midi import sequencer
+    S = sequencer.S
+    if options.list_live:
+        print sequencer.SequencerHardware()
+        exit()
+    seq = sequencer.SequencerRead(sequencer_resolution=120)
+    client_set = set(clients)
+    active_set = {} # note (pitch) -> client
+    deferred_set = set() # pitches held due to sustain
+    sustain_status = False
+    client, _, port = options.live.partition(',')
+    if client or port:
+        seq.subscribe_port(client, port)
+    seq.start_sequencer()
+    while True:
+        ev = S.event_input(seq.client)
+        event = None
+        if ev:
+            if ev < 0:
+                seq._error(ev)
+            if ev.type == S.SND_SEQ_EVENT_NOTEON:
+                event = midi.NoteOnEvent(channel = ev.data.note.channel, pitch = ev.data.note.note, velocity = ev.data.note.velocity)
+            elif ev.type == S.SND_SEQ_EVENT_NOTEOFF:
+                event = midi.NoteOffEvent(channel = ev.data.note.channel, pitch = ev.data.note.note, velocity = ev.data.note.velocity)
+            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)
+            elif ev.type == S.SND_SEQ_EVENT_PITCHBEND:
+                event = midi.PitchWheelEvent(channel = ev.data.control.channel, pitch = ev.data.control.value)
+            elif options.verbose:
+                print 'WARNING: Unparsed event, type %r'%(ev.type,)
+                continue
+        if event is not None:
+            if isinstance(event, midi.NoteOnEvent) and event.velocity == 0:
+                ev.__class__ = midi.NoteOffEvent
+            if options.verbose:
+                print 'EVENT:', event
+            if isinstance(event, midi.NoteOnEvent):
+                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())
+                if not inactive_set:
+                    print 'WARNING: Out of clients to do note %r; dropped'%(event.pitch,)
+                    continue
+                cli = random.choice(list(inactive_set))
+                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
+            elif isinstance(event, midi.NoteOffEvent):
+                if event.pitch not in active_set:
+                    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]
+            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:
+                                print 'WARNING: Attempted deferred removal of inactive note %r'%(pitch,)
+                                continue
+                            s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0)), active_set[pitch])
+                            del active_set[pitch]
+                        deferred_set.clear()
+
 try:
 	iv = ET.parse(args[0]).getroot()
 except IOError:
+        import traceback
+        traceback.print_exc()
 	print 'Bad file'
 	exit()
 
@@ -111,7 +220,7 @@ class Route(object):
         else:
             raise ValueError('Not a valid attribute specifier: %r'%(fattr,))
         self.value = fvalue
-        if group not in groups:
+        if group is not None and group not in groups:
             raise ValueError('Not a present group: %r'%(group,))
         self.group = group
         self.excl = excl
@@ -129,51 +238,73 @@ class Route(object):
                     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 '<Route of %r to %s:%s>'%(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
+            clis = clients[:]
         self.clients = clis
         self.routes = []
     def Route(self, stream):
-        grp = stream.get('group')
+        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 'Matches route', route
+                    print '\tMatches route', route
                 excl = excl or route.excl
-                matches = filter(lambda x, route=route: route.Apply(x), self.clients)
+                matches = filter(lambda x, route=route: route.Apply(x), testset)
                 if matches:
                     if options.verbose:
-                        print 'Using client', matches[0]
+                        print '\tUsing client', matches[0]
                     self.clients.remove(matches[0])
                     return matches[0]
-                print 'No matches, moving on...'
+                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 'Exclusively routed, no route matched.'
+                print '\tExclusively routed, no route matched.'
             return None
-        if not self.clients:
+        if not testset:
             if options.verbose:
-                print 'Out of clients, no route matched.'
+                print '\tOut of clients, no route matched.'
             return None
-        cli = self.clients.pop(0)
+        cli = testset[0]
+        self.clients.remove(cli)
         if options.verbose:
-            print 'Default route to', cli
+            print '\tDefault route to', cli
         return cli
 
 routeset = RouteSet()
 for rspec in options.routes:
-    routeset.routes.extend(Route.Parse(rspec))
+    try:
+        routeset.routes.extend(Route.Parse(rspec))
+    except Exception:
+        import traceback
+        traceback.print_exc()
 
 if options.verbose:
     print 'All routes:'
@@ -206,7 +337,12 @@ for ns in notestreams:
     cli = routeset.Route(ns)
     if cli:
         nsq = ns.findall('note')
-        threads.append(NSThread(args=(nsq, clients.pop(0))))
+        threads.append(NSThread(args=(nsq, cli)))
+
+if options.verbose:
+    print 'Playback threads:'
+    for thr in threads:
+        print thr._Thread__args[1]
 
 BASETIME = time.time()
 for thr in threads:
diff --git a/mkiv.py b/mkiv.py
index 249e809..5f5ea38 100644
--- a/mkiv.py
+++ b/mkiv.py
@@ -27,6 +27,7 @@ parser.add_option('-c', '--preserve-channels', dest='chanskeep', action='store_t
 parser.add_option('-T', '--track-split', dest='tracks', action='append_const', const=TRACKS, help='Ensure all tracks are on non-mutual streams')
 parser.add_option('-t', '--track', dest='tracks', action='append', help='Reserve an exclusive set of streams for certain conditions (try --help-conds)')
 parser.add_option('--help-conds', dest='help_conds', action='store_true', help='Print help on filter conditions for streams')
+parser.add_option('-P', '--no-percussion', dest='no_perc', action='store_true', help='Don\'t try to filter percussion events out')
 parser.add_option('-f', '--fuckit', dest='fuckit', action='store_true', help='Use the Python Error Steamroller when importing MIDIs (useful for extended formats)')
 parser.set_defaults(tracks=[])
 options, args = parser.parse_args()
@@ -192,6 +193,9 @@ for fname in args:
     notegroups = []
     auxstream = []
 
+    if not options.no_perc:
+        notegroups.append(NSGroup(filter = lambda mev: mev.ev.channel == 10, name='perc'))
+
     for spec in options.tracks:
         if spec is TRACKS:
             for tidx in xrange(len(pat)):