From bab20d4625ddddad7911d548edca12cc0ea93c6b Mon Sep 17 00:00:00 2001 From: Grissess Date: Mon, 12 Sep 2016 11:52:50 -0400 Subject: DRUM SUPPORT! --- shiv.py | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 4 deletions(-) (limited to 'shiv.py') diff --git a/shiv.py b/shiv.py index ac6e2b1..051d175 100644 --- a/shiv.py +++ b/shiv.py @@ -8,6 +8,7 @@ import math parser = optparse.OptionParser() parser.add_option('-n', '--number', dest='number', action='store_true', help='Show number of tracks') parser.add_option('-g', '--groups', dest='groups', action='store_true', help='Show group names') +parser.add_option('-G', '--group', dest='group', action='append', help='Only compute for this group (may be specified multiple times)') parser.add_option('-N', '--notes', dest='notes', action='store_true', help='Show number of notes') parser.add_option('-M', '--notes-stream', dest='notes_stream', action='store_true', help='Show notes per stream') parser.add_option('-m', '--meta', dest='meta', action='store_true', help='Show meta track information') @@ -23,8 +24,9 @@ parser.add_option('-x', '--aux', dest='aux', action='store_true', help='Show inf 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') +parser.add_option('-t', '--total', dest='total', action='store_true', help='Make cross-file totals') -parser.set_defaults(height=20) +parser.set_defaults(height=20, group=[]) options, args = parser.parse_args() @@ -65,6 +67,7 @@ else: def show_hist(values, height=None): if not values: print '{empty histogram}' + return if height is None: height = options.height xs, ys = values.keys(), values.values() @@ -85,16 +88,29 @@ def show_hist(values, height=None): print COL.YELLOW + '\t ' + ''.join([s[i] if len(s) > i else ' ' for s in xcs]) + COL.NONE print +if options.total: + tot_note_cnt = 0 + max_note_cnt = 0 + tot_pitches = {} + tot_velocities = {} + tot_dur = 0 + max_dur = 0 + tot_streams = 0 + max_streams = 0 + tot_notestreams = 0 + max_notestreams = 0 + tot_groups = {} + for fname in args: + print + print 'File :', fname try: iv = ET.parse(fname).getroot() - except IOError: + except Exception: import traceback traceback.print_exc() print 'Bad file :', fname, ', skipping...' continue - print - print 'File :', fname print '\t' if options.meta: @@ -115,10 +131,19 @@ for fname in args: 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.group: + print 'NOTE: Restricting results to groups', options.group, 'as requested' + notestreams = [ns for ns in notestreams if ns.get('group', '') in options.group] + if options.number: print 'Stream count:' print '\tNotestreams:', len(notestreams) print '\tTotal:', len(streams) + if options.total: + tot_streams += len(streams) + max_streams = max(max_streams, len(streams)) + tot_notestreams += len(notestreams) + max_notestreams = max(max_notestreams, len(notestreams)) 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 @@ -128,6 +153,8 @@ for fname in args: for s in notestreams: group = s.get('group', '') groups[group] = groups.get(group, 0) + 1 + if options.total: + tot_groups[group] = tot_groups.get(group, 0) + 1 print 'Groups:' for name, cnt in groups.iteritems(): print '\t{} ({} streams)'.format(name, cnt) @@ -180,14 +207,20 @@ for fname in args: dur = float(note.get('dur')) if options.notes: note_cnt += 1 + if options.total: + tot_note_cnt += 1 if options.notes_stream: notes_stream[sidx] += 1 if options.histogram: pitches[pitch] = pitches.get(pitch, 0) + 1 + if options.total: + tot_pitches[pitch] = tot_pitches.get(pitch, 0) + 1 if options.histogram_tracks: pitch_tracks[sidx][pitch] = pitch_tracks[sidx].get(pitch, 0) + 1 if options.vel_hist: velocities[vel] = velocities.get(vel, 0) + 1 + if options.total: + tot_velocities[vel] = tot_velocities.get(vel, 0) + 1 if options.vel_hist_tracks: velocities_tracks[sidx][vel] = velocities_tracks[sidx].get(vel, 0) + 1 if (options.duration or options.duty_cycle) and time + dur > max_dur: @@ -195,6 +228,9 @@ for fname in args: if options.duty_cycle: cum_dur[sidx] += dur + if options.notes and options.total: + max_note_cnt = max(max_note_cnt, note_cnt) + if options.histogram_tracks: for sidx, hist in enumerate(pitch_tracks): print 'Stream {} (group {}) pitch histogram:'.format(sidx, notestreams[sidx].get('group', '')) @@ -219,3 +255,27 @@ for fname in args: show_hist(velocities) if options.duration: print 'Playing duration: {}'.format(max_dur) + +if options.total: + print 'Totals:' + if options.number: + print '\tTotal streams:', tot_streams + print '\tMax streams:', max_streams + print '\tTotal notestreams:', tot_notestreams + print '\tMax notestreams:', max_notestreams + print + if options.notes: + print '\tTotal notes:', tot_note_cnt + print '\tMax notes:', max_note_cnt + print + if options.groups: + print '\tGroups:' + for grp, cnt in tot_groups.iteritems(): + print '\t\t', grp, ':', cnt + print + if options.histogram: + print 'Overall pitch histogram:' + show_hist(tot_pitches) + if options.vel_hist: + print 'Overall velocity histogram:' + show_hist(tot_velocities) -- cgit v1.2.3-70-g09d2 From 19d054741ba632d4cc664b89e694d07fe0b568f1 Mon Sep 17 00:00:00 2001 From: Graham Northup Date: Wed, 15 Feb 2017 19:52:01 -0500 Subject: Tools to make GRUB_INIT_TUNEs! --- downsamp.py | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ mkiv.py | 3 ++ mktune.py | 63 ++++++++++++++++++++++++++++++++ shiv.py | 8 ++--- 4 files changed, 187 insertions(+), 4 deletions(-) create mode 100644 downsamp.py create mode 100644 mktune.py (limited to 'shiv.py') diff --git a/downsamp.py b/downsamp.py new file mode 100644 index 0000000..f7a0255 --- /dev/null +++ b/downsamp.py @@ -0,0 +1,117 @@ +from xml.etree import ElementTree as ET +import optparse +import os + +parser = optparse.OptionParser() +parser.add_option('-f', '--frequency', dest='frequency', type='float', help='How often to switch between active streams') +parser.set_defaults(frequency=0.016) +options, args = parser.parse_args() + +class Note(object): + def __init__(self, time, dur, pitch, ampl): + self.time = time + self.dur = dur + self.pitch = pitch + self.ampl = ampl + +for fname in args: + try: + iv = ET.parse(fname).getroot() + except IOError: + import traceback + traceback.print_exc() + print fname, ': Bad file' + continue + + print '----', fname, '----' + + notestreams = iv.findall("./streams/stream[@type='ns']") + print len(notestreams), 'notestreams' + + print 'Loading all events...' + + evs = [] + + dur = 0.0 + + for ns in notestreams: + for note in ns.findall('note'): + n = Note( + float(note.get('time')), + float(note.get('dur')), + float(note.get('pitch')), + float(note.get('ampl', float(note.get('vel', 127.0)) / 127.0)), + ) + evs.append(n) + if n.time + n.dur > dur: + dur = n.time + n.dur + + print len(evs), 'events' + print dur, 'duration' + + print 'Scheduling events...' + + sched = {} + + t = 0.0 + i = 0 + while t <= dur: + nextt = t + options.frequency + #print '-t', t, 'nextt', nextt + + evs_now = [n for n in evs if n.time <= t and t < n.time + n.dur] + if evs_now: + holding = False + count = 0 + while count < len(evs_now): + selidx = (count + i) % len(evs_now) + sel = evs_now[selidx] + sched[t] = (sel.pitch, sel.ampl) + if sel.time + sel.dur >= nextt: + holding = True + break + t = sel.time + sel.dur + count += 1 + if not holding: + sched[t] = (0, 0) + else: + sched[t] = (0, 0) + + t = nextt + i += 1 + + print len(sched), 'events scheduled' + + print 'Writing out schedule...' + + newiv = ET.Element('iv') + newiv.append(iv.find('meta')) + newivstreams = ET.SubElement(newiv, 'streams') + newivstream = ET.SubElement(newivstreams, 'stream', type='ns') + + prevt = None + prevev = None + for t, ev in sorted(sched.items(), key=lambda pair: pair[0]): + if prevt is not None: + if prevev[0] != 0: + ET.SubElement(newivstream, 'note', + pitch = str(prevev[0]), + ampl = str(prevev[1]), + time = str(prevt), + dur = str(t - prevt), + ) + prevev = ev + prevt = t + + t = dur + if prevev[0] != 0: + ET.SubElement(newivstream, 'note', + pitch = str(prevev[0]), + ampl = str(prevev[1]), + time = str(prevt), + dur = str(t - prevt), + ) + + print 'Done.' + txt = ET.tostring(newiv, 'UTF-8') + open(os.path.splitext(os.path.basename(fname))[0]+'.downsampled.iv', 'wb').write(txt) diff --git a/mkiv.py b/mkiv.py index 3ab4081..f363027 100644 --- a/mkiv.py +++ b/mkiv.py @@ -705,6 +705,9 @@ for fname in args: ivev.set('time', str(mev.abstime)) ivev.set('data', repr(fw.encode_midi_event(mev.ev))) + ivargs = ET.SubElement(ivmeta, 'args') + ivargs.text = ' '.join('%r' % (i,) for i in sys.argv[1:]) + print 'Done.' txt = ET.tostring(iv, 'UTF-8') open(os.path.splitext(os.path.basename(fname))[0]+'.iv', 'wb').write(txt) diff --git a/mktune.py b/mktune.py new file mode 100644 index 0000000..57715b9 --- /dev/null +++ b/mktune.py @@ -0,0 +1,63 @@ +from xml.etree import ElementTree as ET +import optparse + +parser = optparse.OptionParser() +parser.add_option('-t', '--tempo', dest='tempo', type='float', help='Tempo (in BPM)') +parser.add_option('-r', '--resolution', dest='resolution', type='float', help='Approximate resolution in seconds (overrides tempo)') +parser.add_option('-f', '--float', dest='float', action='store_true', help='Allow floating point representations on output') +parser.add_option('-T', '--transpose', dest='transpose', type='float', help='Transpose by this many semitones') +parser.set_defaults(tempo=60000, resolution=None, transpose=0) +options, args = parser.parse_args() + +maybe_int = int +if options.float: + maybe_int = float + +class Note(object): + def __init__(self, time, dur, pitch, ampl): + self.time = time + self.dur = dur + self.pitch = pitch + self.ampl = ampl + +if options.resolution is not None: + options.tempo = 60.0 / options.resolution + +options.tempo = maybe_int(options.tempo) + +def to_beats(tm): + return options.tempo * tm / 60.0 + +for fname in args: + try: + iv = ET.parse(fname).getroot() + except IOError: + import traceback + traceback.print_exc() + print fname, ': Bad file' + continue + + print options.tempo, + + ns = iv.find('./streams/stream[@type="ns"]') + prevn = None + for note in ns.findall('note'): + n = Note( + float(note.get('time')), + float(note.get('dur')), + float(note.get('pitch')) + options.transpose, + float(note.get('ampl', float(note.get('vel', 127.0)) / 127.0)), + ) + if prevn is not None: + rtime = to_beats(n.time - (prevn.time + prevn.dur)) + if rtime >= 1: + print 0, maybe_int(rtime), + ntime = to_beats(prevn.dur) + if ntime < 1 and not options.float: + ntime = 1 + print maybe_int(440.0 * 2**((prevn.pitch-69)/12.0)), maybe_int(ntime), + prevn = n + ntime = to_beats(n.dur) + if ntime < 1 and not options.float: + ntime = 1 + print int(440.0 * 2**((n.pitch-69)/12.0)), int(ntime), diff --git a/shiv.py b/shiv.py index 051d175..f19ec51 100644 --- a/shiv.py +++ b/shiv.py @@ -202,7 +202,7 @@ for fname in args: notes = stream.findall('note') for note in notes: pitch = float(note.get('pitch')) - vel = int(note.get('vel')) + ampl = float(note.get('ampl', float(note.get('vel', 127.0)) / 127.0)) time = float(note.get('time')) dur = float(note.get('dur')) if options.notes: @@ -218,11 +218,11 @@ for fname in args: if options.histogram_tracks: pitch_tracks[sidx][pitch] = pitch_tracks[sidx].get(pitch, 0) + 1 if options.vel_hist: - velocities[vel] = velocities.get(vel, 0) + 1 + velocities[ampl] = velocities.get(ampl, 0) + 1 if options.total: - tot_velocities[vel] = tot_velocities.get(vel, 0) + 1 + tot_velocities[ampl] = tot_velocities.get(ampl, 0) + 1 if options.vel_hist_tracks: - velocities_tracks[sidx][vel] = velocities_tracks[sidx].get(vel, 0) + 1 + velocities_tracks[sidx][ampl] = velocities_tracks[sidx].get(ampl, 0) + 1 if (options.duration or options.duty_cycle) and time + dur > max_dur: max_dur = time + dur if options.duty_cycle: -- cgit v1.2.3-70-g09d2 From 4135f3a6f2b763fa6c952e2fd580b30b9e31d548 Mon Sep 17 00:00:00 2001 From: Graham Northup Date: Mon, 2 Oct 2017 16:14:07 -0400 Subject: Minor bugfixes and featurefixes: - shiv now assumes -a if you give it no other options; - broadcast now displays a cute spinny and progress bar when playing without -v set - drums.py obeys -V when testing (-t) --- broadcast.py | 24 ++++++++++++++++++++++-- drums.py | 2 +- shiv.py | 17 +++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) (limited to 'shiv.py') diff --git a/broadcast.py b/broadcast.py index 2c59304..ee422c0 100644 --- a/broadcast.py +++ b/broadcast.py @@ -9,6 +9,7 @@ import optparse import random import itertools import re +import os from packet import Packet, CMD, itos, OBLIGATE_POLYPHONE @@ -142,6 +143,13 @@ factor = options.factor print 'Factor:', factor +try: + rows, columns = map(int, os.popen('stty size', 'r').read().split()) +except Exception: + import traceback + traceback.print_exc() + rows, columns = 25, 80 + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) if options.bind_addr: @@ -316,7 +324,7 @@ if options.live or options.list_live: deferred_set.add(event.pitch) continue cli = active_set[event.pitch].pop() - s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0)), cli) + s.sendto(str(Packet(CMD.PLAY, 0, 1, 1, 0, cli[2])), cli[:2]) playing_notes[cli] = (0, 0) if options.verbose: print 'LIVE:', event.pitch, '- =>', active_set[event.pitch] @@ -547,7 +555,7 @@ for fname in args: s.sendto(str(Packet(CMD.PLAY, int(dur), int((dur*1000000)%1000000), int(440.0 * 2**((pitch-69)/12.0)), ampl * options.volume, cl[2])), cl[:2]) playing_notes[cl] = (pitch, ampl) if i > 0 and dur is not None: - self.cur_offt = ttime + dur + self.cur_offt = ttime + dur / options.factor else: if self.cur_offt: if factor * self.cur_offt <= time.time() - BASETIME: @@ -626,9 +634,13 @@ for fname in args: print thr._Thread__args[1] BASETIME = time.time() - (options.seek*factor) + ENDTIME = max(max(float(n.get('time')) + float(n.get('dur')) for n in thr._Thread__args[0]) for thr in threads.values()) + print 'Playtime is', ENDTIME if options.seek > 0: for thr in threads.values(): thr.drop_missed() + spin_phase = 0 + SPINNERS = ['-', '\\', '|', '/'] while not all(thr.done for thr in threads.values()): for thr in threads.values(): if thr.next_t is None or factor * thr.next_t <= time.time() - BASETIME: @@ -639,6 +651,14 @@ for fname in args: break if options.verbose: print 'TICK DELTA:', delta + else: + sys.stdout.write('\x1b[G\x1b[K[%s]' % ( + ('#' * int((time.time() - BASETIME) * (columns - 2) / (ENDTIME * factor)) + SPINNERS[spin_phase]).ljust(columns - 2), + )) + sys.stdout.flush() + spin_phase += 1 + if spin_phase >= len(SPINNERS): + spin_phase = 0 if delta >= 0 and not options.spin: time.sleep(delta) print fname, ': Done!' diff --git a/drums.py b/drums.py index 1ee7c1e..a6d8399 100644 --- a/drums.py +++ b/drums.py @@ -123,7 +123,7 @@ if options.test: print 'Current playing:', PLAYING print 'Playing:', frq data = DRUMS[frq] - PLAYING.append(SampleReader(data, len(data), 1.0)) + PLAYING.append(SampleReader(data, len(data), options.volume)) time.sleep(len(data) / (4.0 * options.rate)) print 'Done' exit() diff --git a/shiv.py b/shiv.py index f19ec51..fe82006 100644 --- a/shiv.py +++ b/shiv.py @@ -30,6 +30,23 @@ parser.set_defaults(height=20, group=[]) options, args = parser.parse_args() +if not any(( + options.number, + options.groups, + options.notes, + options.notes_stream, + options.histogram, + options.vel_hist, + options.duration, + options.duty_cycle, + options.aux, + options.meta, + options.histogram_tracks, + options.vel_hist_tracks, +)): + print 'No computations specified! Assuming you meant --almost-all...' + options.almost_all = True + if options.almost_all or options.all: options.number = True options.groups = True -- cgit v1.2.3-70-g09d2 From 7654ad67b46bb7e072cbe4a1f3dfb9c115bfeded Mon Sep 17 00:00:00 2001 From: Graham Northup Date: Mon, 12 Mar 2018 17:59:25 -0400 Subject: Slack time, 24-bit color client terminal printing, and default T:perc routing --- broadcast.py | 3 ++- client.py | 42 +++++++++++++++++++++++++++++++----------- drums.py | 34 ++++++++++++++++++++++++++++++++-- mkiv.py | 37 ++++++++++++++++++++++++++++++++++--- shiv.py | 2 +- 5 files changed, 100 insertions(+), 18 deletions(-) (limited to 'shiv.py') diff --git a/broadcast.py b/broadcast.py index ee422c0..1efbda3 100644 --- a/broadcast.py +++ b/broadcast.py @@ -33,6 +33,7 @@ parser.add_option('-s', '--silence', dest='silence', action='store_true', help=' 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 0: - pitchval = float(FREQ - options.low_freq) / (options.high_freq - options.low_freq) - if options.log_base == 0: - try: - pitchval = math.log(pitchval) / math.log(options.log_base) - except ValueError: - pass - bgcol = colorsys.hls_to_rgb(min((1.0, max((0.0, pitchval)))), 0.5 * ((AMP / float(MAX)) ** 2), 1.0) - bgcol = [int(j*255) for j in bgcol] + bgcol = rgb_for_freq_amp(FREQ, float(AMP) / MAX) else: bgcol = (0, 0, 0) #print i, ':', pitchval @@ -420,6 +424,7 @@ sock.bind(('', PORT)) #signal.signal(signal.SIGALRM, sigalrm) +counter = 0 while True: data = '' while not data: @@ -428,12 +433,17 @@ while True: except socket.error: pass pkt = Packet.FromStr(data) - print 'From', cli, 'command', pkt.cmd + crgb = [int(i*255) for i in colorsys.hls_to_rgb((float(counter) / options.counter_modulus) % 1.0, 0.5, 1.0)] + print '\x1b[38;2;{};{};{}m#'.format(*crgb), + counter += 1 + print '\x1b[mFrom', cli, 'command', pkt.cmd, if pkt.cmd == CMD.KA: - pass + print '\x1b[37mKA' elif pkt.cmd == CMD.PING: sock.sendto(data, cli) + print '\x1b[1;33mPING' elif pkt.cmd == CMD.QUIT: + print '\x1b[1;31mQUIT' break elif pkt.cmd == CMD.PLAY: voice = pkt.data[4] @@ -441,6 +451,15 @@ while True: FREQS[voice] = pkt.data[2] AMPS[voice] = MAX * max(min(pkt.as_float(3), 1.0), 0.0) EXPIRATIONS[voice] = time.time() + dur + vrgb = [int(i*255) for i in colorsys.hls_to_rgb(float(voice) / STREAMS * 2.0 / 3.0, 0.5, 1.0)] + frgb = rgb_for_freq_amp(pkt.data[2], pkt.as_float(3)) + print '\x1b[1;32mPLAY', + print '\x1b[1;38;2;{};{};{}mVOICE'.format(*vrgb), '{:03}'.format(voice), + print '\x1b[1;38;2;{};{};{}mFREQ'.format(*frgb), '{:04}'.format(pkt.data[2]), 'AMP', '%08.6f'%pkt.as_float(3), + if pkt.data[0] == 0 and pkt.data[1] == 0: + print '\x1b[1;35mSTOP!!!' + else: + print '\x1b[1;36mDUR', '%08.6f'%dur #signal.setitimer(signal.ITIMER_REAL, dur) elif pkt.cmd == CMD.CAPS: data = [0] * 8 @@ -449,6 +468,7 @@ while True: for i in xrange(len(UID)/4 + 1): data[i+2] = stoi(UID[4*i:4*(i+1)]) sock.sendto(str(Packet(CMD.CAPS, *data)), cli) + print '\x1b[1;34mCAPS' elif pkt.cmd == CMD.PCM: fdata = data[4:] fdata = struct.pack('16i', *[i<<16 for i in struct.unpack('16h', fdata)]) diff --git a/drums.py b/drums.py index a6d8399..62d8ae0 100644 --- a/drums.py +++ b/drums.py @@ -6,6 +6,7 @@ import wave import cStringIO as StringIO import array import time +import colorsys from packet import Packet, CMD, stoi, OBLIGATE_POLYPHONE @@ -19,6 +20,10 @@ parser.add_option('-p', '--port', dest='port', default=13676, type='int', help=' parser.add_option('--repeat', dest='repeat', action='store_true', help='If a note plays longer than a sample length, keep playing the sample') parser.add_option('--cut', dest='cut', action='store_true', help='If a note ends within a sample, stop playing that sample immediately') parser.add_option('-n', '--max-voices', dest='max_voices', default=-1, type='int', help='Only support this many notes playing simultaneously (earlier ones get dropped)') +parser.add_option('--pg-low-freq', dest='low_freq', type='int', default=40, help='Low frequency for colored background') +parser.add_option('--pg-high-freq', dest='high_freq', type='int', default=1500, help='High frequency for colored background') +parser.add_option('--pg-log-base', dest='log_base', type='int', default=2, help='Logarithmic base for coloring (0 to make linear)') +parser.add_option('--counter-modulus', dest='counter_modulus', type='int', default=16, help='Number of packet events in period of the terminal color scroll on the left margin') options, args = parser.parse_args() @@ -31,6 +36,16 @@ if not args: parser.print_usage() exit(1) +def rgb_for_freq_amp(f, a): + pitchval = float(f - options.low_freq) / (options.high_freq - options.low_freq) + if options.log_base == 0: + try: + pitchval = math.log(pitchval) / math.log(options.log_base) + except ValueError: + pass + bgcol = colorsys.hls_to_rgb(min((1.0, max((0.0, pitchval)))), 0.5 * (a ** 2), 1.0) + return [int(i*255) for i in bgcol] + DRUMS = {} for fname in args: @@ -134,6 +149,7 @@ sock.bind(('', options.port)) #signal.signal(signal.SIGALRM, sigalrm) +counter = 0 while True: data = '' while not data: @@ -142,12 +158,17 @@ while True: except socket.error: pass pkt = Packet.FromStr(data) - print 'From', cli, 'command', pkt.cmd + crgb = [int(i*255) for i in colorsys.hls_to_rgb((float(counter) / options.counter_modulus) % 1.0, 0.5, 1.0)] + print '\x1b[38;2;{};{};{}m#'.format(*crgb), + counter += 1 + print '\x1b[mFrom', cli, 'command', pkt.cmd, if pkt.cmd == CMD.KA: - pass + print '\x1b[37mKA' elif pkt.cmd == CMD.PING: sock.sendto(data, cli) + print '\x1b[1;33mPING' elif pkt.cmd == CMD.QUIT: + print '\x1b[1;31mQUIT' break elif pkt.cmd == CMD.PLAY: frq = pkt.data[2] @@ -167,6 +188,14 @@ while True: if options.max_voices >= 0: while len(PLAYING) > options.max_voices: PLAYING.pop(0) + frgb = rgb_for_freq_amp(pkt.data[2], pkt.as_float(3)) + print '\x1b[1;32mPLAY', + print '\x1b[1;34mVOICE', '{:03}'.format(pkt.data[4]), + print '\x1b[1;38;2;{};{};{}mFREQ'.format(*frgb), '{:04}'.format(pkt.data[2]), 'AMP', '%08.6f'%pkt.as_float(3), + if pkt.data[0] == 0 and pkt.data[1] == 0: + print '\x1b[1;35mSTOP!!!' + else: + print '\x1b[1;36mDUR', '%08.6f'%dur #signal.setitimer(signal.ITIMER_REAL, dur) elif pkt.cmd == CMD.CAPS: data = [0] * 8 @@ -175,6 +204,7 @@ while True: for i in xrange(len(options.uid)/4 + 1): data[i+2] = stoi(options.uid[4*i:4*(i+1)]) sock.sendto(str(Packet(CMD.CAPS, *data)), cli) + print '\x1b[1;34mCAPS' # elif pkt.cmd == CMD.PCM: # fdata = data[4:] # fdata = struct.pack('16i', *[i<<16 for i in struct.unpack('16h', fdata)]) diff --git a/mkiv.py b/mkiv.py index e914f8a..0c87372 100644 --- a/mkiv.py +++ b/mkiv.py @@ -42,10 +42,11 @@ parser.add_option('--string-rate-off', dest='stringoffrate', type='float', help= parser.add_option('--string-threshold', dest='stringthres', type='float', help='Amplitude (as fraction of original) at which point the string model event is terminated') parser.add_option('--tempo', dest='tempo', help='Adjust interpretation of tempo (try "f1"/"global", "f2"/"track")') parser.add_option('--epsilon', dest='epsilon', type='float', help='Don\'t consider overlaps smaller than this number of seconds (which regularly happen due to precision loss)') +parser.add_option('--slack', dest='slack', type='float', help='Inflate the duration of events by this much when scheduling them--this is for clients which need time to release their streams') parser.add_option('--vol-pow', dest='vol_pow', type='float', help='Exponent to raise volume changes (adjusts energy per delta volume)') parser.add_option('-0', '--keep-empty', dest='keepempty', action='store_true', help='Keep (do not cull) events with 0 duration in the output file') parser.add_option('--no-text', dest='no_text', action='store_true', help='Disable text streams (useful for unusual text encodings)') -parser.set_defaults(tracks=[], perc='GM', deviation=2, tempo='global', modres=0.005, modfdev=2.0, modffreq=8.0, modadev=0.5, modafreq=8.0, stringres=0, stringmax=1024, stringrateon=0.7, stringrateoff=0.4, stringthres=0.02, epsilon=1e-12, vol_pow=2) +parser.set_defaults(tracks=[], perc='GM', deviation=2, tempo='global', modres=0.005, modfdev=2.0, modffreq=8.0, modadev=0.5, modafreq=8.0, stringres=0, stringmax=1024, stringrateon=0.7, stringrateoff=0.4, stringthres=0.02, epsilon=1e-12, slack=0.0, vol_pow=2) options, args = parser.parse_args() if options.tempo == 'f1': options.tempo == 'global' @@ -315,12 +316,13 @@ for fname in args: print 'Generating streams...' class DurationEvent(MergeEvent): - __slots__ = ['duration', 'pitch', 'modwheel', 'ampl'] + __slots__ = ['duration', 'real_duration', 'pitch', 'modwheel', 'ampl'] def __init__(self, me, pitch, ampl, dur, modwheel=0): MergeEvent.__init__(self, me.ev, me.tidx, me.abstime, me.bank, me.prog, me.mw) self.pitch = pitch self.ampl = ampl self.duration = dur + self.real_duration = dur self.modwheel = modwheel def __repr__(self): @@ -482,6 +484,35 @@ for fname in args: print 'WARNING: Active notes at end of playback.' ns.Deactivate(MergeEvent(ns.active, ns.active.tidx, lastabstime)) + if options.slack > 0: + print 'Adding slack time...' + + slack_evs = [] + for group in notegroups: + for ns in group.streams: + for dev in ns.history: + dev.duration += options.slack + slack_evs.append(dev) + + print 'Resorting all streams...' + for group in notegroups: + group.streams = [] + + for dev in slack_evs: + for group in notegroups: + if not group.filter(dev): + continue + for ns in group.streams: + if dev.abstime >= ns.history[-1].abstime + ns.history[-1].duration: + ns.history.append(dev) + break + else: + group.streams.append(NoteStream()) + group.streams[-1].history.append(dev) + break + else: + print 'WARNING: No stream accepts event', dev + if options.modres > 0: print 'Resolving modwheel events...' ev_cnt = 0 @@ -685,7 +716,7 @@ for fname in args: ivnote.set('vel', str(int(note.ampl * 127.0))) ivnote.set('ampl', str(note.ampl)) ivnote.set('time', str(note.abstime)) - ivnote.set('dur', str(note.duration)) + ivnote.set('dur', str(note.real_duration)) if not options.no_text: ivtext = ET.SubElement(ivstreams, 'stream', type='text') diff --git a/shiv.py b/shiv.py index fe82006..e8cc37d 100644 --- a/shiv.py +++ b/shiv.py @@ -219,7 +219,7 @@ for fname in args: notes = stream.findall('note') for note in notes: pitch = float(note.get('pitch')) - ampl = float(note.get('ampl', float(note.get('vel', 127.0)) / 127.0)) + ampl = int(127 * float(note.get('ampl', float(note.get('vel', 127.0)) / 127.0))) time = float(note.get('time')) dur = float(note.get('dur')) if options.notes: -- cgit v1.2.3-70-g09d2