X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-item.hh;fp=lily%2Finclude%2Faudio-item.hh;h=45dcc7b7991f6b486fbd1f8c284cafa0f56bbf61;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=da0abbce385a5ab090e1c73a666140898b447626;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index da0abbce38..45dcc7b799 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ public:
   Audio_column *get_column () const;
 
   virtual void render ();
-  
+
 private:
   Audio_item (Audio_item const &);
   Audio_item &operator = (Audio_item const &);
@@ -53,15 +53,15 @@ class Audio_span_dynamic : public Audio_element
 {
 public:
   Direction grow_dir_;
-  vector<Audio_dynamic*> dynamics_;
-
+  vector<Audio_dynamic *> dynamics_;
+  Real min_volume_;
+  Real max_volume_;
 
   virtual void render ();
-  void add_absolute (Audio_dynamic*);
-  Audio_span_dynamic ();
+  void add_absolute (Audio_dynamic *);
+  Audio_span_dynamic (Real min_volume, Real max_volume);
 };
 
-
 class Audio_key : public Audio_item
 {
 public:
@@ -90,8 +90,8 @@ public:
   Pitch pitch_;
   Moment length_mom_;
   Pitch transposing_;
-  Audio_dynamic* dynamic_;
-  
+  Audio_dynamic *dynamic_;
+
   Audio_note *tied_;
   bool tie_event_;
 };
@@ -107,10 +107,10 @@ class Audio_text : public Audio_item
 {
 public:
   enum Type
-    {
-      TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
-      MARKER, CUE_POINT
-    };
+  {
+    TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
+    MARKER, CUE_POINT
+  };
 
   Audio_text (Audio_text::Type type, string text_string);