X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-item.hh;h=ee0e2e9447beb4a7dcf58367f80983342f614a7d;hb=2bbf0334903db23ad9cb3d3fcbf826cf41d45546;hp=e8ced6a64bdbc6a039be4412a8b8e5c7f0e2a099;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git

diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh
index e8ced6a64b..ee0e2e9447 100644
--- a/lily/include/audio-item.hh
+++ b/lily/include/audio-item.hh
@@ -1,113 +1,129 @@
 /*
-  audio-item.hh -- declare Audio_items
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  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 <typeinfo>
-#include "lily-proto.hh"
-#include "string.hh"
 #include "audio-element.hh"
-
-#include "musical-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.
+#include "pitch.hh"
 
- */
 class Audio_item : public Audio_element
 {
 public:
+  Audio_column *audio_column_;
+  int channel_;
+
   Audio_item ();
+  Audio_column *get_column () const;
 
-  Audio_column* audio_column_l_;
+  virtual void render ();
 
-  
 private:
-  Audio_item (Audio_item const&);
-  Audio_item& operator=( Audio_item const&);
+  Audio_item (Audio_item const &);
+  Audio_item &operator = (Audio_item const &);
 };
 
 class Audio_dynamic : public Audio_item
 {
 public:
-  Audio_dynamic (Real volume);
+  Audio_dynamic ();
 
   Real volume_;
+  bool silent_;
+};
+
+class Audio_span_dynamic : public Audio_element
+{
+public:
+  Direction grow_dir_;
+  vector<Audio_dynamic *> dynamics_;
+  Real min_volume_;
+  Real max_volume_;
+
+  virtual void render ();
+  void add_absolute (Audio_dynamic *);
+  Audio_span_dynamic (Real min_volume, Real max_volume);
 };
 
 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_;
+  string str_;
 };
-                                      
+
 class Audio_note : public Audio_item
 {
-public:  
-  Audio_note (Musical_pitch p, Moment m, int transposing_i = 0);
+public:
+  Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposition);
 
-  void tie_to (Audio_note*);
+  // with tieWaitForNote, there might be a skip between the tied notes!
+  void tie_to (Audio_note *, Moment skip = 0);
 
-  Musical_pitch pitch_;
+  Pitch pitch_;
   Moment length_mom_;
-  Moment delayed_mom_;
-  Moment delayed_until_mom_;
-  int transposing_i_;
-  Audio_note* tied_;
+  Pitch transposing_;
+  Audio_dynamic *dynamic_;
+
+  Audio_note *tied_;
+  bool tie_event_;
 };
 
 class Audio_piano_pedal : public Audio_item
 {
 public:
-  String type_str_;
+  string type_string_;
   Direction dir_;
 };
 
 class Audio_text : public Audio_item
 {
 public:
-  enum Type { 
-    TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
+  enum Type
+  {
+    TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
     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
 {
 public:
-  Audio_tempo (int per_minute_4_i);
+  Audio_tempo (int per_minute_4);
 
-  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
@@ -115,9 +131,13 @@ 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_;
 };
 
+int moment_to_ticks (Moment);
+Real moment_to_real (Moment);
+Moment remap_grace_duration (Moment);
+
 #endif // AUDIO_ITEM_HH