release: 0.1.13

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

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index e6104dcb7f3db3823ce44d56fa039ca688ce58bb..3e3c00c4fb649e50beab4a2870dfa5a8c4142795 100644 (file)
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -9,75 +9,83 @@
 
 #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.
- */
-struct Audio_item {
-    Audio_item( Request* req_l );
-
-    /// Create a midi-item from myself.
-    virtual Midi_item* midi_item_p() = 0;
 
-#if 0
-    /// Not implemented. Anyone?
-    virtual Niff_item* niff_item_p() = 0;
-
-    /// Not implemented. Anyone?
-    virtual Cscore_item* score_item_p() = 0;
-#endif
-    
-    Audio_column* audio_column_l_;
-    Request* req_l_;
+  TODO:
 
+  virtual Niff_item* niff_item_p() = 0;
+  
+  virtual CSound_item* score_item_p() = 0;
+ */
+struct Audio_item : public Audio_element {
+  Audio_item (Request* req_l);
+
+  /// Create a midi-item from myself.
+  virtual Midi_item* midi_item_p() = 0;
+
+  Audio_column* audio_column_l_;
+  /*
+    THIS SUX. This ties the output system to the input system.  Bad move.
+   */
+  Request* req_l_;
+
+  DECLARE_MY_RUNTIME_TYPEINFO;    
+protected:
+  virtual void do_print () const;
+  
 private:
-    Audio_item( Audio_item const& );
-    Audio_item& operator=( Audio_item const& );
+  Audio_item (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();
+  Audio_key (Request* req_l);
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  virtual Midi_item* midi_item_p();
 };
 
-#if 0
 struct Audio_instrument : public Audio_item {
-    Audio_instrument( Request* req_l );
+  Audio_instrument (String instrument_str);
+  virtual Midi_item* midi_item_p();
+  String str_;
+    DECLARE_MY_RUNTIME_TYPEINFO;
 };
-#endif
                                       
 struct Audio_note : public Audio_item {
-    Audio_note( Request* req_l, bool on_b );
-    virtual Midi_item* midi_item_p();
-    bool on_b_;
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  Audio_note (Request* req_l);
+  virtual Midi_item* midi_item_p();
 };
 
 struct Audio_text : Audio_item {
-    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();
-
-    Type type_;
-    String text_str_;
+  enum Type { 
+    TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
+    MARKER, CUE_POINT
+  };
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  Audio_text (Audio_text::Type type, String text_str);
+  virtual Midi_item* midi_item_p();
+
+  Type type_;
+  String text_str_;
 };
 
 struct Audio_tempo : Audio_item {
-    Audio_tempo( int per_minute_4_i );
-    virtual Midi_item* midi_item_p();
-
-    int per_minute_4_i_;
+  Audio_tempo (int per_minute_4_i);
+  virtual Midi_item* midi_item_p();
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  int per_minute_4_i_;
 };
 
 struct Audio_meter : Audio_item {
-    Audio_meter( Request* req_l );
-    virtual Midi_item* midi_item_p();
+  Audio_meter (Request* req_l);
+  virtual Midi_item* midi_item_p();
+  DECLARE_MY_RUNTIME_TYPEINFO;
 };
 
 #endif // AUDIO_ITEM_HH