2003 -> 2004

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

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 72c2c61a0b5b73bff9d3ae2f8bc069c11b895ab0..d0eb1fc3e6d697b4638115cfac6f25841c464690 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,92 +1,123 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996,  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_ITEM_HH
 #define AUDIO_ITEM_HH
 
+#include <typeinfo>
 #include "lily-proto.hh"
 #include "string.hh"
 #include "audio-element.hh"
 
-/**
-  Any piece of audio information.
-  We need virtual constructors, 
-  let's try decentralised factory for specific audio implemenations.
-
-  TODO:
+#include "pitch.hh"
+#include "moment.hh"
+#include "drul-array.hh"
 
-  virtual Niff_item* niff_item_p() = 0;
-  
-  virtual CSound_item* score_item_p() = 0;
+/**
+   
+  Any piece of audio information.  We need virtual constructors, let's
+  try decentralised factory for specific audio implemenations.
  */
-struct Audio_item : public Audio_element {
-  Audio_item (Request* req_l);
-
-  /// Create a midi-item from myself.
-  virtual Midi_item* midi_item_p() = 0;
+class Audio_item : public Audio_element
+{
+public:
+  Audio_item ();
 
-  Audio_column* audio_column_l_;
-  /*
-    THIS SUX. This ties the output system to the input system.  Bad move.
-   */
-  Request* req_l_;
+  Audio_column* audio_column_;
 
-      
-protected:
-  virtual void do_print () const;
   
 private:
   Audio_item (Audio_item const&);
-  Audio_item& operator=( Audio_item const&);
+  Audio_item& operator= ( Audio_item const&);
 };
 
-struct Audio_key : public Audio_item {
-  Audio_key (Request* req_l);
-  
-  virtual Midi_item* midi_item_p();
+class Audio_dynamic : public Audio_item
+{
+public:
+  Audio_dynamic (Real volume);
+
+  Real volume_;
+};
+
+class Audio_key : public Audio_item
+{
+public:
+  Audio_key (int acc, bool major);
+
+  int accidentals_;
+  bool major_;
 };
 
-struct Audio_instrument : public Audio_item {
-  Audio_instrument (String instrument_str);
-  virtual Midi_item* midi_item_p();
+class Audio_instrument : public Audio_item
+{
+public:
+  Audio_instrument (String instrument_string);
+
   String str_;
-    
 };
                                       
-struct Audio_note : public Audio_item {
-  
-  Audio_note (Request* req_l, int transposing_i = 0);
-  virtual Midi_item* midi_item_p();
-  int transposing_i_;
+class Audio_note : public Audio_item
+{
+public:  
+  Audio_note (Pitch p, Moment m, int transposing_i = 0);
+
+  void tie_to (Audio_note*);
+
+  Pitch pitch_;
+  Moment length_mom_;
+  Moment delayed_mom_;
+  Moment delayed_until_mom_;
+  int transposing_;
+  Audio_note* tied_;
 };
 
-struct Audio_text : Audio_item {
+class Audio_piano_pedal : public Audio_item
+{
+public:
+  String type_string_;
+  Direction dir_;
+};
+
+class Audio_text : public Audio_item
+{
+public:
   enum Type { 
     TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
     MARKER, CUE_POINT
   };
   
-  Audio_text (Audio_text::Type type, String text_str);
-  virtual Midi_item* midi_item_p();
+  Audio_text (Audio_text::Type type, String text_string);
 
   Type type_;
-  String text_str_;
+  String text_string_;
 };
 
-struct Audio_tempo : Audio_item {
+class Audio_tempo : public Audio_item
+{
+public:
   Audio_tempo (int per_minute_4_i);
-  virtual Midi_item* midi_item_p();
-  
-  int per_minute_4_i_;
+
+  int per_minute_4_;
 };
 
-struct Audio_time_signature : Audio_item {
-  Audio_time_signature (Request* req_l);
-  virtual Midi_item* midi_item_p();
-  
+class Audio_tie : public Audio_item
+{
+public:
+  Audio_tie ();
+  void set_note (Direction, Audio_note*);
+  Drul_array<Audio_note*> note_drul_;
+};
+
+class Audio_time_signature : public Audio_item
+{
+public:
+  Audio_time_signature (int beats, int one_beat);
+
+  int beats_;
+  int one_beat_;
 };
 
 #endif // AUDIO_ITEM_HH