get_music() to get_pending_events().
+2002-07-25 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * lily/include/music-iterator.hh (class Music_iterator): change
+ get_music() to get_pending_events().
+
2002-07-25 Jan Nieuwenhuizen <janneke@gnu.org>
* buildscripts/ontgaar.py: get_music () -> get_pending_events ().
Array<Pitch> ps;
while (1)
{
- SCM muses = iter->get_music (m);
+ SCM muses = iter->get_pending_events (m);
for (SCM s = muses; gh_pair_p (s); s=ly_cdr (s))
if (Note_req* nr = dynamic_cast<Note_req*> (unsmob_music (ly_car (s))))
{
/*
Folded repeats are a stupid idea at this point, so we refrain from
- implementing get_music () and skip ().
+ implementing get_pending_events () and skip ().
*/
#include "folded-repeat-iterator.hh"
ADD_GLOBAL_CTOR (_ ## type ## _adder);
void add_music_ctor (String, Music* (*) ());
-Music*get_music (String);
+Music*make_music (String);
* Typically this reports the music to an interpretation context,
thus changing the state of the interpretation context.
- get_music (M) -- return all events starting at M (pre: no events
+ get_pending_events (M) -- return all events starting at M (pre: no events
before M). No side-effects
skip (M) -- remove all events starting before M (leave the ones that
virtual Moment pending_moment () const;
virtual bool ok () const;
- virtual SCM get_music (Moment until)const;
+ virtual SCM get_pending_events (Moment until)const;
virtual void process (Moment until);
virtual void skip (Moment until);
virtual void construct_children () ;
virtual Moment pending_moment () const;
virtual bool ok () const;
- virtual SCM get_music (Moment)const;
+ virtual SCM get_pending_events (Moment)const;
virtual void skip (Moment);
protected:
virtual void construct_children ();
virtual Moment pending_moment () const;
virtual void process (Moment);
- virtual SCM get_music (Moment)const;
+ virtual SCM get_pending_events (Moment)const;
virtual Music_iterator *try_music_in_children (Music *) const;
virtual bool ok () const;
Request_chord_iterator ();
Request_chord_iterator (Request_chord_iterator const&);
- virtual SCM get_music (Moment) const;
+ virtual SCM get_pending_events (Moment) const;
protected:
virtual void process (Moment);
virtual void construct_children ();
virtual Moment pending_moment () const;
virtual bool ok () const;
virtual void skip (Moment);
- virtual SCM get_music (Moment)const;
+ virtual SCM get_pending_events (Moment)const;
protected:
virtual void process (Moment);
virtual void construct_children ();
virtual Moment pending_moment () const;
virtual bool ok () const;
- virtual SCM get_music (Moment)const;
+ virtual SCM get_pending_events (Moment)const;
virtual void skip (Moment);
protected:
}
Music*
-get_music (String s)
+make_music (String s)
{
return (*get_music_ctor (s)) () ;
}
}
SCM
-Music_iterator::get_music (Moment)const
+Music_iterator::get_pending_events (Moment)const
{
return SCM_EOL;
}
}
SCM
-Music_wrapper_iterator::get_music (Moment m)const
+Music_wrapper_iterator::get_pending_events (Moment m)const
{
- return child_iter_p_->get_music (m);
+ return child_iter_p_->get_pending_events (m);
}
Moment
{
SCM_ASSERT_TYPE(gh_string_p(type), type, SCM_ARG1, __FUNCTION__, "string");
-
- SCM s = get_music (ly_scm2string (type))->self_scm ();
+ SCM s = make_music (ly_scm2string (type))->self_scm ();
scm_gc_unprotect_object (s);
return s;
{
if (iter->ok ())
{
- for (SCM i = iter->get_music (m); gh_pair_p (i); i = ly_cdr (i))
+ for (SCM i = iter->get_pending_events (m); gh_pair_p (i); i = ly_cdr (i))
{
Music *m = unsmob_music (ly_car (i));
if (Melodic_req *r = dynamic_cast<Melodic_req *> (m))
SCM
-Part_combine_music_iterator::get_music (Moment m)const
+Part_combine_music_iterator::get_pending_events (Moment m)const
{
SCM s = SCM_EOL;
if (first_iter_p_)
- s = gh_append2 (s,first_iter_p_->get_music (m));
+ s = gh_append2 (s,first_iter_p_->get_pending_events (m));
if (second_iter_p_)
- s = gh_append2 (second_iter_p_->get_music (m),s);
+ s = gh_append2 (second_iter_p_->get_pending_events (m),s);
return s;
}
}
SCM
-Request_chord_iterator::get_music (Moment) const
+Request_chord_iterator::get_pending_events (Moment) const
{
SCM s = SCM_EOL;
if (last_processed_mom_ < Moment (0))
/*
TODO: the grace note handling hasn't been done for skip() and
- get_music(), meaning that staff-switching and partcombining will be
+ get_pending_events(), meaning that staff-switching and partcombining will be
broken with grace notes.
*/
/*
TODO: the grace note handling hasn't been done for skip() and
- get_music(), meaning that staff-switching and partcombining will be
+ get_pending_events(), meaning that staff-switching and partcombining will be
broken with grace notes.
*/
*/
SCM
-Sequential_iterator::get_music (Moment until)const
+Sequential_iterator::get_pending_events (Moment until)const
{
SCM s = SCM_EOL;
if (until < pending_moment ())
dynamic_cast<Sequential_iterator*> (clone ());
while (me->ok ())
{
- SCM nm = me->iter_p_->get_music (until - me->here_mom_);
+ SCM nm = me->iter_p_->get_pending_events (until - me->here_mom_);
s = gh_append2 (nm, s);
Moment m = 0;
}
SCM
-Simultaneous_music_iterator::get_music (Moment m)const
+Simultaneous_music_iterator::get_pending_events (Moment m)const
{
SCM s = SCM_EOL;
for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
{
- s = gh_append2 (p->car_->get_music (m), s);
+ s = gh_append2 (p->car_->get_pending_events (m), s);
}
return s;
}