X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=b17e9202cbab8097392ec1a53cb5b440315f35ac;hb=4402d15b615cd29241ebaa99c0fa667c22e1f2b8;hp=95de5faa832a71fe03185c80756c6150616e0a8d;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index 95de5faa83..b17e9202cb 100644 --- a/lily/tempo-performer.cc +++ b/lily/tempo-performer.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Jan Nieuwenhuizen + Copyright (C) 1997--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,12 +33,12 @@ public: protected: - virtual void derived_mark () const; + virtual void derived_mark () const; void stop_translation_timestep (); void process_music (); private: Audio_tempo *audio_; - SCM last_tempo_; + SCM last_tempo_; }; void @@ -61,10 +61,10 @@ void Tempo_performer::process_music () { SCM w = get_property ("tempoWholesPerMinute"); - if (unsmob_moment (w) + if (unsmob (w) && !ly_is_equal (w, last_tempo_)) { - Rational r = unsmob_moment (w)->main_part_; + Rational r = unsmob (w)->main_part_; r *= Rational (4, 1); audio_ = new Audio_tempo (r.to_int ()); @@ -86,15 +86,15 @@ Tempo_performer::stop_translation_timestep () } ADD_TRANSLATOR (Tempo_performer, - /* doc */ - "", + /* doc */ + "", - /* create */ - "", + /* create */ + "", - /* read */ - "tempoWholesPerMinute ", + /* read */ + "tempoWholesPerMinute ", - /* write */ - "" - ); + /* write */ + "" + );