* lily/parser.yy (relative_music): start at middle C without pitch

[lilypond.git] / lily / event-chord-iterator.cc

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index 29713a52dc1e7ccc2c979b178f219298644812ff..e588574020e06e93b310ebc702f2aa92f5d91ce0 100644 (file)
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -6,7 +6,7 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "translator-group.hh"
+#include "context.hh"
 #include "warn.hh"
 #include "event-chord-iterator.hh"
 #include "music-list.hh"
@@ -16,7 +16,7 @@ Event_chord_iterator::Event_chord_iterator ()
 {
 }
 
-Translator_group*
+Context *
 Event_chord_iterator::get_req_translator ()
 {
   assert (get_outlet ());
@@ -47,13 +47,13 @@ Event_chord_iterator::process (Moment m)
   if (last_processed_mom_ < Moment (0))
     {
       for (SCM s = dynamic_cast<Music_sequence *> (get_music ())->music_list ();
-          gh_pair_p (s);  s = ly_cdr (s))
+          ly_c_pair_p (s);  s = ly_cdr (s))
        {
          Music *mus = unsmob_music (ly_car (s));
 
          bool gotcha = try_music (mus);
          if (!gotcha)
-           mus->origin ()->warning (_f ("Junking event: `%s'", mus->name()));
+           mus->origin ()->warning (_f ("Junking event: `%s'", mus->name ()));
        }
     }
   Simple_music_iterator::process (m);