X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-item.hh;h=da0abbce385a5ab090e1c73a666140898b447626;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=61c24d3a49174def679eb9bb8627ead08a9328b2;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index 61c24d3a49..da0abbce38 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,84 +1,143 @@
 /*
-  audio-item.hh -- declare Audio_items
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  Copyright (C) 1996--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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_column *audio_column_;
+  int channel_;
 
-  TODO:
+  Audio_item ();
+  Audio_column *get_column () const;
 
-  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_;
+  bool silent_;
+};
 
-    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);
+
+  // with tieWaitForNote, there might be a skip between the tied notes!
+  void tie_to (Audio_note *, Moment skip = 0);
+
+  Pitch pitch_;
+  Moment length_mom_;
+  Pitch transposing_;
+  Audio_dynamic* dynamic_;
+  
+  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