X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=967ae60e7067b7e6b803d85a81479690331f898c;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=1e5b21605d2edde42a60f121b2a0e16691bd39db;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index 1e5b21605d..967ae60e70 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--2010 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 @@ -47,7 +47,8 @@ Tempo_performer::derived_mark () const scm_gc_mark (last_tempo_); } -Tempo_performer::Tempo_performer () +Tempo_performer::Tempo_performer (Context *c) + : Performer (c) { last_tempo_ = SCM_EOL; audio_ = 0; @@ -61,10 +62,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 ()); @@ -85,16 +86,22 @@ Tempo_performer::stop_translation_timestep () } } +void +Tempo_performer::boot () +{ + +} + ADD_TRANSLATOR (Tempo_performer, - /* doc */ - "", + /* doc */ + "", - /* create */ - "", + /* create */ + "", - /* read */ - "tempoWholesPerMinute ", + /* read */ + "tempoWholesPerMinute ", - /* write */ - "" - ); + /* write */ + "" + );