X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Frest-engraver.cc;h=d691c2e98c7f9e2001706845c9ca3cf15b590df1;hb=23bb09401ef1d8c5f5256b8f7a6c002365b1d88c;hp=402f412d2a516ae10e1d53e22c7a95445f156856;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 402f412d2a..d691c2e98c 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ class Rest_engraver : public Engraver protected: void start_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (rest); + void listen_rest (Stream_event *); public: TRANSLATOR_DECLARATIONS (Rest_engraver); }; @@ -66,7 +66,7 @@ Rest_engraver::process_music () if (rest_event_ && !rest_) { rest_ = make_item ("Rest", rest_event_->self_scm ()); - Pitch *p = unsmob_pitch (rest_event_->get_property ("pitch")); + Pitch *p = unsmob (rest_event_->get_property ("pitch")); if (p) { @@ -80,13 +80,18 @@ Rest_engraver::process_music () } } -IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest); void Rest_engraver::listen_rest (Stream_event *ev) { ASSIGN_EVENT_ONCE (rest_event_, ev); } +void +Rest_engraver::boot () +{ + ADD_LISTENER (Rest_engraver, rest); +} + ADD_TRANSLATOR (Rest_engraver, /* doc */ "Engrave rests.",