CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/20 23:56:02
Modified files:
. : ChangeLog
lily : engraver-group.cc midi-item.cc
lily/include : midi-item.hh
Log message:
* lily/midi-item.cc (name): new method.
* lily/engraver-group.cc (do_announces): move recursion call out
of while loop.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4049&tr2=1.4050&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/engraver-group.cc.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/midi-item.cc.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/midi-item.hh.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4049 lilypond/ChangeLog:1.4050
--- lilypond/ChangeLog:1.4049 Sat Aug 20 23:37:45 2005
+++ lilypond/ChangeLog Sat Aug 20 23:56:01 2005
@@ -1,5 +1,7 @@
2005-08-21 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/midi-item.cc (name): new method.
+
* lily/staff-performer.cc (acknowledge_audio_element): use
signature of baseclass.
Index: lilypond/lily/engraver-group.cc
diff -u lilypond/lily/engraver-group.cc:1.27
lilypond/lily/engraver-group.cc:1.28
--- lilypond/lily/engraver-group.cc:1.27 Sat Aug 20 23:31:39 2005
+++ lilypond/lily/engraver-group.cc Sat Aug 20 23:56:02 2005
@@ -93,19 +93,23 @@
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)
Index: lilypond/lily/include/midi-item.hh
diff -u lilypond/lily/include/midi-item.hh:1.37
lilypond/lily/include/midi-item.hh:1.38
--- lilypond/lily/include/midi-item.hh:1.37 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/midi-item.hh Sat Aug 20 23:56:02 2005
@@ -20,6 +20,7 @@
public:
Midi_item ();
virtual ~Midi_item ();
+ virtual char const *name () const;
/// factory
static Midi_item *get_midi (Audio_item *a);
Index: lilypond/lily/midi-item.cc
diff -u lilypond/lily/midi-item.cc:1.85 lilypond/lily/midi-item.cc:1.86
--- lilypond/lily/midi-item.cc:1.85 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/midi-item.cc Sat Aug 20 23:56:02 2005
@@ -15,6 +15,7 @@
#include "midi-stream.hh"
#include "duration.hh"
#include "program-option.hh"
+
#include "killing-cons.tcc"
#define PITCH_WHEEL_TOP 0x3FFF
@@ -464,4 +465,11 @@
str += "\n";
}
return str;
+}
+
+
+char const *
+Midi_item::name () const
+{
+ return classname (this);
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
