if (ly_is_procedure (ctor))
{
iter = scm_call_0 (ctor);
- p = unsmob_iterator (iter);
+ p = Music_iterator::unsmob (iter);
}
else
{
Music_iterator::get_iterator (Music *m) const
{
SCM ip = get_static_get_iterator (m);
- Music_iterator *p = unsmob_iterator (ip);
+ Music_iterator *p = Music_iterator::unsmob (ip);
p->init_context (m, get_outlet ());
Careful with GC, although we intend the following as pointers
only, we _must_ mark them.
*/
- if (mus->get_outlet ())
- scm_gc_mark (mus->get_outlet ()->self_scm ());
+ /* Use handle_ directly as get_outlet is a virtual function and we
+ need to protect the context until Music_iterator::quit is being
+ run. */
+ if (mus->handle_.get_context ())
+ scm_gc_mark (mus->handle_.get_context ()->self_scm ());
if (mus->music_)
scm_gc_mark (mus->music_->self_scm ());
{
char s[1000];
- Music_iterator *iter = unsmob_iterator (sm);
+ Music_iterator *iter = Music_iterator::unsmob (sm);
sprintf (s, "#<%s>", iter->class_name ());
scm_puts (s, port);
return 1;