From 06883b06b2d4d1e495fad6ebf058d1e044910f1b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 5 Oct 2001 14:09:15 +0200 Subject: [PATCH] patch::: 1.5.14.jcn5 1.5.14.jcn5 --- CHANGES | 4 +- VERSION | 2 +- lily/include/lily-guile.hh | 1 + scripts/midi2ly.py | 116 ++++++++++++++++++++++--------------- 4 files changed, 75 insertions(+), 48 deletions(-) diff --git a/CHANGES b/CHANGES index 3b4f34ad68..08e3491f71 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -1.5.14.jcn4 +1.5.14.jcn5 =========== +* Some random typing at midi2ly.py. + * Slightly better doco for r, s and \skip, with examples. * Bugfixes: add-html-footer.py and @MAILADDRESS@. diff --git a/VERSION b/VERSION index 70f2ca8c09..9c836f5b21 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=14 -MY_PATCH_LEVEL=jcn4 +MY_PATCH_LEVEL=jcn5 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 9a0b5d2bd3..77e9bdd6eb 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -77,6 +77,7 @@ SCM ly_write2scm (SCM s); SCM ly_deep_copy (SCM); #ifdef CACHE_SYMBOLS +#warning: CACHE_SYMBOLS /* Using this trick we cache the value of gh_symbol2scm ("fooo") where "fooo" is a constant string. This is done at the cost of one static diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index 26476d49a2..67a584d939 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -2,17 +2,18 @@ import midi import sys +import string -scale_steps =[0,2,4,5,7,9,11] +scale_steps = [0,2,4,5,7,9,11] -def split_channels (track): +def split_track (track): chs = {} for i in range(16): chs[i] = [] for e in track: data = list (e[1]) - c = data[0] & 0x0f + c = data[0] & 0x0f e = (e[0], tuple ([data[0] & 0xf0] + data[1:])) chs[c].append (e) @@ -20,22 +21,22 @@ def split_channels (track): if chs[i] == []: del chs[i] - + whatarewes = [] for v in chs.values (): - ns = notes_on_channel(v) - ns = unthread_notes (ns) - map (dump_thread, ns) - - return chs + ns = notes_on_channel (v) + dinges = unthread_notes (ns) + if len (dinges): + whatarewes.append (dinges) + return whatarewes class Note: - def __init__(self, duration, pitch, velocity): + def __init__ (self, duration, pitch, velocity): self.velocity = velocity self.pitch = pitch self.duration = duration - def duration_compare(a,b): + def duration_compare (a,b): if a.duration < b.duration : return -1 elif a.duration > b.duration: @@ -46,7 +47,7 @@ class Note: def notes_on_channel (channel): pitches = {} - nch= [] + nch = [] for e in channel: t = e[0] @@ -99,29 +100,20 @@ def gcd (a,b): return a def dump_skip (dt): - wholes = dt / (4*384) - dt = dt % (4*384); - quarters = dt / 384 - - # etc. - if (wholes): - print 's1*%d' % wholes - if quarters: - print 's4*%d' % quarters - - + return 's' + dump_duration (dt) def dump_duration (dur): g = gcd (dur, 384) - sys.stdout.write ('4') + s = '4' (p,q) = (dur / g, 384 / g) if (p == 1 and q == 1) : pass else: if p <> 1: - sys.stdout.write ('*%d'% p) + s = '*%d'% p if q <> 1: - sys.stdout.write ('*%d'% q) + s = '*%d'% q + return s def dump_note (note): @@ -136,22 +128,22 @@ def dump_note (note): i = i+1 i = i-1 - str = chr (i + ord ('a')) + str = chr ((i + 2) % 7 + ord ('a')) if scale_steps[i] <> step: str = str + 'is' - sys.stdout.write (' %s' % str); - dump_duration (note.duration) + return ' %s' % str + dump_duration (note.duration) def dump_chord (ch): + s = '' if len(ch) == 1: - dump_note (ch[0]) + s = dump_note (ch[0]) else: - sys.stdout.write ("<") - map (dump_note, ch) - sys.stdout.write ('>') + s = '<' + string.join (map (dump_note, ch)) + '>' + return s -def dump_thread (thread): +# thread? +def dump_channel (thread): last_e = None chs = [] ch = [] @@ -161,46 +153,78 @@ def dump_thread (thread): ch.append (e[1]) else: if ch: - chs.append ( (last_e[0], ch)) + chs.append ((last_e[0], ch)) ch = [e[1]] last_e = e - if ch: chs.append ((last_e[0] ,ch)) + if ch: + chs.append ((last_e[0], ch)) t = 0 last_t = 0 + s = '' for ch in chs: t = ch[0] if t - last_t: - dump_skip (t-last_t) + s = s + dump_skip (t-last_t) - dump_chord (ch[1]) + s = s + dump_chord (ch[1]) last_t = t + ch[1][0].duration + + return s def dump_notes (channel): on_hold = [] + s = '' for e in channel: if e[0] <> last_t: - dump_chord (on_hold) + s = s + dump_chord (on_hold) on_hold = [] last_t = e[0] on_hold.append (e) - - - + return s + +def dump_track (channels, n): + s = '' + track = 'track%c' % (n + ord ('A')) + for i in range (len (channels)): + channel = 'channel%c' % (i + ord ('A')) + s = s + '%s = \\context Thread=%s \\notes {\n' % (track + channel, track + channel) + s = s + ' ' + dump_channel (channels[i][0]) + s = s + '\n}\n' + + s = s + '%s = \\context Staff=%s <\n' % (track, track) + + for i in range (len (channels)): + channel = 'channel%c' % (i + ord ('A')) + s = s + ' \\context Voice = %s \\%s\n' % (channel, track + channel) + s = s + '\n>\n' + return s + def convert_midi (f): str = open (f).read () midi_dump = midi.parse (str) - channels = [] - + tracks = [] for t in midi_dump[1]: - channels.append (split_channels (t)) + tracks.append (split_track (t)) + s = '' + for i in range (len (tracks)): + s = s + dump_track (tracks[i], i) + + s = s + '\n\\score {\n <\n' + for i in range (len (tracks)): + track = 'track%c' % (i + ord ('A')) + s = s + ' \\context Staff=%s \\%s\n' % (track, track) + s = s + '\n >\n}\n' + + sys.stdout.write (s) + for f in sys.argv[1:]: - convert_midi (f) + convert_midi (f) -- 2.39.5