/*
audio-item.hh -- declare Audio_items
- (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+ (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#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 constructors,
+ We need virtual conclassors,
let's try decentralised factory for specific audio implemenations.
- TODO:
-
- virtual Niff_item* niff_item_p() = 0;
-
- virtual CSound_item* score_item_p() = 0;
*/
-struct Audio_item : public Audio_element {
- Audio_item( Request* req_l );
-
- /// Create a midi-item from myself.
- virtual Midi_item* midi_item_p() = 0;
+class Audio_item : public Audio_element
+{
+public:
+ Audio_item ();
- Audio_column* audio_column_l_;
- Request* req_l_;
+ Audio_column* audio_column_l_;
- DECLARE_MY_RUNTIME_TYPEINFO;
-
+
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_;
};
-struct Audio_instrument : public Audio_item {
- Audio_instrument( String instrument_str );
- virtual Midi_item* midi_item_p();
- String str_;
+class Audio_key : public Audio_item
+{
+public:
+ Audio_key (); //Newkey_def const& key);
+ // FIXME
+};
+
+class Audio_instrument : public Audio_item
+{
+public:
+ Audio_instrument (String instrument_str);
+
+ 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 (Musical_pitch p, Moment m, int transposing_i = 0);
+
+ void tie_to (Audio_note*);
+
+ Musical_pitch pitch_;
+ Moment length_mom_;
+ Moment delayed_mom_;
+ Moment delayed_until_mom_;
+ int transposing_i_;
+ Audio_note* tied_;
};
-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_str_;
+ Direction dir_;
+};
- Audio_text( Audio_text::Type type, String text_str );
- virtual Midi_item* midi_item_p();
+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);
- Type type_;
- String text_str_;
+ Type type_;
+ String text_str_;
};
-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_i_;
};
-struct Audio_meter : Audio_item {
- Audio_meter( Request* req_l );
- virtual Midi_item* midi_item_p();
+class Audio_tie : public Audio_item
+{
+public:
+ Audio_tie ();
+ void set_note (Direction, Audio_note*);
+ Drul_array<Audio_note*> note_l_drul_;
+};
+
+class Audio_time_signature : public Audio_item
+{
+public:
+ Audio_time_signature (int beats, int one_beat);
+
+ int beats_i_;
+ int one_beat_i_;
};
#endif // AUDIO_ITEM_HH