source file of the GNU LilyPond music typesetter
- (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+ (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "audio-item.hh"
-#include "midi-item.hh"
-
-#if 0
-Audio_instrument::Audio_instrument( String instrument_str )
- : Audio_item( 0 )
-{
-}
-#endif
-
-Audio_item::Audio_item( Request* req_l )
-{
- audio_column_l_ = 0;
- req_l_ = req_l;
-}
-Audio_key::Audio_key( Request* req_l )
- : Audio_item( req_l )
-{
-}
+#include "midi-item.hh"
+#include "audio-column.hh"
-Midi_item*
-Audio_key::midi_item_p()
+Audio_instrument::Audio_instrument (string instrument_string)
{
- return new Midi_key( this );
+ str_ = instrument_string;
}
-
-Audio_note::Audio_note( Request* req_l, bool on_b )
- : Audio_item( req_l )
+Audio_item::Audio_item ()
{
- on_b_ = on_b;
+ audio_column_ = 0;
}
-Midi_item*
-Audio_note::midi_item_p()
+Audio_note::Audio_note (Pitch p, Moment m, int transposing_i)
{
- return new Midi_note( this );
+ pitch_ = p;
+ length_mom_ = m;
+ tied_ = 0;
+ transposing_ = transposing_i;
}
-Audio_tempo::Audio_tempo( int per_minute_4_i )
- : Audio_item( 0 )
+void
+Audio_note::tie_to (Audio_note *t)
{
- per_minute_4_i_ = per_minute_4_i;
+ tied_ = t;
+ Audio_note *first = t;
+ while (first->tied_)
+ first = first->tied_;
+ first->length_mom_ += length_mom_;
+ length_mom_ = 0;
}
-Midi_item*
-Audio_tempo::midi_item_p()
+Audio_key::Audio_key (int acc, bool major)
{
- return new Midi_tempo( this );
+ accidentals_ = acc;
+ major_ = major;
}
-Audio_meter::Audio_meter( Request* req_l )
- : Audio_item( req_l )
+Audio_dynamic::Audio_dynamic (Real volume)
{
+ volume_ = volume;
}
-Midi_item*
-Audio_meter::midi_item_p()
+Audio_tempo::Audio_tempo (int per_minute_4_i)
{
- return new Midi_meter( this );
+ per_minute_4_ = per_minute_4_i;
}
-Audio_text::Audio_text( Audio_text::Type type, String text_str )
- : Audio_item( 0 )
+Audio_time_signature::Audio_time_signature (int beats, int one_beat)
{
- text_str_ = text_str;
- type_ = type;
+ beats_ = beats;
+ one_beat_ = one_beat;
}
-Midi_item*
-Audio_text::midi_item_p()
+Audio_text::Audio_text (Audio_text::Type type, string text_string)
{
- return new Midi_text( this );
+ text_string_ = text_string;
+ type_ = type;
}