Midi: Use span dynamics render results for note velocities. Fixes #1586.

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

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index aeb4712d35bee262a39f10bb8f06ae971fafafe1..da0abbce385a5ab090e1c73a666140898b447626 100644 (file)
--- 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--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2011 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
@@ -27,8 +27,10 @@
 class Audio_item : public Audio_element
 {
 public:
-  Audio_item ();
   Audio_column *audio_column_;
+  int channel_;
+
+  Audio_item ();
   Audio_column *get_column () const;
 
   virtual void render ();
@@ -44,6 +46,7 @@ public:
   Audio_dynamic ();
 
   Real volume_;
+  bool silent_;
 };
 
 class Audio_span_dynamic : public Audio_element
@@ -87,6 +90,7 @@ public:
   Pitch pitch_;
   Moment length_mom_;
   Pitch transposing_;
+  Audio_dynamic* dynamic_;
   
   Audio_note *tied_;
   bool tie_event_;