2003 -> 2004

[lilypond.git] / lily / include / global-translator.hh

diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh
index 00e4250930ec1ab4d6fbe4df164640bdf0e302a9..37937d558b28bc4a572c646f4307c3a9d4dbb107 100644 (file)
--- 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -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<Moment> 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_mom () const;
-  virtual Global_translator *global_l() { return this; }
+
 };