X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-performer.cc;h=907fcc4d1ad27acbac2242d12ece5ae127a9727c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=679bb6b3527d093aa5a62a4753a823e00c8378d7;hpb=17a0be44b562c72ccfebf2bef4a7a6fcc07bd02f;p=lilypond.git diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc index 679bb6b352..907fcc4d1a 100644 --- a/lily/beam-performer.cc +++ b/lily/beam-performer.cc @@ -3,15 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2005 Jan Nieuwenhuizen + (c) 1996--2008 Jan Nieuwenhuizen */ #include "performer.hh" #include "audio-item.hh" #include "audio-column.hh" #include "global-context.hh" +#include "stream-event.hh" #include "warn.hh" -#include "music.hh" + +#include "translator.icc" class Beam_performer : public Performer { @@ -19,13 +21,13 @@ public: TRANSLATOR_DECLARATIONS (Beam_performer); protected: - virtual bool try_music (Music *ev); - virtual void start_translation_timestep (); - virtual void process_music (); + void start_translation_timestep (); + void process_music (); void set_melisma (bool); + DECLARE_TRANSLATOR_LISTENER (beam); private: - Music *start_ev_; - Music *now_stop_ev_; + Stream_event *start_ev_; + Stream_event *now_stop_ev_; bool beam_; }; @@ -67,26 +69,29 @@ Beam_performer::start_translation_timestep () now_stop_ev_ = 0; } -bool -Beam_performer::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Beam_performer, beam); +void +Beam_performer::listen_beam (Stream_event *ev) { - if (m->is_mus_type ("beam-event")) - { - Direction d = to_dir (m->get_property ("span-direction")); - - if (d == START) - { - start_ev_ = m; - } - else if (d == STOP) - { - now_stop_ev_ = m; - } - return true; - } - return false; + Direction d = to_dir (ev->get_property ("span-direction")); + + if (d == START) + start_ev_ = ev; + else if (d == STOP) + now_stop_ev_ = ev; } -ADD_TRANSLATOR (Beam_performer, "", "", - "beam-event", "", "", ""); +ADD_TRANSLATOR (Beam_performer, + /* doc */ + "", + + /* create */ + "", + + /* read */ + "", + + /* write */ + "" + );