* lily/book.cc (process): return Paper_book

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

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index b06ab920c997de089f03ce7e4640a707ec258f51..cde3d8ad3d3f8b83cca163e4173de79ba97f1dac 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,7 +1,7 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_ITEM_HH
@@ -12,29 +12,24 @@
 #include "string.hh"
 #include "audio-element.hh"
 
-#include "musical-pitch.hh"
+#include "pitch.hh"
 #include "moment.hh"
 #include "drul-array.hh"
 
 /**
-  Any piece of audio information.
-  We need virtual conclassors, 
-  let's try decentralised factory for specific audio implemenations.
-
+   
+  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_l_;
-
-protected:
-  virtual void do_print () const;
+  Audio_column* audio_column_;
   
 private:
   Audio_item (Audio_item const&);
-  Audio_item& operator=( Audio_item const&);
+  Audio_item& operator= ( Audio_item const&);
 };
 
 class Audio_dynamic : public Audio_item
@@ -48,14 +43,16 @@ public:
 class Audio_key : public Audio_item
 {
 public:
-  Audio_key (); //Newkey_def const& key);
-  // FIXME
+  Audio_key (int acc, bool major);
+
+  int accidentals_;
+  bool major_;
 };
 
 class Audio_instrument : public Audio_item
 {
 public:
-  Audio_instrument (String instrument_str);
+  Audio_instrument (String instrument_string);
 
   String str_;
 };
@@ -63,22 +60,22 @@ public:
 class Audio_note : public Audio_item
 {
 public:  
-  Audio_note (Musical_pitch p, Moment m, int transposing_i = 0);
+  Audio_note (Pitch p, Moment m, int transposing_i = 0);
 
   void tie_to (Audio_note*);
 
-  Musical_pitch pitch_;
+  Pitch pitch_;
   Moment length_mom_;
   Moment delayed_mom_;
   Moment delayed_until_mom_;
-  int transposing_i_;
+  int transposing_;
   Audio_note* tied_;
 };
 
 class Audio_piano_pedal : public Audio_item
 {
 public:
-  String type_str_;
+  String type_string_;
   Direction dir_;
 };
 
@@ -90,10 +87,10 @@ public:
     MARKER, CUE_POINT
   };
   
-  Audio_text (Audio_text::Type type, String text_str);
+  Audio_text (Audio_text::Type type, String text_string);
 
   Type type_;
-  String text_str_;
+  String text_string_;
 };
 
 class Audio_tempo : public Audio_item
@@ -101,15 +98,7 @@ class Audio_tempo : public Audio_item
 public:
   Audio_tempo (int per_minute_4_i);
 
-  int per_minute_4_i_;
-};
-
-class Audio_tie : public Audio_item
-{
-public:
-  Audio_tie ();
-  void set_note (Direction, Audio_note*);
-  Drul_array<Audio_note*> note_l_drul_;
+  int per_minute_4_;
 };
 
 class Audio_time_signature : public Audio_item
@@ -117,8 +106,8 @@ class Audio_time_signature : public Audio_item
 public:
   Audio_time_signature (int beats, int one_beat);
 
-  int beats_i_;
-  int one_beat_i_;
+  int beats_;
+  int one_beat_;
 };
 
 #endif // AUDIO_ITEM_HH