From cc442d6c8d1564a78caac37b2ef0c8b9bdc76fbc Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 28 Jun 2005 13:43:41 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 11 +++++++++++ scm/midi.scm | 32 ++++++++++++++++---------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecd0dc0646..f4b479c6a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ + +2005-06-25 Stephen Charles McCarthy + + * scm/midi.scm: changed midi volumes in absolute-volume-alist from + 0.05 - 1.00 to 0.25 - 1.00 + + * scm/midi.scm: moved the default-instrument-equalizer procedure + to just under the insturment-equalizer-alist it takes as an + argument. + + 2005-06-28 Han-Wen Nienhuys * Documentation/user/advanced-notation.itely (Font selection): diff --git a/scm/midi.scm b/scm/midi.scm index 70fa620bc0..ca26e2dfb1 100644 --- a/scm/midi.scm +++ b/scm/midi.scm @@ -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)) @@ -56,6 +56,11 @@ ) instrument-equalizer-alist)) +(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 @@ -249,11 +254,6 @@ ) 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 -- 2.39.2