class Auto_change_iterator : public Music_wrapper_iterator
{
public:
- DECLARE_SCHEME_CALLBACK(constructor, ());
+ DECLARE_SCHEME_CALLBACK (constructor, ());
Auto_change_iterator ();
SCM split_list_;
Direction where_dir_;
void change_to (Music_iterator* , SCM, String);
+ Moment start_moment_;
};
while (current && !current->is_alias (to_type_sym))
{
last = current;
- current = current->daddy_context_;
+ current = current->get_parent_context ();
}
- if (current && current->id_string_ == to_id)
+ if (current && current->id_string () == to_id)
{
String msg;
msg += _ ("Can't switch translators, I'm there already");
Moment now = get_outlet ()->now_mom ();
Moment *splitm = 0;
- for (; gh_pair_p (split_list_); split_list_ = gh_cdr (split_list_))
+ for (; ly_c_pair_p (split_list_); split_list_ = ly_cdr (split_list_))
{
- splitm = unsmob_moment (gh_caar (split_list_));
- if (*splitm > now)
+ splitm = unsmob_moment (ly_caar (split_list_));
+ if ((*splitm + start_moment_) > now)
break ;
- SCM tag = gh_cdar (split_list_);
+ SCM tag = ly_cdar (split_list_);
Direction d = to_dir (tag);
if (d && d != where_dir_)
{
Music_wrapper_iterator::construct_children ();
split_list_ = get_music ()->get_property ("split-list");
+ start_moment_ = get_outlet ()->now_mom ();
}
IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);