Release: bump Welcome versions.

[lilypond.git] / lily / include / audio-item.hh

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index ae5c96ae95e549264a36f8808cedab6e06eb9aaa..f3a97a2949d9805f1edc480474f78262fe9c5f3e 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -48,9 +48,9 @@ private:
 class Audio_span_dynamic : public Audio_element
 {
 public:
-  static const Real MINIMUM_VOLUME = 0.0;
-  static const Real MAXIMUM_VOLUME = 1.0;
-  static const Real DEFAULT_VOLUME = 90.0 / 127.0;
+  static const Real MINIMUM_VOLUME;
+  static const Real MAXIMUM_VOLUME;
+  static const Real DEFAULT_VOLUME;
 
 private:
   Moment start_moment_;
@@ -59,7 +59,9 @@ private:
   Real gain_; // = target volume - start volume
 
 public:
+  Moment get_start_moment () const { return start_moment_; }
   Real get_start_volume () const { return start_volume_; }
+  Real get_duration () const { return duration_; }
   void set_end_moment (Moment);
   void set_volume (Real start, Real target);
   Real get_volume (Moment) const;
@@ -142,36 +144,13 @@ public:
   int one_beat_;
 };
 
-class Audio_control_function_value_change : public Audio_item
+class Audio_control_change : public Audio_item
 {
 public:
-  // Supported control functions.
-  enum Control
-  {
-    BALANCE = 0, PAN_POSITION, EXPRESSION, REVERB_LEVEL, CHORUS_LEVEL,
-    // pseudo value for representing the size of the enum; must be kept last
-    NUM_CONTROLS
-  };
-
-  Audio_control_function_value_change (Control control, Real value);
-
-  // Information about a context property corresponding to a control function
-  // (name, the corresponding enumeration value, and the allowed range for the
-  // value of the context property).
-  struct Context_property
-  {
-    const char *name_;
-    Control control_;
-    Real range_min_;
-    Real range_max_;
-  };
-
-  // Mapping from supported control functions to the corresponding context
-  // properties.
-  static const Context_property context_properties_[];
+  Audio_control_change (int control, int value);
 
-  Control control_;
-  Real value_;
+  int control_;
+  int value_;
 };
 
 int moment_to_ticks (Moment);