X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=a8a78199c73096c15375110f5c50020b28912d13;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=06603584b97663a30d2803363afcfabef69e0bf0;hpb=14f464d957b6a68710f0364fc7507b63eb0fcee6;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 06603584b9..a8a78199c7 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -102,9 +102,9 @@ Audio_key::Audio_key (int acc, bool major)
   major_ = major;
 }
 
-const Real Audio_span_dynamic::MINIMUM_VOLUME;
-const Real Audio_span_dynamic::MAXIMUM_VOLUME;
-const Real Audio_span_dynamic::DEFAULT_VOLUME;
+const Real Audio_span_dynamic::MINIMUM_VOLUME = 0.0;
+const Real Audio_span_dynamic::MAXIMUM_VOLUME = 1.0;
+const Real Audio_span_dynamic::DEFAULT_VOLUME = 90.0 / 127.0;
 
 Audio_span_dynamic::Audio_span_dynamic (Moment mom, Real volume)
   : start_moment_ (mom),
@@ -132,7 +132,7 @@ moment_to_ticks (Moment m)
   return int (moment_to_real (m) * 384 * 4);
 }
 
-void Audio_span_dynamic::set_end_moment(Moment mom)
+void Audio_span_dynamic::set_end_moment (Moment mom)
 {
   if (mom < start_moment_)
     {
@@ -205,20 +205,8 @@ Audio_text::Audio_text (Audio_text::Type type, const string &text_string)
   type_ = type;
 }
 
-Audio_control_function_value_change
-::Audio_control_function_value_change (Control control, Real value)
-  : control_ (control), value_ (value)
+Audio_control_change::Audio_control_change (int control, int value)
+  : control_ (control),
+    value_ (value)
 {
 }
-
-const Audio_control_function_value_change::Context_property
-Audio_control_function_value_change::context_properties_[] = {
-  // property name, enum constant, lower bound for range, upper bound for range
-  { "midiBalance",     BALANCE,      -1.0, 1.0 },
-  { "midiPanPosition", PAN_POSITION, -1.0, 1.0 },
-  { "midiExpression",  EXPRESSION,    0.0, 1.0 },
-  { "midiReverbLevel", REVERB_LEVEL,  0.0, 1.0 },
-  { "midiChorusLevel", CHORUS_LEVEL,  0.0, 1.0 },
-  // extra element to signify the end of the mapping, must be kept last
-  { 0,                 NUM_CONTROLS,  0.0, 0.0 }
-};