From 5700feb8f2c755876f7ff9aab46470c074d59918 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 20 Aug 2005 23:56:02 +0000
Subject: [PATCH] * lily/midi-item.cc (name): new method.

* lily/engraver-group.cc (do_announces): move recursion call out
of while loop.
---
 ChangeLog                 |  2 ++
 lily/engraver-group.cc    | 26 +++++++++++++++-----------
 lily/include/midi-item.hh |  1 +
 lily/midi-item.cc         |  8 ++++++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 514d621211..62eb47f6e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/midi-item.cc (name): new method.
+
 	* lily/staff-performer.cc (acknowledge_audio_element): use
 	signature of baseclass.
 
diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index ff0271515c..fa6a780681 100644
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -93,19 +93,23 @@ Engraver_group::pending_grob_count () const
 void
 Engraver_group::do_announces ()
 {
-  for (SCM s = context ()->children_contexts ();
-       scm_is_pair (s); s = scm_cdr (s))
+  do
     {
-      Context *c = unsmob_context (scm_car (s));
-      Engraver_group *group
-	= dynamic_cast<Engraver_group *> (c->implementation ());
-      if (group)
-	group->do_announces ();
-    }
+      /*
+	DOCME: why is this inside the loop? 
+       */
+      for (SCM s = context ()->children_contexts ();
+	   scm_is_pair (s); s = scm_cdr (s))
+	{
+	  Context *c = unsmob_context (scm_car (s));
+	  Engraver_group *group
+	    = dynamic_cast<Engraver_group *> (c->implementation ());
+	  if (group)
+	    group->do_announces ();
+	}
 
- do
-    {
-       while (1)
+      
+      while (1)
 	{
 	  precomputed_translator_foreach (PROCESS_ACKNOWLEDGED);
 	  if (announce_infos_.size () == 0)
diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 6c10232918..0cfa4908ee 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -20,6 +20,7 @@ class Midi_item
 public:
   Midi_item ();
   virtual ~Midi_item ();
+  virtual char const *name () const;
 
   /// factory
   static Midi_item *get_midi (Audio_item *a);
diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 4e6605d530..350bb28332 100644
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -15,6 +15,7 @@
 #include "midi-stream.hh"
 #include "duration.hh"
 #include "program-option.hh"
+
 #include "killing-cons.tcc"
 
 #define PITCH_WHEEL_TOP 0x3FFF
@@ -465,3 +466,10 @@ Midi_track::data_string () const
     }
   return str;
 }
+
+
+char const *
+Midi_item::name () const
+{
+  return classname (this);
+}
-- 
2.39.5