From b6ab9fcbec899e345d81554d60111e95cf9ce466 Mon Sep 17 00:00:00 2001 From: Grissess Date: Wed, 20 Apr 2016 04:13:13 -0400 Subject: Bugfixes, graphics, and new generators --- mkiv.py | 77 +++++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 19 deletions(-) (limited to 'mkiv.py') diff --git a/mkiv.py b/mkiv.py index 2293861..0d2bfa0 100644 --- a/mkiv.py +++ b/mkiv.py @@ -6,10 +6,8 @@ This simple script (using python-midi) reads a MIDI file and makes an interval (.iv) file (actually XML) that contains non-overlapping notes. TODO: --Reserve channels by track --Reserve channels by MIDI channel --Pitch limits for channels -MIDI Control events +-Percussion ''' import xml.etree.ElementTree as ET @@ -27,10 +25,12 @@ 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('-P', '--percussion', dest='perc', help='Which percussion standard to use to automatically filter to "perc" (GM, GM2, or none)') parser.add_option('-f', '--fuckit', dest='fuckit', action='store_true', help='Use the Python Error Steamroller when importing MIDIs (useful for extended formats)') parser.add_option('-n', '--target-num', dest='repeaterNumber', type='int', help='Target count of devices') -parser.set_defaults(tracks=[], repeaterNumber=1) +parser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Be verbose; show important parts about the MIDI scheduling process') +parser.add_option('-d', '--debug', dest='debug', action='store_true', help='Debugging output; show excessive output about the MIDI scheduling process') +parser.set_defaults(tracks=[], repeaterNumber=1, perc='GM') options, args = parser.parse_args() if options.help_conds: @@ -40,9 +40,14 @@ Every filter is an expression; internally, this expression is evaluated as the b The "ev" object will be a MergeEvent with the following properties: -ev.tidx: the originating track index (starting at 0) -ev.abstime: the real time in seconds of this event relative to the beginning of playback +-ev.bank: the selected bank (all bits) +-ev.prog: the selected program -ev.ev: a midi.NoteOnEvent: -ev.ev.pitch: the MIDI pitch -ev.ev.velocity: the MIDI velocity + -ev.ev.channel: the MIDI channel + +All valid Python expressions are accepted. Take care to observe proper shell escaping. Specifying a -t = will group all streams under a filter; if the part is omitted, no group will be added. For example: @@ -122,31 +127,59 @@ for fname in args: print 'Merging events...' class MergeEvent(object): - __slots__ = ['ev', 'tidx', 'abstime'] - def __init__(self, ev, tidx, abstime): + __slots__ = ['ev', 'tidx', 'abstime', 'bank', 'prog'] + def __init__(self, ev, tidx, abstime, bank, prog): self.ev = ev self.tidx = tidx self.abstime = abstime + self.bank = bank + self.prog = prog def __repr__(self): return ''%(self.ev, self.tidx, self.abstime) events = [] bpm_at = {0: 120} + cur_bank = [[0 for i in range(16)] for j in range(len(pat))] + cur_prog = [[0 for i in range(16)] for j in range(len(pat))] + chg_bank = [[0 for i in range(16)] for j in range(len(pat))] + chg_prog = [[0 for i in range(16)] for j in range(len(pat))] + ev_cnts = [[0 for i in range(16)] for j in range(len(pat))] + tnames = [''] * len(pat) for tidx, track in enumerate(pat): abstime = 0 absticks = 0 for ev in track: + if options.debug: + print ev if isinstance(ev, midi.SetTempoEvent): absticks += ev.tick bpm_at[absticks] = ev.bpm - else: + elif isinstance(ev, midi.ProgramChangeEvent): + cur_prog[tidx][ev.channel] = ev.value + chg_prog[tidx][ev.channel] += 1 + elif isinstance(ev, midi.ControlChangeEvent): + if ev.control == 0: + cur_bank[tidx][ev.channel] = (0x3F80 & cur_bank[tidx][ev.channel]) | ev.value + chg_bank[tidx][ev.channel] += 1 + elif ev.control == 32: + cur_bank[tidx][ev.channel] = (0x3F & cur_bank[tidx][ev.channel]) | (ev.value << 7) + chg_bank[tidx][ev.channel] += 1 + elif isinstance(ev, midi.TrackNameEvent): + tnames[tidx] = ev.text + elif isinstance(ev, midi.Event): if isinstance(ev, midi.NoteOnEvent) and ev.velocity == 0: ev.__class__ = midi.NoteOffEvent #XXX Oww bpm = filter(lambda pair: pair[0] <= absticks, sorted(bpm_at.items(), key=lambda pair: pair[0]))[-1][1] abstime += (60.0 * ev.tick) / (bpm * pat.resolution) absticks += ev.tick - events.append(MergeEvent(ev, tidx, abstime)) + events.append(MergeEvent(ev, tidx, abstime, cur_bank[tidx][ev.channel], cur_prog[tidx][ev.channel])) + ev_cnts[tidx][ev.channel] += 1 + + if options.verbose: + print 'Track name, event count, final banks, bank changes, final programs, program changes:' + for tidx, tname in enumerate(tnames): + print tidx, ':', tname, ',', ','.join(map(str, ev_cnts[tidx])), ',', ','.join(map(str, cur_bank[tidx])), ',', ','.join(map(str, chg_bank[tidx])), ',', ','.join(map(str, cur_prog[tidx])), ',', ','.join(map(str, chg_prog[tidx])) print 'Sorting events...' @@ -158,7 +191,7 @@ for fname in args: class DurationEvent(MergeEvent): __slots__ = ['duration'] def __init__(self, me, dur): - MergeEvent.__init__(self, me.ev, me.tidx, me.abstime) + MergeEvent.__init__(self, me.ev, me.tidx, me.abstime, me.bank, me.prog) self.duration = dur class NoteStream(object): @@ -200,8 +233,13 @@ for fname in args: notegroups = [] auxstream = [] - if not options.no_perc: - notegroups.append(NSGroup(filter = lambda mev: mev.ev.channel == 10, name='perc')) + if options.perc and options.perc != 'none': + if options.perc == 'GM': + notegroups.append(NSGroup(filter = lambda mev: mev.ev.channel == 9, name='perc')) + elif options.perc == 'GM2': + notegroups.append(NSGroup(filter = lambda mev: mev.bank == 15360, name='perc')) + else: + print 'Unrecognized --percussion option %r; should be GM, GM2, or none'%(options.perc,) for spec in options.tracks: if spec is TRACKS: @@ -214,9 +252,10 @@ for fname in args: name = None notegroups.append(NSGroup(filter = eval("lambda ev: "+spec), name = name)) - print 'Initial group mappings:' - for group in notegroups: - print ('' if group.name is None else group.name), '<=', group.filter + if options.verbose: + print 'Initial group mappings:' + for group in notegroups: + print ('' if group.name is None else group.name) for mev in events: if isinstance(mev.ev, midi.NoteOnEvent): @@ -250,9 +289,10 @@ for fname in args: print 'WARNING: Active notes at end of playback.' ns.Deactivate(MergeEvent(ns.active, ns.active.tidx, lastabstime)) - print 'Final group mappings:' - for group in notegroups: - print ('' if group.name is None else group.name), '<=', group.filter, '(', len(group.streams), 'streams)' + if options.verbose: + print 'Final group mappings:' + for group in notegroups: + print ('' if group.name is None else group.name), '<=', '(', len(group.streams), 'streams)' print 'Generated %d streams in %d groups'%(sum(map(lambda x: len(x.streams), notegroups)), len(notegroups)) print 'Playtime:', lastabstime, 'seconds' @@ -289,7 +329,6 @@ for fname in args: ivnote.set('time', str(note.abstime)) ivnote.set('dur', str(note.duration)) x+=1 - print x if(x>=options.repeaterNumber and options.repeaterNumber!=1): break if(x>=options.repeaterNumber and options.repeaterNumber!=1): -- cgit v1.2.3-70-g09d2 From a3cfdd481d40a7a28dcb5f421797d52b10deeab1 Mon Sep 17 00:00:00 2001 From: Grissess Date: Fri, 22 Apr 2016 19:15:16 -0400 Subject: Added saw wave --- client.py | 4 ++++ mkiv.py | 46 ++++++++++++++++++++++++++++++++++++++-------- shiv.py | 4 ++-- 3 files changed, 44 insertions(+), 10 deletions(-) (limited to 'mkiv.py') diff --git a/client.py b/client.py index 91ef663..01344c1 100644 --- a/client.py +++ b/client.py @@ -166,6 +166,10 @@ def tri_wave(theta): else: return lin_interp(-1, 0, (theta-3*math.pi/2)/(math.pi/2)) +@generator('Saw wave (line from (0, 1) to (2pi, -1))') +def saw_wave(theta): + return lin_interp(1, -1, theta/(math.pi * 2)) + @generator('Simple square wave (piecewise 1 at x= btimes[i] and sev.abstick < btimes[i+1], sorted_events) + print fname, ': BPM partition', i, 'contains', len(fev), 'events' + class MergeEvent(object): __slots__ = ['ev', 'tidx', 'abstime', 'bank', 'prog'] def __init__(self, ev, tidx, abstime, bank, prog): @@ -138,7 +172,6 @@ for fname in args: return ''%(self.ev, self.tidx, self.abstime) events = [] - bpm_at = {0: 120} cur_bank = [[0 for i in range(16)] for j in range(len(pat))] cur_prog = [[0 for i in range(16)] for j in range(len(pat))] chg_bank = [[0 for i in range(16)] for j in range(len(pat))] @@ -150,12 +183,11 @@ for fname in args: abstime = 0 absticks = 0 for ev in track: + bpm = filter(lambda pair: pair[0] <= absticks, sorted(bpm_at.items(), key=lambda pair: pair[0]))[-1][1] if options.debug: - print ev - if isinstance(ev, midi.SetTempoEvent): - absticks += ev.tick - bpm_at[absticks] = ev.bpm - elif isinstance(ev, midi.ProgramChangeEvent): + print ev, ': bpm=', bpm + absticks += ev.tick + if isinstance(ev, midi.ProgramChangeEvent): cur_prog[tidx][ev.channel] = ev.value chg_prog[tidx][ev.channel] += 1 elif isinstance(ev, midi.ControlChangeEvent): @@ -170,9 +202,7 @@ for fname in args: elif isinstance(ev, midi.Event): if isinstance(ev, midi.NoteOnEvent) and ev.velocity == 0: ev.__class__ = midi.NoteOffEvent #XXX Oww - bpm = filter(lambda pair: pair[0] <= absticks, sorted(bpm_at.items(), key=lambda pair: pair[0]))[-1][1] abstime += (60.0 * ev.tick) / (bpm * pat.resolution) - absticks += ev.tick events.append(MergeEvent(ev, tidx, abstime, cur_bank[tidx][ev.channel], cur_prog[tidx][ev.channel])) ev_cnts[tidx][ev.channel] += 1 diff --git a/shiv.py b/shiv.py index 423bdf7..80411e3 100644 --- a/shiv.py +++ b/shiv.py @@ -9,8 +9,8 @@ parser.add_option('-n', '--number', dest='number', action='store_true', help='Sh parser.add_option('-g', '--groups', dest='groups', action='store_true', help='Show group names') parser.add_option('-N', '--notes', dest='notes', action='store_true', help='Show number of notes') parser.add_option('-m', '--meta', dest='meta', action='store_true', help='Show meta track information') -parser.add_option('-h', '--histogram', dest='histogram', action='store_true', help='Show a histogram distribution of pitches') -parser.add_option('-H', '--histogram-tracks', dest='histogram_tracks', action='store_true', help='Show a histogram distribution of pitches per track') +parser.add_option('--histogram', dest='histogram', action='store_true', help='Show a histogram distribution of pitches') +parser.add_option('--histogram-tracks', dest='histogram_tracks', action='store_true', help='Show a histogram distribution of pitches per track') parser.add_option('-d', '--duration', dest='duration', action='store_true', help='Show the duration of the piece') parser.add_option('-D', '--duty-cycle', dest='duty_cycle', action='store_true', help='Show the duration of the notes within tracks, and as a percentage of the piece duration') -- cgit v1.2.3-70-g09d2 From 90fe1672d81de5a3a3b077c025f851470891b566 Mon Sep 17 00:00:00 2001 From: Grissess Date: Sun, 24 Apr 2016 23:36:07 -0400 Subject: Features and bugfixes all around --- client.py | 4 ++++ mkiv.py | 20 ++++++++++++++++++-- shiv.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 77 insertions(+), 10 deletions(-) (limited to 'mkiv.py') diff --git a/client.py b/client.py index 01344c1..2d1ab40 100644 --- a/client.py +++ b/client.py @@ -141,6 +141,10 @@ def pygame_notes(): thread.interrupt_main() pygame.quit() exit() + elif ev.type == pygame.QUIT: + thread.interrupt_main() + pygame.quit() + exit() clock.tick(60) diff --git a/mkiv.py b/mkiv.py index 3a71847..ff2fdbf 100644 --- a/mkiv.py +++ b/mkiv.py @@ -17,6 +17,7 @@ import os import optparse TRACKS = object() +PROGRAMS = object() parser = optparse.OptionParser() parser.add_option('-s', '--channel-split', dest='chansplit', action='store_true', help='Split MIDI channels into independent tracks (as far as -T is concerned)') @@ -25,6 +26,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', '--program-split', dest='tracks', action='append_const', const=PROGRAMS, help='Ensure all programs are on non-mutual streams (overrides -T presently)') parser.add_option('-P', '--percussion', dest='perc', help='Which percussion standard to use to automatically filter to "perc" (GM, GM2, or none)') parser.add_option('-f', '--fuckit', dest='fuckit', action='store_true', help='Use the Python Error Steamroller when importing MIDIs (useful for extended formats)') parser.add_option('-n', '--target-num', dest='repeaterNumber', type='int', help='Target count of devices') @@ -62,11 +64,19 @@ will cause these groups to be made: As can be seen, order of specification is important. Equally important is the location of -T, which should be at the end. -NoteOffEvents are always matched to the stream which has their corresponding NoteOnEvent (in track and pitch), and so are +NoteOffEvents are always matched to the stream which has their corresponding NoteOnEvent (in track, pitch, and channel), and so are not affected or observed by filters. If the filters specified are not a complete cover, an anonymous group will be created with no filter to contain the rest. If -it is desired to force this group to have a name, use -t =True.''' +it is desired to force this group to have a name, use -t =True. This should be placed at the end. + +-T behaves exactly as if: + -t trk0=ev.tidx==0 -t trk1=ev.tidx==1 -t trk2=ev.tidx==2 [...] +had been specified in its place, though it is automatically sized to the number of tracks. Similarly, -P operates as if + -t prg31=ev.prog==31 -t prg81=ev.prog==81 [...] +had been specified, again containing only the programs that were observed in the piece. + +Groups for which no streams are generated are not written to the resulting file.''' exit() if not args: @@ -178,6 +188,7 @@ for fname in args: chg_prog = [[0 for i in range(16)] for j in range(len(pat))] ev_cnts = [[0 for i in range(16)] for j in range(len(pat))] tnames = [''] * len(pat) + progs = set([0]) for tidx, track in enumerate(pat): abstime = 0 @@ -189,6 +200,7 @@ for fname in args: absticks += ev.tick if isinstance(ev, midi.ProgramChangeEvent): cur_prog[tidx][ev.channel] = ev.value + progs.add(ev.value) chg_prog[tidx][ev.channel] += 1 elif isinstance(ev, midi.ControlChangeEvent): if ev.control == 0: @@ -210,6 +222,7 @@ for fname in args: print 'Track name, event count, final banks, bank changes, final programs, program changes:' for tidx, tname in enumerate(tnames): print tidx, ':', tname, ',', ','.join(map(str, ev_cnts[tidx])), ',', ','.join(map(str, cur_bank[tidx])), ',', ','.join(map(str, chg_bank[tidx])), ',', ','.join(map(str, cur_prog[tidx])), ',', ','.join(map(str, chg_prog[tidx])) + print 'All programs observed:', progs print 'Sorting events...' @@ -275,6 +288,9 @@ for fname in args: if spec is TRACKS: for tidx in xrange(len(pat)): notegroups.append(NSGroup(filter = lambda mev, tidx=tidx: mev.tidx == tidx, name = 'trk%d'%(tidx,))) + elif spec is PROGRAMS: + for prog in progs: + notegroups.append(NSGroup(filter = lambda mev, prog=prog: mev.prog == prog, name = 'prg%d'%(prog,))) else: if '=' in spec: name, _, spec = spec.partition('=') diff --git a/shiv.py b/shiv.py index 07f0bdd..8444a72 100644 --- a/shiv.py +++ b/shiv.py @@ -17,6 +17,8 @@ parser.add_option('--vel-hist-tracks', dest='vel_hist_tracks', action='store_tru parser.add_option('-d', '--duration', dest='duration', action='store_true', help='Show the duration of the piece') parser.add_option('-D', '--duty-cycle', dest='duty_cycle', action='store_true', help='Show the duration of the notes within tracks, and as a percentage of the piece duration') parser.add_option('-H', '--height', dest='height', type='int', help='Height of histograms') +parser.add_option('-C', '--no-color', dest='no_color', action='store_true', help='Don\'t use ANSI color escapes') +parser.add_option('-x', '--aux', dest='aux', action='store_true', help='Show information about the auxiliary streams') parser.add_option('-a', '--almost-all', dest='almost_all', action='store_true', help='Show useful information') parser.add_option('-A', '--all', dest='all', action='store_true', help='Show everything') @@ -34,11 +36,31 @@ if options.almost_all or options.all: options.vel_hist = True options.duration = True options.duty_cycle = True - options.meta = True if options.all: + options.aux = True + options.meta = True options.histogram_tracks= True options.vel_hist_tracks = True +if options.no_color: + class COL: + NONE='' + RED='' + GREEN='' + BLUE='' + YELLOW='' + MAGENTA='' + CYAN='' +else: + class COL: + NONE='\x1b[0m' + RED='\x1b[31m' + GREEN='\x1b[32m' + BLUE='\x1b[34m' + YELLOW='\x1b[33m' + MAGENTA='\x1b[35m' + CYAN='\x1b[36m' + def show_hist(values, height=None): if not values: print '{empty histogram}' @@ -49,13 +71,18 @@ def show_hist(values, height=None): miny, maxy = min(ys), max(ys) xv = range(minx, maxx + 1) incs = max((maxy - miny) / height, 1) - print '\t --' + '-' * len(xv) + print COL.BLUE + '\t --' + '-' * len(xv) + COL.NONE for ub in range(maxy + incs, miny, -incs): - print '{}\t | {}'.format(ub, ''.join(['#' if values.get(x) > (ub - incs) else ' ' for x in xv])) - print '\t |-' + '-' * len(xv) + print '{}{}\t | {}{}{}'.format(COL.BLUE, ub, COL.YELLOW, ''.join(['#' if values.get(x) > (ub - incs) else ' ' for x in xv]), COL.NONE) + print COL.BLUE + '\t |-' + '-' * len(xv) + COL.NONE xvs = map(str, xv) for i in range(max(map(len, xvs))): - print '\t ' + ''.join([s[i] if len(s) > i else ' ' for s in xvs]) + print COL.BLUE + '\t ' + ''.join([s[i] if len(s) > i else ' ' for s in xvs]) + COL.NONE + print + xcs = map(str, [values.get(x, 0) for x in xv]) + for i in range(max(map(len, xcs))): + print COL.YELLOW + '\t ' + ''.join([s[i] if len(s) > i else ' ' for s in xcs]) + COL.NONE + print for fname in args: try: @@ -81,17 +108,18 @@ for fname in args: for elem in bpms.iterfind('./bpm'): print '\t\tAt ticks {}, time {}: {} bpm'.format(elem.get('ticks'), elem.get('time'), elem.get('bpm')) - if not (options.number or options.groups or options.notes or options.histogram or options.histogram_tracks or options.duration or options.duty_cycle): + if not (options.number or options.groups or options.notes or options.histogram or options.histogram_tracks or options.vel_hist or options.vel_hist_tracks or options.duration or options.duty_cycle or options.aux): continue streams = iv.findall('./streams/stream') notestreams = [s for s in streams if s.get('type') == 'ns'] + auxstreams = [s for s in streams if s.get('type') == 'aux'] if options.number: print 'Stream count:' print '\tNotestreams:', len(notestreams) print '\tTotal:', len(streams) - if not (options.groups or options.notes or options.histogram or options.histogram_tracks or options.duration or options.duty_cycle): + if not (options.groups or options.notes or options.histogram or options.histogram_tracks or options.vel_hist or options.vel_hist_tracks or options.duration or options.duty_cycle or options.aux): continue if options.groups: @@ -103,7 +131,26 @@ for fname in args: for name, cnt in groups.iteritems(): print '\t{} ({} streams)'.format(name, cnt) - if not (options.notes or options.notes_stream or options.histogram or options.histogram_tracks or options.duration or options.duty_cycle): + if options.aux: + import midi + fr = midi.FileReader() + fr.RunningStatus = None # XXX Hack + print 'Aux stream data:' + for aidx, astream in enumerate(auxstreams): + evs = astream.findall('ev') + failed = 0 + print '\tFrom stream {}, {} events:'.format(aidx, len(evs)) + for ev in evs: + try: + data = eval(ev.get('data')) + mev = fr.parse_midi_event(iter(data)) + except AssertionError: + failed += 1 + else: + print '\t\tAt time {}: {}'.format(ev.get('time'), mev) + print '\t\t(...and {} others which failed to parse)'.format(failed) + + if not (options.notes or options.notes_stream or options.histogram or options.histogram_tracks or options.vel_hist or options.vel_hist_tracks or options.duration or options.duty_cycle): continue if options.notes: -- cgit v1.2.3-70-g09d2 From 6faeb841a0cc452b9e94b3e9c36ab93623128475 Mon Sep 17 00:00:00 2001 From: Grissess Date: Thu, 9 Jun 2016 21:57:51 -0400 Subject: Minor changes --- mkiv.py | 2 ++ shiv.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'mkiv.py') diff --git a/mkiv.py b/mkiv.py index ff2fdbf..d069a93 100644 --- a/mkiv.py +++ b/mkiv.py @@ -155,6 +155,8 @@ for fname in args: sorted_events.sort(key=lambda x: x.abstick) bpm_at = {0: 120} + print 'Computing tempos...' + for sev in sorted_events: if isinstance(sev.ev, midi.SetTempoEvent): if options.debug: diff --git a/shiv.py b/shiv.py index 8444a72..0a8169e 100644 --- a/shiv.py +++ b/shiv.py @@ -71,13 +71,13 @@ def show_hist(values, height=None): miny, maxy = min(ys), max(ys) xv = range(minx, maxx + 1) incs = max((maxy - miny) / height, 1) - print COL.BLUE + '\t --' + '-' * len(xv) + COL.NONE + print COL.CYAN + '\t --' + '-' * len(xv) + COL.NONE for ub in range(maxy + incs, miny, -incs): - print '{}{}\t | {}{}{}'.format(COL.BLUE, ub, COL.YELLOW, ''.join(['#' if values.get(x) > (ub - incs) else ' ' for x in xv]), COL.NONE) - print COL.BLUE + '\t |-' + '-' * len(xv) + COL.NONE + print '{}{}\t | {}{}{}'.format(COL.CYAN, ub, COL.YELLOW, ''.join(['#' if values.get(x) > (ub - incs) else ' ' for x in xv]), COL.NONE) + print COL.CYAN + '\t |-' + '-' * len(xv) + COL.NONE xvs = map(str, xv) for i in range(max(map(len, xvs))): - print COL.BLUE + '\t ' + ''.join([s[i] if len(s) > i else ' ' for s in xvs]) + COL.NONE + print COL.CYAN + '\t ' + ''.join([s[i] if len(s) > i else ' ' for s in xvs]) + COL.NONE print xcs = map(str, [values.get(x, 0) for x in xv]) for i in range(max(map(len, xcs))): -- cgit v1.2.3-70-g09d2 From 5b1881000baec07d5102e360ef4bf232e93bb158 Mon Sep 17 00:00:00 2001 From: csguest Date: Thu, 9 Jun 2016 22:05:29 -0400 Subject: bugfix --- mkiv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkiv.py') diff --git a/mkiv.py b/mkiv.py index d069a93..4cd0fea 100644 --- a/mkiv.py +++ b/mkiv.py @@ -335,7 +335,7 @@ for fname in args: for ns in group.streams: if ns.IsActive(): print 'WARNING: Active notes at end of playback.' - ns.Deactivate(MergeEvent(ns.active, ns.active.tidx, lastabstime)) + ns.Deactivate(MergeEvent(ns.active, ns.active.tidx, lastabstime, 0, 0)) if options.verbose: print 'Final group mappings:' -- cgit v1.2.3-70-g09d2 From 0fc951601706982aeedf035dc4c5ae1c40c671cb Mon Sep 17 00:00:00 2001 From: Grissess Date: Fri, 10 Jun 2016 00:24:07 -0400 Subject: Pitch bend support --- broadcast.py | 2 +- mkiv.py | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- shiv.py | 5 +++-- 3 files changed, 54 insertions(+), 12 deletions(-) (limited to 'mkiv.py') diff --git a/broadcast.py b/broadcast.py index 2a7ce3c..714533d 100644 --- a/broadcast.py +++ b/broadcast.py @@ -464,7 +464,7 @@ for fname in args: nsq, cl = self._Thread__args for note in nsq: ttime = float(note.get('time')) - pitch = int(note.get('pitch')) + options.transpose + pitch = float(note.get('pitch')) + options.transpose vel = int(note.get('vel')) dur = factor*float(note.get('dur')) while time.time() - BASETIME < factor*ttime: diff --git a/mkiv.py b/mkiv.py index 4cd0fea..dd63130 100644 --- a/mkiv.py +++ b/mkiv.py @@ -32,7 +32,8 @@ parser.add_option('-f', '--fuckit', dest='fuckit', action='store_true', help='Us parser.add_option('-n', '--target-num', dest='repeaterNumber', type='int', help='Target count of devices') parser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Be verbose; show important parts about the MIDI scheduling process') parser.add_option('-d', '--debug', dest='debug', action='store_true', help='Debugging output; show excessive output about the MIDI scheduling process') -parser.set_defaults(tracks=[], repeaterNumber=1, perc='GM') +parser.add_option('-D', '--deviation', dest='deviation', type='int', help='Amount (in semitones/MIDI pitch units) by which a fully deflected pitchbend modifies the base pitch (0 disables pitchbend processing)') +parser.set_defaults(tracks=[], repeaterNumber=1, perc='GM', deviation=2) options, args = parser.parse_args() if options.help_conds: @@ -180,8 +181,12 @@ for fname in args: self.abstime = abstime self.bank = bank self.prog = prog + def copy(self, **kwargs): + args = {'ev': self.ev, 'tidx': self.tidx, 'abstime': self.abstime, 'bank': self.bank, 'prog': self.prog} + args.update(kwargs) + return MergeEvent(**args) def __repr__(self): - return ''%(self.ev, self.tidx, self.abstime) + return ''%(self.ev, self.tidx, self.bank, self.prog, self.abstime) events = [] cur_bank = [[0 for i in range(16)] for j in range(len(pat))] @@ -234,27 +239,37 @@ for fname in args: print 'Generating streams...' class DurationEvent(MergeEvent): - __slots__ = ['duration'] - def __init__(self, me, dur): + __slots__ = ['duration', 'pitch'] + def __init__(self, me, pitch, dur): MergeEvent.__init__(self, me.ev, me.tidx, me.abstime, me.bank, me.prog) + self.pitch = pitch self.duration = dur class NoteStream(object): - __slots__ = ['history', 'active'] + __slots__ = ['history', 'active', 'realpitch'] def __init__(self): self.history = [] self.active = None + self.realpitch = None def IsActive(self): return self.active is not None - def Activate(self, mev): + def Activate(self, mev, realpitch = None): + if realpitch is None: + realpitch = mev.ev.pitch self.active = mev + self.realpitch = realpitch def Deactivate(self, mev): - self.history.append(DurationEvent(self.active, mev.abstime - self.active.abstime)) + self.history.append(DurationEvent(self.active, self.realpitch, mev.abstime - self.active.abstime)) self.active = None + self.realpitch = None def WouldDeactivate(self, mev): if not self.IsActive(): return False - return mev.ev.pitch == self.active.ev.pitch and mev.tidx == self.active.tidx + if isinstance(mev.ev, midi.NoteOffEvent): + return mev.ev.pitch == self.active.ev.pitch and mev.tidx == self.active.tidx and mev.ev.channel == self.active.ev.channel + if isinstance(mev.ev, midi.PitchWheelEvent): + return mev.tidx == self.active.tidx and mev.ev.channel == self.active.ev.channel + raise TypeError('Tried to deactivate with bad type %r'%(type(mev.ev),)) class NSGroup(object): __slots__ = ['streams', 'filter', 'name'] @@ -326,6 +341,32 @@ for fname in args: break else: print 'WARNING: Did not match %r with any stream deactivation.'%(mev,) + if options.verbose: + print ' Current state:' + for group in notegroups: + print ' Group %r:'%(group.name,) + for stream in group.streams: + print ' Stream: %r'%(stream.active,) + elif options.deviation > 0 and isinstance(mev.ev, midi.PitchWheelEvent): + for group in notegroups: + found = False + for stream in group.streams: + if stream.WouldDeactivate(mev): + base = stream.active.copy(abstime=mev.abstime) + stream.Deactivate(mev) + stream.Activate(base, base.ev.pitch + options.deviation * (mev.ev.pitch / 2000.0)) + found = True + break + if found: + break + else: + print 'WARNING: Did not find any matching active streams for %r'%(mev,) + if options.verbose: + print ' Current state:' + for group in notegroups: + print ' Group %r:'%(group.name,) + for stream in group.streams: + print ' Stream: %r'%(stream.active,) else: auxstream.append(mev) @@ -372,7 +413,7 @@ for fname in args: ivns.set('group', group.name) for note in ns.history: ivnote = ET.SubElement(ivns, 'note') - ivnote.set('pitch', str(note.ev.pitch)) + ivnote.set('pitch', str(note.pitch)) ivnote.set('vel', str(note.ev.velocity)) ivnote.set('time', str(note.abstime)) ivnote.set('dur', str(note.duration)) diff --git a/shiv.py b/shiv.py index 0a8169e..ac6e2b1 100644 --- a/shiv.py +++ b/shiv.py @@ -3,6 +3,7 @@ import xml.etree.ElementTree as ET import optparse import sys +import math parser = optparse.OptionParser() parser.add_option('-n', '--number', dest='number', action='store_true', help='Show number of tracks') @@ -69,7 +70,7 @@ def show_hist(values, height=None): xs, ys = values.keys(), values.values() minx, maxx = min(xs), max(xs) miny, maxy = min(ys), max(ys) - xv = range(minx, maxx + 1) + xv = range(int(math.floor(minx)), int(math.ceil(maxx + 1))) incs = max((maxy - miny) / height, 1) print COL.CYAN + '\t --' + '-' * len(xv) + COL.NONE for ub in range(maxy + incs, miny, -incs): @@ -173,7 +174,7 @@ for fname in args: for sidx, stream in enumerate(notestreams): notes = stream.findall('note') for note in notes: - pitch = int(note.get('pitch')) + pitch = float(note.get('pitch')) vel = int(note.get('vel')) time = float(note.get('time')) dur = float(note.get('dur')) -- cgit v1.2.3-70-g09d2 From 154526e1a56ec78b745a8b76bb8949cf6cb9d298 Mon Sep 17 00:00:00 2001 From: Grissess Date: Fri, 10 Jun 2016 01:16:16 -0400 Subject: Fixed annoying tempo bug --- .gitignore | 1 + mkiv.py | 33 ++++++++++++++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) (limited to 'mkiv.py') diff --git a/.gitignore b/.gitignore index ee6e3f3..7df3784 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ client *.swp *.swo *.pyc +*.mid *~ diff --git a/mkiv.py b/mkiv.py index dd63130..a55f755 100644 --- a/mkiv.py +++ b/mkiv.py @@ -154,7 +154,7 @@ for fname in args: sorted_events.append(SortEvent(ev, tidx, absticks)) sorted_events.sort(key=lambda x: x.abstick) - bpm_at = {0: 120} + bpm_at = [{0: 120} for i in pat] print 'Computing tempos...' @@ -162,16 +162,18 @@ for fname in args: if isinstance(sev.ev, midi.SetTempoEvent): if options.debug: print fname, ': SetTempo at', sev.abstick, 'to', sev.ev.bpm, ':', sev.ev - bpm_at[sev.abstick] = sev.ev.bpm + bpm_at[sev.tidx][sev.abstick] = sev.ev.bpm if options.verbose: print fname, ': Events:', len(sorted_events) print fname, ': Resolved global BPM:', bpm_at if options.debug: - btimes = bpm_at.keys() - for i in range(len(btimes) - 1): - fev = filter(lambda sev: sev.abstick >= btimes[i] and sev.abstick < btimes[i+1], sorted_events) - print fname, ': BPM partition', i, 'contains', len(fev), 'events' + for tidx, bpms in enumerate(bpm_at): + print fname, ': Tempos in track', tidx + btimes = bpms.keys() + for i in range(len(btimes) - 1): + fev = filter(lambda sev: sev.tidx == tidx and sev.abstick >= btimes[i] and sev.abstick < btimes[i+1], sorted_events) + print fname, ': BPM partition', i, 'contains', len(fev), 'events' class MergeEvent(object): __slots__ = ['ev', 'tidx', 'abstime', 'bank', 'prog'] @@ -201,7 +203,7 @@ for fname in args: abstime = 0 absticks = 0 for ev in track: - bpm = filter(lambda pair: pair[0] <= absticks, sorted(bpm_at.items(), key=lambda pair: pair[0]))[-1][1] + bpm = filter(lambda pair: pair[0] <= absticks, sorted(bpm_at[tidx].items(), key=lambda pair: pair[0]))[-1][1] if options.debug: print ev, ': bpm=', bpm absticks += ev.tick @@ -389,17 +391,18 @@ for fname in args: ##### Write to XML and exit ##### ivmeta = ET.SubElement(iv, 'meta') - ivbpms = ET.SubElement(ivmeta, 'bpms') abstime = 0 prevticks = 0 prev_bpm = 120 - for absticks, bpm in sorted(bpm_at.items(), key = lambda pair: pair[0]): - abstime += ((absticks - prevticks) * 60.0) / (prev_bpm * pat.resolution) - prevticks = absticks - ivbpm = ET.SubElement(ivbpms, 'bpm') - ivbpm.set('bpm', str(bpm)) - ivbpm.set('ticks', str(absticks)) - ivbpm.set('time', str(abstime)) + for tidx, bpms in enumerate(bpm_at): + ivbpms = ET.SubElement(ivmeta, 'bpms', track=str(tidx)) + for absticks, bpm in sorted(bpms.items(), key = lambda pair: pair[0]): + abstime += ((absticks - prevticks) * 60.0) / (prev_bpm * pat.resolution) + prevticks = absticks + ivbpm = ET.SubElement(ivbpms, 'bpm') + ivbpm.set('bpm', str(bpm)) + ivbpm.set('ticks', str(absticks)) + ivbpm.set('time', str(abstime)) ivstreams = ET.SubElement(iv, 'streams') -- cgit v1.2.3-70-g09d2 From 37c9df9fe7d6c9faace591d726266a86f503aab6 Mon Sep 17 00:00:00 2001 From: Grissess Date: Fri, 10 Jun 2016 01:29:59 -0400 Subject: Unfixed tempo bug --- mkiv.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'mkiv.py') diff --git a/mkiv.py b/mkiv.py index a55f755..218ea7b 100644 --- a/mkiv.py +++ b/mkiv.py @@ -33,8 +33,13 @@ parser.add_option('-n', '--target-num', dest='repeaterNumber', type='int', help= parser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Be verbose; show important parts about the MIDI scheduling process') parser.add_option('-d', '--debug', dest='debug', action='store_true', help='Debugging output; show excessive output about the MIDI scheduling process') parser.add_option('-D', '--deviation', dest='deviation', type='int', help='Amount (in semitones/MIDI pitch units) by which a fully deflected pitchbend modifies the base pitch (0 disables pitchbend processing)') -parser.set_defaults(tracks=[], repeaterNumber=1, perc='GM', deviation=2) +parser.add_option('--tempo', dest='tempo', help='Adjust interpretation of tempo (try "f1"/"global", "f2"/"track")') +parser.set_defaults(tracks=[], repeaterNumber=1, perc='GM', deviation=2, tempo='global') options, args = parser.parse_args() +if options.tempo == 'f1': + options.tempo == 'global' +elif options.tempo == 'f2': + options.tempo == 'track' if options.help_conds: print '''Filter conditions are used to route events to groups of streams. @@ -154,7 +159,10 @@ for fname in args: sorted_events.append(SortEvent(ev, tidx, absticks)) sorted_events.sort(key=lambda x: x.abstick) - bpm_at = [{0: 120} for i in pat] + if options.tempo == 'global': + bpm_at = [{0: 120}] + else: + bpm_at = [{0: 120} for i in pat] print 'Computing tempos...' @@ -162,7 +170,7 @@ for fname in args: if isinstance(sev.ev, midi.SetTempoEvent): if options.debug: print fname, ': SetTempo at', sev.abstick, 'to', sev.ev.bpm, ':', sev.ev - bpm_at[sev.tidx][sev.abstick] = sev.ev.bpm + bpm_at[sev.tidx if options.tempo == 'track' else 0][sev.abstick] = sev.ev.bpm if options.verbose: print fname, ': Events:', len(sorted_events) @@ -203,7 +211,7 @@ for fname in args: abstime = 0 absticks = 0 for ev in track: - bpm = filter(lambda pair: pair[0] <= absticks, sorted(bpm_at[tidx].items(), key=lambda pair: pair[0]))[-1][1] + bpm = filter(lambda pair: pair[0] <= absticks, sorted(bpm_at[tidx if options.tempo == 'track' else 0].items(), key=lambda pair: pair[0]))[-1][1] if options.debug: print ev, ': bpm=', bpm absticks += ev.tick -- cgit v1.2.3-70-g09d2 From f649b5fd77607f1bef8943ff548d4330d9bc4e99 Mon Sep 17 00:00:00 2001 From: Grissess Date: Fri, 10 Jun 2016 01:37:28 -0400 Subject: Fixed constant for pitchbend --- mkiv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkiv.py') diff --git a/mkiv.py b/mkiv.py index 218ea7b..7a4c7c7 100644 --- a/mkiv.py +++ b/mkiv.py @@ -364,7 +364,7 @@ for fname in args: if stream.WouldDeactivate(mev): base = stream.active.copy(abstime=mev.abstime) stream.Deactivate(mev) - stream.Activate(base, base.ev.pitch + options.deviation * (mev.ev.pitch / 2000.0)) + stream.Activate(base, base.ev.pitch + options.deviation * (mev.ev.pitch / float(0x2000))) found = True break if found: -- cgit v1.2.3-70-g09d2 From 75662f3a3c525b8417268124d7a2c41a2d5ad5b8 Mon Sep 17 00:00:00 2001 From: Grissess Date: Fri, 10 Jun 2016 03:57:34 -0400 Subject: Begone ye foul tempo demons! --- mkiv.py | 54 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 13 deletions(-) (limited to 'mkiv.py') diff --git a/mkiv.py b/mkiv.py index 7a4c7c7..d52ef76 100644 --- a/mkiv.py +++ b/mkiv.py @@ -176,13 +176,44 @@ for fname in args: print fname, ': Events:', len(sorted_events) print fname, ': Resolved global BPM:', bpm_at if options.debug: - for tidx, bpms in enumerate(bpm_at): - print fname, ': Tempos in track', tidx - btimes = bpms.keys() + if options.tempo == 'track': + for tidx, bpms in enumerate(bpm_at): + print fname, ': Tempos in track', tidx + btimes = bpms.keys() + for i in range(len(btimes) - 1): + fev = filter(lambda sev: sev.tidx == tidx and sev.abstick >= btimes[i] and sev.abstick < btimes[i+1], sorted_events) + print fname, ': BPM partition', i, 'contains', len(fev), 'events' + else: + btimes = bpm_at[0].keys() for i in range(len(btimes) - 1): - fev = filter(lambda sev: sev.tidx == tidx and sev.abstick >= btimes[i] and sev.abstick < btimes[i+1], sorted_events) + fev = filter(lambda sev: sev.abstick >= btimes[i] and sev.abstick < btimes[i+1], sorted_events) print fname, ': BPM partition', i, 'contains', len(fev), 'events' + def at2rt(abstick, bpms): + bpm_segs = bpms.items() + bpm_segs.sort(key=lambda pair: pair[0]) + bpm_segs = filter(lambda pair: pair[0] <= abstick, bpm_segs) + rt = 0 + atick = 0 + if not bpm_segs: + rt = 0 + else: + ctick, bpm = bpm_segs[0] + rt = (60.0 * ctick) / (bpm * pat.resolution) + for idx in range(1, len(bpm_segs)): + dt = bpm_segs[idx][0] - bpm_segs[idx-1][0] + bpm = bpm_segs[idx-1][1] + rt += (60.0 * dt) / (bpm * pat.resolution) + if not bpm_segs: + bpm = 120 + ctick = 0 + else: + ctick, bpm = bpm_segs[-1] + if options.debug: + print 'seg through', bpm_segs, 'final seg', (abstick - ctick, bpm) + rt += (60.0 * (abstick - ctick)) / (bpm * pat.resolution) + return rt + class MergeEvent(object): __slots__ = ['ev', 'tidx', 'abstime', 'bank', 'prog'] def __init__(self, ev, tidx, abstime, bank, prog): @@ -210,11 +241,12 @@ for fname in args: for tidx, track in enumerate(pat): abstime = 0 absticks = 0 + lastbpm = 120 for ev in track: - bpm = filter(lambda pair: pair[0] <= absticks, sorted(bpm_at[tidx if options.tempo == 'track' else 0].items(), key=lambda pair: pair[0]))[-1][1] - if options.debug: - print ev, ': bpm=', bpm absticks += ev.tick + abstime = at2rt(absticks, bpm_at[tidx if options.tempo == 'track' else 0]) + if options.debug: + print 'tick', absticks, 'realtime', abstime if isinstance(ev, midi.ProgramChangeEvent): cur_prog[tidx][ev.channel] = ev.value progs.add(ev.value) @@ -231,7 +263,6 @@ for fname in args: elif isinstance(ev, midi.Event): if isinstance(ev, midi.NoteOnEvent) and ev.velocity == 0: ev.__class__ = midi.NoteOffEvent #XXX Oww - abstime += (60.0 * ev.tick) / (bpm * pat.resolution) events.append(MergeEvent(ev, tidx, abstime, cur_bank[tidx][ev.channel], cur_prog[tidx][ev.channel])) ev_cnts[tidx][ev.channel] += 1 @@ -358,18 +389,15 @@ for fname in args: for stream in group.streams: print ' Stream: %r'%(stream.active,) elif options.deviation > 0 and isinstance(mev.ev, midi.PitchWheelEvent): + found = False for group in notegroups: - found = False for stream in group.streams: if stream.WouldDeactivate(mev): base = stream.active.copy(abstime=mev.abstime) stream.Deactivate(mev) stream.Activate(base, base.ev.pitch + options.deviation * (mev.ev.pitch / float(0x2000))) found = True - break - if found: - break - else: + if not found: print 'WARNING: Did not find any matching active streams for %r'%(mev,) if options.verbose: print ' Current state:' -- cgit v1.2.3-70-g09d2 From dc59723180707561e0f6a7e1fa7b1b33b4439104 Mon Sep 17 00:00:00 2001 From: Grissess Date: Fri, 10 Jun 2016 04:24:40 -0400 Subject: Separate text streams --- mkiv.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'mkiv.py') diff --git a/mkiv.py b/mkiv.py index d52ef76..03b3fdf 100644 --- a/mkiv.py +++ b/mkiv.py @@ -247,6 +247,8 @@ for fname in args: abstime = at2rt(absticks, bpm_at[tidx if options.tempo == 'track' else 0]) if options.debug: print 'tick', absticks, 'realtime', abstime + if isinstance(ev, midi.TrackNameEvent): + tnames[tidx] = ev.text if isinstance(ev, midi.ProgramChangeEvent): cur_prog[tidx][ev.channel] = ev.value progs.add(ev.value) @@ -258,8 +260,8 @@ for fname in args: elif ev.control == 32: cur_bank[tidx][ev.channel] = (0x3F & cur_bank[tidx][ev.channel]) | (ev.value << 7) chg_bank[tidx][ev.channel] += 1 - elif isinstance(ev, midi.TrackNameEvent): - tnames[tidx] = ev.text + elif isinstance(ev, midi.MetaEventWithText): + events.append(MergeEvent(ev, tidx, abstime, 0, 0)) elif isinstance(ev, midi.Event): if isinstance(ev, midi.NoteOnEvent) and ev.velocity == 0: ev.__class__ = midi.NoteOffEvent #XXX Oww @@ -333,6 +335,7 @@ for fname in args: notegroups = [] auxstream = [] + textstream = [] if options.perc and options.perc != 'none': if options.perc == 'GM': @@ -362,7 +365,9 @@ for fname in args: print ('' if group.name is None else group.name) for mev in events: - if isinstance(mev.ev, midi.NoteOnEvent): + if isinstance(mev.ev, midi.MetaEventWithText): + textstream.append(mev) + elif isinstance(mev.ev, midi.NoteOnEvent): for group in notegroups: if group.Accept(mev): break @@ -464,6 +469,10 @@ for fname in args: if(x>=options.repeaterNumber and options.repeaterNumber!=1): break + ivtext = ET.SubElement(ivstreams, 'stream', type='text') + for tev in textstream: + ivev = ET.SubElement(ivtext, 'text', time=str(tev.abstime), type=type(tev.ev).__name__, text=tev.ev.text) + ivaux = ET.SubElement(ivstreams, 'stream') ivaux.set('type', 'aux') -- cgit v1.2.3-70-g09d2 From 368b5db51d76c162656abd26c88991f0f7f8a556 Mon Sep 17 00:00:00 2001 From: Grissess Date: Sun, 12 Jun 2016 22:49:51 -0400 Subject: Removed track duplication kludge from mkiv and moved to broadcast --- broadcast.py | 33 +++++++++++++++++++++++---------- mkiv.py | 38 ++++++++++++++------------------------ 2 files changed, 37 insertions(+), 34 deletions(-) (limited to 'mkiv.py') diff --git a/broadcast.py b/broadcast.py index 714533d..c7d379d 100644 --- a/broadcast.py +++ b/broadcast.py @@ -7,6 +7,7 @@ import threading import thread import optparse import random +import itertools from packet import Packet, CMD, itos @@ -33,12 +34,14 @@ parser.add_option('-r', '--route', dest='routes', action='append', help='Add a r 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('-B', '--bind-addr', dest='bind_addr', help='The IP address (or IP:port) to bind to (influences the network to send to)') +parser.add_option('--repeat', dest='repeat', action='store_true', help='Repeat the file playlist indefinitely') +parser.add_option('-n', '--number', dest='number', type='int', help='Number of clients to use; if negative (default -1), use the product of stream count and the absolute value of this parameter') parser.add_option('-G', '--gui', dest='gui', default='', help='set a GUI to use') parser.add_option('--pg-fullscreen', dest='fullscreen', action='store_true', help='Use a full-screen video mode') parser.add_option('--pg-width', dest='pg_width', type='int', help='Width of the pygame window') parser.add_option('--pg-height', dest='pg_height', type='int', help='Width of the pygame window') parser.add_option('--help-routes', dest='help_routes', action='store_true', help='Show help about routing directives') -parser.set_defaults(routes=[], test_delay=0.25, 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, bind_addr='', pg_width = 0, pg_height = 0) +parser.set_defaults(routes=[], test_delay=0.25, 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, bind_addr='', pg_width = 0, pg_height = 0, number=-1) options, args = parser.parse_args() if options.help_routes: @@ -302,6 +305,9 @@ if options.live or options.list_live: del active_set[pitch] deferred_set.clear() +if options.repeat: + args = itertools.cycle(args) + for fname in args: try: iv = ET.parse(fname).getroot() @@ -313,9 +319,11 @@ for fname in args: notestreams = iv.findall("./streams/stream[@type='ns']") groups = set([ns.get('group') for ns in notestreams if 'group' in ns.keys()]) + number = (len(notestreams) * abs(options.number) if options.number < 0 else options.number) print len(notestreams), 'notestreams' print len(clients), 'clients' print len(groups), 'groups' + print number, 'clients used (number)' class Route(object): def __init__(self, fattr, fvalue, group, excl=False): @@ -461,7 +469,7 @@ for fname in args: return time.sleep(t) def run(self): - nsq, cl = self._Thread__args + nsq, cls = self._Thread__args for note in nsq: ttime = float(note.get('time')) pitch = float(note.get('pitch')) + options.transpose @@ -469,7 +477,8 @@ for fname in args: 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)), int(vel*2 * options.volume/255.0))), cl) + for cl in cls: + s.sendto(str(Packet(CMD.PLAY, int(dur), int((dur*1000000)%1000000), int(440.0 * 2**((pitch-69)/12.0)), int(vel*2 * options.volume/255.0))), cl) if options.verbose: print (time.time() - BASETIME), cl, ': PLAY', pitch, dur, vel playing_notes[cl] = (pitch, vel*2) @@ -478,24 +487,28 @@ for fname in args: if options.verbose: print '% 6.5f'%(time.time() - BASETIME,), cl, ': DONE' - threads = [] - for ns in notestreams: + threads = {} + nscycle = itertools.cycle(notestreams) + for idx, ns in zip(xrange(number), nscycle): cli = routeset.Route(ns) if cli: nsq = ns.findall('note') - threads.append(NSThread(args=(nsq, cli))) + if ns in threads: + threads[ns]._Thread__args[1].add(cli) + else: + threads[ns] = NSThread(args=(nsq, set([cli]))) if options.verbose: print 'Playback threads:' - for thr in threads: + for thr in threads.values(): print thr._Thread__args[1] BASETIME = time.time() - (options.seek*factor) if options.seek > 0: - for thr in threads: + for thr in threads.values(): thr.drop_missed() - for thr in threads: + for thr in threads.values(): thr.start() - for thr in threads: + for thr in threads.values(): thr.join() print fname, ': Done!' diff --git a/mkiv.py b/mkiv.py index 03b3fdf..717220c 100644 --- a/mkiv.py +++ b/mkiv.py @@ -29,12 +29,11 @@ parser.add_option('--help-conds', dest='help_conds', action='store_true', help=' parser.add_option('-p', '--program-split', dest='tracks', action='append_const', const=PROGRAMS, help='Ensure all programs are on non-mutual streams (overrides -T presently)') parser.add_option('-P', '--percussion', dest='perc', help='Which percussion standard to use to automatically filter to "perc" (GM, GM2, or none)') parser.add_option('-f', '--fuckit', dest='fuckit', action='store_true', help='Use the Python Error Steamroller when importing MIDIs (useful for extended formats)') -parser.add_option('-n', '--target-num', dest='repeaterNumber', type='int', help='Target count of devices') parser.add_option('-v', '--verbose', dest='verbose', action='store_true', help='Be verbose; show important parts about the MIDI scheduling process') -parser.add_option('-d', '--debug', dest='debug', action='store_true', help='Debugging output; show excessive output about the MIDI scheduling process') +parser.add_option('-d', '--debug', dest='debug', action='store_true', help='Debugging output; show excessive output about the MIDI scheduling process (please use less or write to a file)') parser.add_option('-D', '--deviation', dest='deviation', type='int', help='Amount (in semitones/MIDI pitch units) by which a fully deflected pitchbend modifies the base pitch (0 disables pitchbend processing)') parser.add_option('--tempo', dest='tempo', help='Adjust interpretation of tempo (try "f1"/"global", "f2"/"track")') -parser.set_defaults(tracks=[], repeaterNumber=1, perc='GM', deviation=2, tempo='global') +parser.set_defaults(tracks=[], perc='GM', deviation=2, tempo='global') options, args = parser.parse_args() if options.tempo == 'f1': options.tempo == 'global' @@ -447,27 +446,18 @@ for fname in args: ivstreams = ET.SubElement(iv, 'streams') - x = 0 - while(x=options.repeaterNumber and options.repeaterNumber!=1): - break - if(x>=options.repeaterNumber and options.repeaterNumber!=1): - break - if(x>=options.repeaterNumber and options.repeaterNumber!=1): - break + for group in notegroups: + for ns in group.streams: + ivns = ET.SubElement(ivstreams, 'stream') + ivns.set('type', 'ns') + if group.name is not None: + ivns.set('group', group.name) + for note in ns.history: + ivnote = ET.SubElement(ivns, 'note') + ivnote.set('pitch', str(note.pitch)) + ivnote.set('vel', str(note.ev.velocity)) + ivnote.set('time', str(note.abstime)) + ivnote.set('dur', str(note.duration)) ivtext = ET.SubElement(ivstreams, 'stream', type='text') for tev in textstream: -- cgit v1.2.3-70-g09d2