X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-item.hh;h=a277b53a28cea3ce74fea7acacdda23d561b2fa5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1b0a4fccf9bf4947e2302d5f2a3ef3e932a85cf0;hpb=6a62932652940f4ac2931f75d48796887fbc5fdc;p=lilypond.git

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 1b0a4fccf9..a277b53a28 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,84 +1,125 @@
 /*
   audio-item.hh -- declare Audio_items
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef AUDIO_ITEM_HH
 #define AUDIO_ITEM_HH
 
-#include "lily-proto.hh"
-#include "string.hh"
 #include "audio-element.hh"
+#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;
 
-  TODO:
-
-  virtual Niff_item* niff_item_p() = 0;
+  virtual void render ();
   
-  virtual CSound_item* score_item_p() = 0;
- */
-struct Audio_item : public Audio_element {
-    Audio_item( Request* req_l );
+private:
+  Audio_item (Audio_item const &);
+  Audio_item &operator = (Audio_item const &);
+};
 
-    /// Create a midi-item from myself.
-    virtual Midi_item* midi_item_p() = 0;
+class Audio_dynamic : public Audio_item
+{
+public:
+  Audio_dynamic ();
 
-    Audio_column* audio_column_l_;
-    Request* req_l_;
+  Real volume_;
+};
 
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    
-private:
-    Audio_item( Audio_item const& );
-    Audio_item& operator=( Audio_item const& );
+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 ();
 };
 
-struct Audio_key : public Audio_item {
-    Audio_key( Request* req_l );
 
-    virtual Midi_item* midi_item_p();
+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();
-    String str_;
+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 );
-    virtual Midi_item* midi_item_p();
+
+class Audio_note : public Audio_item
+{
+public:
+  Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposition);
+
+  void tie_to (Audio_note *);
+
+  Pitch pitch_;
+  Moment length_mom_;
+  Pitch transposing_;
+  
+  Audio_note *tied_;
+  bool tie_event_;
 };
 
-struct Audio_text : Audio_item {
-    enum Type { 
-	TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
-	MARKER, CUE_POINT
+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_;
+  Type type_;
+  string text_string_;
 };
 
-struct Audio_tempo : Audio_item {
-    Audio_tempo( int per_minute_4_i );
-    virtual Midi_item* midi_item_p();
+class Audio_tempo : public Audio_item
+{
+public:
+  Audio_tempo (int per_minute_4);
 
-    int per_minute_4_i_;
+  int per_minute_4_;
 };
 
-struct Audio_meter : Audio_item {
-    Audio_meter( Request* req_l );
-    virtual Midi_item* midi_item_p();
+class Audio_time_signature : public Audio_item
+{
+public:
+  Audio_time_signature (int beats, int one_beat);
+
+  int beats_;
+  int one_beat_;
 };
 
+int moment_to_ticks (Moment);
+Real moment_to_real (Moment);
+Moment remap_grace_duration (Moment);
+
 #endif // AUDIO_ITEM_HH