X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fmidi.scm;h=358fa0accaa7ea7d22cdc8812388c83e77b97464;hb=d6dcc9a3befb6977fc7dd31726598802c21111ee;hp=cef0fae28b07d31369ec4860f2eae14120131f43;hpb=c2ccda3e91d408453744bd03882c6b0584a9561a;p=lilypond.git diff --git a/scm/midi.scm b/scm/midi.scm index cef0fae28b..358fa0acca 100644 --- a/scm/midi.scm +++ b/scm/midi.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2000--2006 Jan Nieuwenhuizen +;;;; (c) 2000--2009 Jan Nieuwenhuizen @@ -103,7 +103,7 @@ ("electric guitar (muted)" . ,(- 29 1)) ("overdriven guitar" . ,(- 30 1)) ("distorted guitar" . ,(- 31 1)) - ("guitar harmo(dinics" . ,(- 32 1)) + ("guitar harmonics" . ,(- 32 1)) ; (33-40 bass) ("acoustic bass" . ,(- 33 1)) @@ -122,7 +122,7 @@ ("contrabass" . ,(- 44 1)) ("tremolo strings" . ,(- 45 1)) ("pizzicato strings" . ,(- 46 1)) - ("orchestral strings" . ,(- 47 1)) + ("orchestral harp" . ,(- 47 1)) ("timpani" . ,(- 48 1)) ; (49-56 ensemble) @@ -284,18 +284,17 @@ returns the program of the instrument ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -(define-public (write-performances-midis performances basename) - (let - loop - ((perfs performances) - (count 0)) - - - (if (pair? perfs) - (begin - (ly:performance-write - (car perfs) - (if (> count 0) - (format #f "~a-~a.midi" basename count) - (format #f "~a.midi" basename))) - (loop (cdr perfs) (1+ count)))))) +(define-public (write-performances-midis performances basename . rest) + (let ((midi-ext (ly:get-option 'midi-extension))) + (let + loop + ((perfs performances) + (count (if (null? rest) 0 (car rest)))) + (if (pair? perfs) + (begin + (ly:performance-write + (car perfs) + (if (> count 0) + (format #f "~a-~a.~a" basename count midi-ext) + (format #f "~a.~a" basename midi-ext))) + (loop (cdr perfs) (1+ count)))))))