Merge branch 'issue4032'

[lilypond.git] / lily / lyric-combine-music-iterator.cc

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index a6de96f5d3b8020981bf869962d6a6414e2865ea..dfc616e0d5f00b8ab6fe91d06600e4ee6ddfd5c7 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 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
@@ -94,7 +94,7 @@ IMPLEMENT_LISTENER (Lyric_combine_music_iterator, set_busy)
 void
 Lyric_combine_music_iterator::set_busy (SCM se)
 {
-  Stream_event *e = unsmob_stream_event (se);
+  Stream_event *e = Stream_event::unsmob (se);
 
   if ((e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event"))
       && music_context_)
@@ -110,14 +110,14 @@ Lyric_combine_music_iterator::set_music_context (Context *to)
   if (music_context_)
     {
       music_context_->event_source ()->
-      remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("music-event"));
+      remove_listener (GET_LISTENER (set_busy), ly_symbol2scm ("rhythmic-event"));
     }
 
   music_context_ = to;
   if (to)
     {
       to->event_source ()->add_listener (GET_LISTENER (set_busy),
-                                         ly_symbol2scm ("music-event"));
+                                         ly_symbol2scm ("rhythmic-event"));
     }
 }
 
@@ -187,8 +187,8 @@ Lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
 void
 Lyric_combine_music_iterator::construct_children ()
 {
-  Music *m = unsmob_music (get_music ()->get_property ("element"));
-  lyric_iter_ = unsmob_iterator (get_iterator (m));
+  Music *m = Music::unsmob (get_music ()->get_property ("element"));
+  lyric_iter_ = Music_iterator::unsmob (get_iterator (m));
   if (!lyric_iter_)
     return;
   lyrics_context_ = find_context_below (lyric_iter_->get_outlet (),
@@ -196,7 +196,7 @@ Lyric_combine_music_iterator::construct_children ()
 
   if (!lyrics_context_)
     {
-      m->origin ()->warning ("argument of \\lyricsto should contain Lyrics context");
+      m->origin ()->warning (_ ("argument of \\lyricsto should contain Lyrics context"));
     }
 
   lyricsto_voice_name_ = get_music ()->get_property ("associated-context");
@@ -221,7 +221,7 @@ Lyric_combine_music_iterator::construct_children ()
 
 IMPLEMENT_LISTENER (Lyric_combine_music_iterator, check_new_context)
 void
-Lyric_combine_music_iterator::check_new_context (SCM sev)
+Lyric_combine_music_iterator::check_new_context (SCM /*sev*/)
 {
   if (!ok ())
     return;