* input/no-notation/midi-volume-equaliser.ly: Add volume setting

to notes, so that equalizer is actualy being used.

* scm/midi.scm (instrument-equalizer-alist):
(absolute-volume-alist): Define public, so that user can copy or
override.

diff --git a/ChangeLog b/ChangeLog
index 8824c37a4ccbd88ec95379e5ebe0da9adccd49ba..9153975e9ff9eb689593ca03fe95bf2836f8e7cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-08-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * input/no-notation/midi-volume-equaliser.ly: Add volume setting
+       to notes, so that equalizer is actualy being used.
+
+       * scm/midi.scm (instrument-equalizer-alist):
+       (absolute-volume-alist): Define public, so that user can copy or
+       override.
+
        * lily/key-performer.cc (create_audio_elements): Check for minor
        key.  Only if key is minor, set MIDI key to minor.
 

diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index 87f1ff2a556afe3c7d0d8007691872a00ef51778..acadc67b0674365022fc43fdb1721235d25c86ea 100644 (file)
--- a/input/no-notation/midi-volume-equaliser.ly
+++ b/input/no-notation/midi-volume-equaliser.ly
@@ -1,14 +1,31 @@
 \version "1.7.19"
-\header { texidoc = "@cindex Midi Volume Equaliser
+\header {
+texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after
-another. U se this to tune equalizer settings. " }
+another. Use this to tune equalizer settings. "
+}
+
+\include "paper16-init.ly"
+
+%{
+
+Override, see scm/midi.scm:
+
+#(set! instrument-equalizer-alist
+      (append 
+       '(
+        ("flute" . (0 . 0.7))
+        )
+      instrument-equalizer-alist))
+
+%}
 
 flauti = \notes \relative c' {
   \property Staff.midiInstrument = #"flute"
   \property Staff.instrument   = #"2 Flauti"
   \property Staff.instr                = #"Fl."
 
-  c1 R1*10
+  c1-\f R1*10
 }
 
 oboi = \notes \relative c' {
@@ -16,7 +33,7 @@ oboi = \notes \relative c' {
   \property Staff.instrument   = #"2 Oboi"
   \property Staff.instr                = #"Ob."
 
-  R1*1 c1 R1*9
+  R1*1 c1-\f R1*9
 }
 
 clarinetti = \notes \relative c' {
@@ -24,7 +41,7 @@ clarinetti = \notes \relative c' {
   \property Staff.instrument   = #"Clarinetti"
   \property Staff.instr                = #"Cl"
 
-  R1*2 c1 R1*8
+  R1*2 c1-\f R1*8
 }
 
 fagotti = \notes \relative c' {
@@ -33,7 +50,7 @@ fagotti = \notes \relative c' {
   \property Staff.instr                = #"Fg."
 
   \clef bass
-  R1*3 c1 R1*7
+  R1*3 c1-\f R1*7
 }
 
 corni = \notes \relative c' {
@@ -41,7 +58,7 @@ corni = \notes \relative c' {
   \property Staff.instrument   = #"Corni"
   \property Staff.instr                = #"Cor"
 
-  R1*4 c1 R1*6
+  R1*4 c1-\f R1*6
 }
 
 trombe = \notes \relative c' {
@@ -50,7 +67,7 @@ trombe = \notes \relative c' {
   \property Staff.instr                = #"Tp."
 
   \clef bass
-  R1*5 c1 R1*5
+  R1*5 c1-\f R1*5
 }
 
 timpani = \notes \relative c' {
@@ -58,7 +75,7 @@ timpani = \notes \relative c' {
   \property Staff.instrument   = #"Timpani"
   \property Staff.instr                = #"Timp."
 
-  R1*6 c1 R1*4
+  R1*6 c1-\f R1*4
 }
 
 violinoI = \notes \relative c' {
@@ -66,7 +83,7 @@ violinoI = \notes \relative c' {
   \property Staff.instrument   = #"Violino I "
   \property Staff.instr                = #"Vl. I "
 
-  R1*7 c1 R1*3
+  R1*7 c1-\f R1*3
 }
 
 violinoII = \notes \relative c' {
@@ -74,7 +91,7 @@ violinoII = \notes \relative c' {
   \property Staff.instrument   = #"Violino II "
   \property Staff.instr                = #"Vl. II "
  
-  R1*8 c1 R1*2
+  R1*8 c1-\f R1*2
 }
 
 viola = \notes \relative c' {
@@ -83,7 +100,7 @@ viola = \notes \relative c' {
   \property Staff.instr                = #"Vla."
 
   \clef alto
-  R1*9 c1 R1*1
+  R1*9 c1-\f R1*1
 }
 
 violoncello = \notes \relative c' {
@@ -93,7 +110,7 @@ violoncello = \notes \relative c' {
   \property Staff.instr                = #"Vc."
   
   \clef bass
-  R1*10 c1
+  R1*10 c1-\f
 }
 
 

diff --git a/scm/midi.scm b/scm/midi.scm
index f96a6c9bab7b4b334517768a62937e8f3748cd66..9cb0d89b1d0bd84889c95290f67ce8db6e1e7336 100644 (file)
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -6,7 +6,7 @@
 
 
 ;; define factor of total volume per dynamic marking
-(define absolute-volume-alist '())
+(define-public absolute-volume-alist '())
 (set! absolute-volume-alist
       (append 
       '(
@@ -32,11 +32,11 @@
        (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 
        '(
-        ("flute" . (0 . 0.7))
+        ("flute" . (0 . 0.07))
         ("oboe" . (0 . 0.7))
         ("clarinet" . (0 . 0.7))
         ("bassoon" . (0 . 0.6))