X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=26dbe93a8dec76763045dbb5d5b6c7d5f622e2bd;hb=ae0484ae139f4de639f91e64a3788583e5f84d87;hp=d28c62fcc9409645ac54be58bac1968c8b077df1;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git diff --git a/lily/key-performer.cc b/lily/key-performer.cc index d28c62fcc9..26dbe93a8d 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Jan Nieuwenhuizen + (c) 1997--2006 Jan Nieuwenhuizen */ #include "music-sequence.hh" @@ -19,7 +19,7 @@ public: protected: virtual bool try_music (Music *ev); - virtual void create_audio_elements (); + void process_music (); void stop_translation_timestep (); private: @@ -38,7 +38,7 @@ Key_performer::~Key_performer () } void -Key_performer::create_audio_elements () +Key_performer::process_music () { if (key_ev_) { @@ -65,10 +65,10 @@ Key_performer::create_audio_elements () bool minor = (scm_is_pair (third) && scm_is_integer (scm_cdr (third)) && scm_to_int (scm_cdr (third)) == FLAT); - + audio_ = new Audio_key (scm_to_int (acc), !minor); - + Audio_element_info info (audio_, key_ev_); announce_element (info); key_ev_ = 0; @@ -89,10 +89,8 @@ bool Key_performer::try_music (Music *ev) { if (!key_ev_) - { - key_ev_ = ev; - } - + key_ev_ = ev; + return true; }