X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-item.hh;h=da0abbce385a5ab090e1c73a666140898b447626;hb=319a81614622698d9e6aed8d6997ad0461c6614c;hp=81939867f3c6463b0df5b4ec45013ece28a67638;hpb=3f8485925e8c879fe4c9ae86acef9804126c3b91;p=lilypond.git

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 81939867f3..da0abbce38 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,7 +1,20 @@
 /*
-  audio-item.hh -- declare Audio_items
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef AUDIO_ITEM_HH
@@ -14,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 ();
@@ -31,6 +46,7 @@ public:
   Audio_dynamic ();
 
   Real volume_;
+  bool silent_;
 };
 
 class Audio_span_dynamic : public Audio_element
@@ -68,11 +84,13 @@ class Audio_note : public Audio_item
 public:
   Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposition);
 
-  void tie_to (Audio_note *);
+  // with tieWaitForNote, there might be a skip between the tied notes!
+  void tie_to (Audio_note *, Moment skip = 0);
 
   Pitch pitch_;
   Moment length_mom_;
   Pitch transposing_;
+  Audio_dynamic* dynamic_;
   
   Audio_note *tied_;
   bool tie_event_;
@@ -103,7 +121,7 @@ public:
 class Audio_tempo : public Audio_item
 {
 public:
-  Audio_tempo (int per_minute_4_i);
+  Audio_tempo (int per_minute_4);
 
   int per_minute_4_;
 };