X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-item.hh;h=0fc59fd960bb456535010eb55072b84be359753b;hb=92782fde87fb68e945b9eb60cacab6c01d0397df;hp=e6f0c9ad91615b9d93a46f5e6977f4067a031468;hpb=d548c339bc07e4a707c1092507afe2d672e0457d;p=lilypond.git

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index e6f0c9ad91..0fc59fd960 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,7 +1,7 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef AUDIO_ITEM_HH
@@ -11,17 +11,15 @@
 #include "moment.hh"
 #include "pitch.hh"
 
-/**
-
-Any piece of audio information.  We need virtual constructors, let's
-try decentralised factory for specific audio implemenations.
-*/
 class Audio_item : public Audio_element
 {
 public:
   Audio_item ();
   Audio_column *audio_column_;
+  Audio_column *get_column () const;
 
+  virtual void render ();
+  
 private:
   Audio_item (Audio_item const &);
   Audio_item &operator = (Audio_item const &);
@@ -30,11 +28,24 @@ private:
 class Audio_dynamic : public Audio_item
 {
 public:
-  Audio_dynamic (Real volume);
+  Audio_dynamic ();
 
   Real volume_;
 };
 
+class Audio_span_dynamic : public Audio_element
+{
+public:
+  Direction grow_dir_;
+  vector<Audio_dynamic*> dynamics_;
+
+
+  virtual void render ();
+  void add_absolute (Audio_dynamic*);
+  Audio_span_dynamic ();
+};
+
+
 class Audio_key : public Audio_item
 {
 public:
@@ -92,7 +103,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_;
 };
@@ -106,5 +117,9 @@ public:
   int one_beat_;
 };
 
+int moment_to_ticks (Moment);
+Real moment_to_real (Moment);
+Moment remap_grace_duration (Moment);
+
 #endif // AUDIO_ITEM_HH