X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fglobal-translator.hh;h=33133bf9e8546c69436496c2e7c13d01cf96f31e;hb=b4139c2fb2ec738a17ee1157edf23e8ea56ed560;hp=0e12f150fd97997ed58518b2f92760733c03b280;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh index 0e12f150fd..33133bf9e8 100644 --- a/lily/include/global-translator.hh +++ b/lily/include/global-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ @@ -11,31 +11,38 @@ #define GLOBAL_TRANSLATOR_HH #include "translator-group.hh" -#include "rational.hh" +#include "moment.hh" #include "pqueue.hh" -class Global_translator : public virtual Translator_group{ +class Global_translator : public virtual Translator_group +{ PQueue extra_mom_pq_; public: - VIRTUAL_COPY_CONS(Translator); - Moment last_mom_; + VIRTUAL_COPY_CONS (Translator); + Moment final_mom_; + Moment prev_mom_; Moment now_mom_; - Global_translator(); + Global_translator (); - int moments_left_i() const; - void modify_next (Moment&); + int get_moments_left () const; + Moment sneaky_insert_extra_moment (Moment); void add_moment_to_process (Moment); + void run_iterator_on_me (Music_iterator*); - virtual Music_output *get_output_p (); + void apply_finalizations (); + void add_finalization (SCM); + + virtual Music_output *get_output (); virtual void prepare (Moment); - virtual void process() {} - virtual void finish() {} - virtual void start() {} + virtual void one_time_step (); + virtual void finish (); + virtual void start (); + + virtual Moment now_mom () const; protected: - virtual Moment now_moment () const; - virtual Global_translator *global_l() { return this; } + };