IMPLEMENT_IS_TYPE_B1(Sequential_music,Music_sequence);
IMPLEMENT_IS_TYPE_B1(Simultaneous_music,Music_sequence);
-MInterval
-Simultaneous_music::time_int() const
+Moment
+Simultaneous_music::duration () const
{
- MInterval m;
+ Moment dur = 0;
for (iter (music_p_list_p_->top(), i); i.ok (); i++)
- m.unite (i->time_int());
+ dur = dur >? i->duration ();
- return m;
+ return dur;
}
void
-Simultaneous_music::translate (Moment m)
+Music_sequence::compress (Moment m)
{
- for (iter (music_p_list_p_->top(), i); i.ok (); i++)
- i->translate (m);
+ for (PCursor<Music*> i(music_p_list_p_->top()); i.ok (); i++)
+ i->compress (m);
}
Simultaneous_music::Simultaneous_music(Music_list *p)
Sequential_music::Sequential_music(Music_list *p)
: Music_sequence (p)
{
- offset_mom_ =0;
}
-MInterval
-Sequential_music::time_int() const
+Moment
+Sequential_music::duration () const
{
Moment last=0;
for (iter (music_p_list_p_->top(), i); i.ok (); i++)
{
- MInterval interval = i->time_int();
-
- /*
- c4 <> c4
- */
- if (!interval.empty_b())
- last += interval.length();
+ last += i->duration ();
}
- return offset_mom_ + MInterval (0,last);
+ return last;
}
Musical_pitch
return music_p_list_p_->do_relative_octave (p, true);
}
-void
-Sequential_music::translate (Moment dt)
-{
- offset_mom_ += dt;
-}
-
-
-
Musical_pitch
Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
Music_list::Music_list (Music_list const &s)
- : Pointer_list<Music*> (s)
+ : Pointer_list<Music*> ()
{
for (PCursor<Music*> i(s.top()); i.ok (); i++)
add_music (i->clone());
{
for (iter (music_p_list_p_->top(),i); i.ok (); i++)
{
- Musical_req *m =((Request*)i.ptr ())->access_Musical_req ();
- if (m && m->access_Melodic_req ())
- {
- Musical_pitch &pit = m->access_Melodic_req ()->pitch_;
+ Musical_req *m = dynamic_cast<Musical_req*> (i.ptr ());
+ if (m && dynamic_cast <Melodic_req *> (m))
+ {
+ Musical_pitch &pit = dynamic_cast <Melodic_req *> (m)->pitch_;
pit.to_relative_octave (last);
return pit;
}
Music_list::Music_list ()
+ : Pointer_list<Music*> ()
{
}