X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=f72b8937d4fea21b02d2e75b6cfdf4fc00f4e726;hb=44155056614ee1ff6b3bf4f286bdb386147c21a2;hp=46d9fb035dbc2d7b3af965c2c84bfba9e1f53185;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git
diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 46d9fb035d..f72b8937d4 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -17,7 +17,6 @@
along with LilyPond. If not, see .
*/
-
#include
using namespace std;
@@ -51,7 +50,7 @@ Music_iterator::~Music_iterator ()
Context *
Music_iterator::get_outlet () const
{
- return handle_.get_outlet ();
+ return handle_.get_context ();
}
void
@@ -97,11 +96,11 @@ Music_iterator::get_static_get_iterator (Music *m)
else
{
if (dynamic_cast (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 ();
@@ -170,16 +169,16 @@ Music_iterator::descend_to_bottom_context ()
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 ());
}
@@ -217,7 +216,7 @@ Music_iterator::mark_smob (SCM smob)
}
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];