/*
audio-item.hh -- declare Audio_items
- (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+ (c) 1996--2006 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.
- */
-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_;
+
+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_;
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 );
+class Audio_dynamic : public Audio_item
+{
+public:
+ Audio_dynamic (Real volume);
- virtual Midi_item* midi_item_p();
+ Real volume_;
};
-#if 0
-struct Audio_instrument : public Audio_item {
- Audio_instrument( Request* req_l );
+class Audio_key : public Audio_item
+{
+public:
+ Audio_key (int acc, bool major);
+
+ int accidentals_;
+ bool major_;
};
-#endif
-
-struct Audio_note : public Audio_item {
- Audio_note( Request* req_l, bool on_b );
- virtual Midi_item* midi_item_p();
- bool on_b_;
+
+class Audio_instrument : public Audio_item
+{
+public:
+ Audio_instrument (string instrument_string);
+
+ string str_;
};
-struct Audio_text : Audio_item {
- enum Type {
- TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
- MARKER, CUE_POINT
+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_;
+};
+
+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_i);
- 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_;
};
#endif // AUDIO_ITEM_HH