/*
audio-item.hh -- declare Audio_items
- (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef AUDIO_ITEM_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;
+ virtual void render ();
+
private:
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_;
};
+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 ();
+};
+
+
class Audio_key : public Audio_item
{
public:
class Audio_instrument : public Audio_item
{
public:
- Audio_instrument (std::string instrument_string);
+ Audio_instrument (string instrument_string);
- std::string str_;
+ string str_;
};
class Audio_note : public Audio_item
{
public:
- Audio_note (Pitch p, Moment m, int transposing_i = 0);
+ Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposition);
void tie_to (Audio_note *);
Pitch pitch_;
Moment length_mom_;
- int transposing_;
+ Pitch transposing_;
+
Audio_note *tied_;
+ bool tie_event_;
};
class Audio_piano_pedal : public Audio_item
{
public:
- std::string type_string_;
+ string type_string_;
Direction dir_;
};
MARKER, CUE_POINT
};
- Audio_text (Audio_text::Type type, std::string text_string);
+ Audio_text (Audio_text::Type type, string text_string);
Type type_;
- std::string text_string_;
+ 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_;
};
int one_beat_;
};
+int moment_to_ticks (Moment);
+Real moment_to_real (Moment);
+Moment remap_grace_duration (Moment);
+
#endif // AUDIO_ITEM_HH