X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=a9a2744c9f3507de6c24aea19a156e7f07c22408;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3e8228be8a256d018bec463b505046a634f04fef;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 3e8228be8a..a9a2744c9f 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,34 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "engraver.hh"
 #include "chord-name.hh"
-#include "output-def.hh"
-#include "font-interface.hh"
-#include "output-def.hh"
+#include "context.hh"
 #include "dimensions.hh"
+#include "engraver.hh"
+#include "font-interface.hh"
 #include "item.hh"
+#include "output-def.hh"
+#include "pitch.hh"
 #include "protected-scm.hh"
-#include "context.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 class Chord_name_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Chord_name_engraver);
 protected:
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
-  virtual bool try_music (Music *);
+  void stop_translation_timestep ();
+  void process_music ();
   virtual void finalize ();
   virtual void derived_mark () const;
+  DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  void add_note (Music *);
-
   Item *chord_name_;
-  Link_array<Music> notes_;
+  vector<Stream_event*> notes_;
 
   SCM last_chord_;
 };
@@ -52,12 +53,6 @@ Chord_name_engraver::Chord_name_engraver ()
   last_chord_ = SCM_EOL;
 }
 
-void
-Chord_name_engraver::add_note (Music *n)
-{
-  notes_.push (n);
-}
-
 void
 Chord_name_engraver::process_music ()
 {
@@ -68,10 +63,10 @@ Chord_name_engraver::process_music ()
   SCM inversion = SCM_EOL;
   SCM pitches = SCM_EOL;
 
-  Music *inversion_event = 0;
-  for (int i = 0; i < notes_.size (); i++)
+  Stream_event *inversion_event = 0;
+  for (vsize i = 0; i < notes_.size (); i++)
     {
-      Music *n = notes_[i];
+      Stream_event *n = notes_[i];
       SCM p = n->get_property ("pitch");
       if (!unsmob_pitch (p))
 	continue;
@@ -118,24 +113,17 @@ Chord_name_engraver::process_music ()
 
   SCM s = get_property ("chordChanges");
   if (to_boolean (s) && scm_is_pair (last_chord_)
-      && ly_c_equal_p (chord_as_scm, last_chord_))
+      && ly_is_equal (chord_as_scm, last_chord_))
     chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
 
   last_chord_ = chord_as_scm;
 }
 
-bool
-Chord_name_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note);
+void
+Chord_name_engraver::listen_note (Stream_event *ev)
 {
-  /*
-    hmm. Should check?
-  */
-  if (m->is_mus_type ("note-event"))
-    {
-      add_note (m);
-      return true;
-    }
-  return false;
+  notes_.push_back (ev);
 }
 
 void
@@ -150,11 +138,21 @@ Chord_name_engraver::stop_translation_timestep ()
   which properties are read depend on the chord naming function active.
 */
 ADD_TRANSLATOR (Chord_name_engraver,
-		/* descr */ "Catch note-events "
-		"and generate the appropriate chordname.",
-		/* creats*/ "ChordName",
-		/* accepts */ "note-event",
-		/* acks  */ "",
-		/* reads */ "chordChanges chordNameExceptions chordNameFunction "
-		"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
-		/* write */ "");
+		/* doc */
+		"Catch note events and generate the appropriate chordname.",
+
+		/* create */
+		"ChordName ",
+
+		/* read */
+		"chordChanges "
+		"chordNameExceptions "
+		"chordNameFunction "
+		"chordNoteNamer "
+		"chordRootNamer "
+		"chordNameExceptions "
+		"majorSevenSymbol ",
+
+		/* write */
+		""
+		);