/*
- music-iterator.cc -- implement Music_iterator
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
+*/
#include <cstdio>
using namespace std;
Context *
Music_iterator::get_outlet () const
{
- return handle_.get_outlet ();
+ return handle_.get_context ();
}
void
else
{
if (dynamic_cast<Music_wrapper *> (m))
- p = new Music_wrapper_iterator;
+ p = new Music_wrapper_iterator;
else if (m->is_mus_type ("event"))
p = new Event_iterator;
else
- p = new Simple_music_iterator;
+ p = new Simple_music_iterator;
iter = p->self_scm ();
p->unprotect ();
set_context (get_outlet ()->get_default_interpreter ());
}
-void
+void
Music_iterator::report_event (Music *m)
{
descend_to_bottom_context ();
/*
- FIXME: then don't do it.
+ FIXME: then don't do it.
*/
if (!m->is_mus_type ("event"))
- m->origin ()->programming_error (_ ("Sending non-event to context"));
+ m->origin ()->programming_error ("Sending non-event to context");
m->send_to_context (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 ());
}
int
-Music_iterator::print_smob (SCM sm, SCM port, scm_print_state*)
+Music_iterator::print_smob (SCM sm, SCM port, scm_print_state *)
{
char s[1000];