X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fmidi.scm;h=715c8c0e37fc8fa1ddf2d32fb9bfae90f188069e;hb=e02128cb6438dea6616c1216e3cb1af636e8c270;hp=be4b3dc720807a9541bea7cb82e06a18bd6f01f5;hpb=18d1d3e16daf265790468505261abf342badc41e;p=lilypond.git

diff --git a/scm/midi.scm b/scm/midi.scm
index be4b3dc720..715c8c0e37 100644
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -1,8 +1,8 @@
-;;; midi.scm -- scm midi variables and functions
-;;;
-;;;  source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; midi.scm -- scm midi variables and functions
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
 
@@ -18,17 +18,17 @@
       '(
 	("sf" . 1.00)
 	("fffff" . 0.95)
-	("ffff" . 0.91)
-	("fff" . 0.81)
-	("ff" . 0.71)
-	("f" . 0.61)
-	("mf" . 0.50)
-	("mp" . 0.40)
-	("p" . 0.30)
-	("pp" . 0.20)
-	("ppp" . 0.10)
-	("pppp" . 0.08)
-	("ppppp" . 0.05)
+	("ffff" . 0.92)
+	("fff" . 0.85)
+	("ff" . 0.80)
+	("f" . 0.75)
+	("mf" . 0.68)
+	("mp" . 0.61)
+	("p" . 0.55)
+	("pp" . 0.49)
+	("ppp" . 0.42)
+	("pppp" . 0.34)
+	("ppppp" . 0.25)
 	)
       absolute-volume-alist))
 
@@ -42,7 +42,7 @@
 (set! instrument-equalizer-alist
       (append 
        '(
-	 ("flute" . (0 . 0.07))
+	 ("flute" . (0 . 0.7))
 	 ("oboe" . (0 . 0.7))
 	 ("clarinet" . (0 . 0.7))
 	 ("bassoon" . (0 . 0.6))
@@ -56,7 +56,12 @@
 	 )
        instrument-equalizer-alist))
 
-;; (name . program+32768*(channel10 ? 1 : 0) )
+(define-public (default-instrument-equalizer s)
+  (let ((entry (assoc s instrument-equalizer-alist)))
+    (if entry
+	(cdr entry))))
+
+;; (name . program+32768*(channel10 ? 1 : 0))
 (define instrument-names-alist '())
 (set! instrument-names-alist
       (append
@@ -156,7 +161,7 @@
 	  ("recorder" . ,(- 75 1))
 	  ("pan flute" . ,(- 76 1))
 	  ("blown bottle" . ,(- 77 1))
-	  ("skakuhachi" . ,(- 78 1))
+	  ("shakuhachi" . ,(- 78 1))
 	  ("whistle" . ,(- 79 1))
 	  ("ocarina" . ,(- 80 1))
 
@@ -246,43 +251,51 @@
 	  ("mt-32 drums" .      ,(+ 32768 127))
 	  ("cm-64 kit" .        ,(+ 32768 127))
 	  ("cm-64 drums" .      ,(+ 32768 127))
-	)
-        instrument-names-alist
-      )
-)
-
-
-(define-public (default-instrument-equalizer s)
-  (let ((entry (assoc s instrument-equalizer-alist)))
-    (if entry
-	(cdr entry))))
-
+	  )
+       instrument-names-alist))
 
 (define-public (percussion? instrument)
   "
 returns whether the instrument should use midi channel 9
 "
   (let* ((inst  (symbol->string instrument))
-         (entry (assoc inst instrument-names-alist))
-	)
-     (and entry (>= (cdr entry) 32768))
-  )
-)
+         (entry (assoc inst instrument-names-alist)))
+     (and entry (>= (cdr entry) 32768))))
+
 (define-public (midi-program instrument)
 "
 returns the program of the instrument
 "
   (let* ((inst  (symbol->string instrument))
-         (entry (assoc inst instrument-names-alist))
-	)
-    (if entry (modulo (cdr entry) 32768) #f )
-  )
-)
+         (entry (assoc inst instrument-names-alist)))
+    (if entry (modulo (cdr entry) 32768) #f)))
 
 ;; 90 == 90/127 == 0.71 is supposed to be the default value
 ;; urg: we should set this at start of track
 (define-public dynamic-default-volume 0.71)
 
-(define-public (accidentals-in-key pitch-list)
+(define-public (alterations-in-key pitch-list)
   "Count number of sharps minus number of flats"
-  (apply + (map cdr pitch-list)))
+  
+  (* (apply + (map cdr pitch-list)) 2))
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+
+(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))))))