From: Han-Wen Nienhuys Date: Thu, 18 Aug 2005 15:34:32 +0000 (+0000) Subject: * lily/include/engraver-group.hh: rename. X-Git-Tag: release/2.7.6~13 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0eb7d103fae1508384b1918069f9b6ef16fe5837;p=lilypond.git * lily/include/engraver-group.hh: rename. * lily/include/performer-group.hh: rename. --- diff --git a/ChangeLog b/ChangeLog index b41003fb8a..9a731beda7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-08-18 Han-Wen Nienhuys + + * lily/include/engraver-group.hh: rename. + + * lily/include/performer-group.hh: rename. + 2005-08-18 Mats Bengtsson * input/test/script-abbreviations.ly: Removed some old LaTeX diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index 8e292eb1a2..3f42004a51 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -14,7 +14,7 @@ #include "staff-symbol-referencer.hh" #include "breathing-sign.hh" -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "item.hh" class Breathing_sign_engraver : public Engraver diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 9547d7abff..2202efc641 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -10,7 +10,7 @@ #include "repeated-music.hh" #include "stem.hh" #include "rhythmic-head.hh" -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "warn.hh" #include "misc.hh" #include "spanner.hh" diff --git a/lily/context-def.cc b/lily/context-def.cc index 738da30f81..8ae1f52b38 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -18,8 +18,8 @@ #include "translator-group.hh" #include "warn.hh" -#include "engraver-group-engraver.hh" -#include "performer-group-performer.hh" +#include "engraver-group.hh" +#include "performer-group.hh" Context_def::Context_def () { diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc index a3a5f99ec8..6c2c4685fb 100644 --- a/lily/engraver-group.cc +++ b/lily/engraver-group.cc @@ -1,12 +1,12 @@ /* - engraver-group-engraver.cc -- implement Engraver_group + engraver-group.cc -- implement Engraver_group source file of the GNU LilyPond music typesetter (c) 1997--2005 Han-Wen Nienhuys */ -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "warn.hh" #include "paper-score.hh" diff --git a/lily/include/engraver-group-engraver.hh b/lily/include/engraver-group-engraver.hh deleted file mode 100644 index 0462922a24..0000000000 --- a/lily/include/engraver-group-engraver.hh +++ /dev/null @@ -1,37 +0,0 @@ -/* - engraver-group-engraver.hh -- declare Engraver_group - - source file of the GNU LilyPond music typesetter - - (c) 1997--2005 Han-Wen Nienhuys -*/ - -#ifndef ENGRAVERGROUP_HH -#define ENGRAVERGROUP_HH - -#include "engraver.hh" -#include "translator-group.hh" - -class Engraver_group : public virtual Translator_group -{ -protected: - Array announce_infos_; - SCM acknowledge_hash_table_; -public: - VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group); - Engraver_group (); - virtual void derived_mark () const; - void do_announces (); - virtual void announce_grob (Grob_info); - int pending_grob_count () const; -private: - virtual void acknowledge_grobs (); -}; - -typedef void (Engraver:: *Engraver_method) (void); - -void engraver_each (SCM list, Engraver_method method); - -#endif // ENGRAVERGROUP_HH - - diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh new file mode 100644 index 0000000000..3e61dad3cd --- /dev/null +++ b/lily/include/engraver-group.hh @@ -0,0 +1,37 @@ +/* + engraver-group.hh -- declare Engraver_group + + source file of the GNU LilyPond music typesetter + + (c) 1997--2005 Han-Wen Nienhuys +*/ + +#ifndef ENGRAVER_GROUP_HH +#define ENGRAVER_GROUP_HH + +#include "engraver.hh" +#include "translator-group.hh" + +class Engraver_group : public virtual Translator_group +{ +protected: + Array announce_infos_; + SCM acknowledge_hash_table_; +public: + VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group); + Engraver_group (); + virtual void derived_mark () const; + void do_announces (); + virtual void announce_grob (Grob_info); + int pending_grob_count () const; +private: + virtual void acknowledge_grobs (); +}; + +typedef void (Engraver:: *Engraver_method) (void); + +void engraver_each (SCM list, Engraver_method method); + +#endif // ENGRAVERGROUP_HH + + diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh deleted file mode 100644 index 07baa64d2d..0000000000 --- a/lily/include/performer-group-performer.hh +++ /dev/null @@ -1,36 +0,0 @@ -/* - performer-group-performer.hh -- declare Performer_group - - (c) 1996--2005 Han-Wen Nienhuys - Jan Nieuwenhuizen -*/ - -#ifndef PERFORMER_GROUP_PERFORMER_HH -#define PERFORMER_GROUP_PERFORMER_HH - -#include "performer.hh" -#include "translator-group.hh" - -typedef void (Performer:: *Performer_method) (void); - -class Performer_group : public virtual Translator_group -{ -public: - VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Performer_group); - - void do_announces (); - virtual void announce_element (Audio_element_info); - virtual void play_element (Audio_element *p); - virtual int get_tempo () const; - -protected: - Array announce_infos_; - -private: - void acknowledge_audio_elements (); -}; - -void performer_each (SCM list, Performer_method method); - -#endif // PERFORMER_GROUP_PERFORMER_HH - diff --git a/lily/include/performer-group.hh b/lily/include/performer-group.hh new file mode 100644 index 0000000000..07baa64d2d --- /dev/null +++ b/lily/include/performer-group.hh @@ -0,0 +1,36 @@ +/* + performer-group-performer.hh -- declare Performer_group + + (c) 1996--2005 Han-Wen Nienhuys + Jan Nieuwenhuizen +*/ + +#ifndef PERFORMER_GROUP_PERFORMER_HH +#define PERFORMER_GROUP_PERFORMER_HH + +#include "performer.hh" +#include "translator-group.hh" + +typedef void (Performer:: *Performer_method) (void); + +class Performer_group : public virtual Translator_group +{ +public: + VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Performer_group); + + void do_announces (); + virtual void announce_element (Audio_element_info); + virtual void play_element (Audio_element *p); + virtual int get_tempo () const; + +protected: + Array announce_infos_; + +private: + void acknowledge_audio_elements (); +}; + +void performer_each (SCM list, Performer_method method); + +#endif // PERFORMER_GROUP_PERFORMER_HH + diff --git a/lily/include/recording-group-engraver.hh b/lily/include/recording-group-engraver.hh index e582b5eeb1..4faa02b643 100644 --- a/lily/include/recording-group-engraver.hh +++ b/lily/include/recording-group-engraver.hh @@ -9,7 +9,7 @@ #ifndef RECORDING_GROUP_ENGRAVER_HH #define RECORDING_GROUP_ENGRAVER_HH -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" class Recording_group_engraver : public Engraver_group { diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index 56976d7dd5..fdd89da74f 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -9,7 +9,7 @@ #ifndef SCORE_ENGRAVER_HH #define SCORE_ENGRAVER_HH -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "score-translator.hh" class Score_engraver : public virtual Score_translator, diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 209b597bfe..2e4bae6f27 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -10,7 +10,7 @@ #include "bar-line.hh" #include "context.hh" -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "item.hh" #include "warn.hh" #include "text-interface.hh" diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index f5b782d0ad..004b8f7622 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -7,7 +7,7 @@ #include "multi-measure-rest.hh" #include "paper-column.hh" -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "side-position-interface.hh" #include "staff-symbol-referencer.hh" #include "moment.hh" diff --git a/lily/performer.cc b/lily/performer.cc index 45ade53504..9cb80f34f5 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -8,7 +8,7 @@ */ #include "context.hh" -#include "performer-group-performer.hh" +#include "performer-group.hh" #include "warn.hh" void diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index a7e51ea629..21af00155a 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -10,7 +10,7 @@ #include "audio-column.hh" #include "audio-item.hh" #include "audio-staff.hh" -#include "performer-group-performer.hh" +#include "performer-group.hh" #include "context.hh" /** Perform a staff. Individual notes should have their instrument diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 99881bf6d1..52cf5e73fb 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -8,7 +8,7 @@ #include "time-signature.hh" #include "warn.hh" -#include "engraver-group-engraver.hh" +#include "engraver-group.hh" #include "misc.hh" /** diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc index 0f9656d8cd..0d5488cf77 100644 --- a/lily/translator-group-ctors.cc +++ b/lily/translator-group-ctors.cc @@ -8,8 +8,8 @@ #include "score-engraver.hh" #include "score-performer.hh" -#include "engraver-group-engraver.hh" -#include "performer-group-performer.hh" +#include "engraver-group.hh" +#include "performer-group.hh" #include "recording-group-engraver.hh" #include "warn.hh"