X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fmidi.scm;h=70fa620bc0976ed21b91b6cbeac6b2c4975af2fb;hb=57244befefb4bb8aad0f43e85da56ea378d64974;hp=79ffe5846af555bbbb998ab1879d64c5a74e80d5;hpb=899a5926b98860f3d5db399616d9211927fbfa3c;p=lilypond.git

diff --git a/scm/midi.scm b/scm/midi.scm
index 79ffe5846a..70fa620bc0 100644
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -1,12 +1,18 @@
-;;; midi.scm -- scm midi variables and functions
-;;;
-;;;  source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; midi.scm -- scm midi variables and functions
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
+
+;;;;;;;;;;;;;;;;;;
+;;; TODO:
+
+;; this is broken: we should not ever export variables from Scheme.
+
 ;; define factor of total volume per dynamic marking
-(define absolute-volume-alist '())
+(define-public absolute-volume-alist '())
 (set! absolute-volume-alist
       (append 
       '(
@@ -32,7 +38,7 @@
 	(cdr entry))))
 
 ;; define factors of total volume of minimum and maximum volume
-(define instrument-equalizer-alist '())
+(define-public instrument-equalizer-alist '())
 (set! instrument-equalizer-alist
       (append 
        '(
@@ -50,7 +56,7 @@
 	 )
        instrument-equalizer-alist))
 
-;; (name . program+32768*(channel10 ? 1 : 0) )
+;; (name . program+32768*(channel10 ? 1 : 0))
 (define instrument-names-alist '())
 (set! instrument-names-alist
       (append
@@ -150,7 +156,7 @@
 	  ("recorder" . ,(- 75 1))
 	  ("pan flute" . ,(- 76 1))
 	  ("blown bottle" . ,(- 77 1))
-	  ("skakuhachi" . ,(- 78 1))
+	  ("shakuhachi" . ,(- 78 1))
 	  ("whistle" . ,(- 79 1))
 	  ("ocarina" . ,(- 80 1))
 
@@ -240,55 +246,34 @@
 	  ("mt-32 drums" .      ,(+ 32768 127))
 	  ("cm-64 kit" .        ,(+ 32768 127))
 	  ("cm-64 drums" .      ,(+ 32768 127))
-	)
-        instrument-names-alist
-      )
-)
-
+	  )
+       instrument-names-alist))
 
 (define-public (default-instrument-equalizer s)
   (let ((entry (assoc s instrument-equalizer-alist)))
     (if entry
 	(cdr entry))))
 
-
 (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)))
-
-(define-public (major-key pitch-list)
-  "Characterise the key as major if the alteration of the 
-third scale note is the same as that of the main note.
-Note: MIDI cannot handle other tonalities than major/minor.
-"
-  ;; This charactersition is only true for a scale that starts at `c'.
-  (if (not (equal? (car pitch-list) '(0 . 0)))
-      (begin
-	(ly:warn "Attempt to determine tonality of transposed scale")
-	#t)
-  (eq? (cdr (list-ref pitch-list 4)) (cdr (list-ref pitch-list 6)))))
+  (/ (apply + (map cdr pitch-list)) 2))