X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fglobal-translator.hh;h=51c125c9c2364092cbee5fcd3c5065943ab46206;hb=a2991295b2c1fb36bec19de207161855ca3c1756;hp=ce34cfb52751b7d655fd4366b06c254fe8816624;hpb=a2896b23ce12cc61e9cd4495324c9ca5551cb947;p=lilypond.git

diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh
index ce34cfb527..51c125c9c2 100644
--- a/lily/include/global-translator.hh
+++ b/lily/include/global-translator.hh
@@ -1,38 +1,47 @@
 /*
-  global-acceptor.hh -- declare Global_acceptor
+  global-translator.hh -- declare Global_translator
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
-#ifndef GLOBAL_ACCEPTOR_HH
-#define GLOBAL_ACCEPTOR_HH
+#ifndef GLOBAL_TRANSLATOR_HH
+#define GLOBAL_TRANSLATOR_HH
 
-#include "acceptor.hh"
+#include "translator-group.hh"
+#include "moment.hh"
 #include "pqueue.hh"
 
-class Global_translator : public virtual Translator {
-    PQueue<Moment> extra_mom_pq_;
-    Moment last_mom_;
+
+class Global_translator : public virtual Translator_group{
+  PQueue<Moment> extra_mom_pq_;
 public:
-    Score *score_l_;
-    Global_translator();
-    int moments_left_i()const;
-    void modify_next(Moment&);
-    void add_moment_to_process(Moment);
-
-    virtual void set_score(Score*);
-    virtual void prepare(Moment);
-    virtual void process() {}
-    virtual void finish() {}
-    
+  VIRTUAL_COPY_CONS (Translator);
+  Moment final_mom_;
+  Moment prev_mom_;
+  Moment now_mom_;
+  Global_translator ();
+
+  int moments_left_i () 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 ();     
+  virtual void prepare (Moment);
+  virtual void one_time_step ();
+  virtual void finish ();
+  virtual void start ();
+
+  virtual Moment now_mom () const;
+
+  
 protected:
-    virtual int depth_i() const;
-    virtual Translator *ancestor_l(int);
+
 };
 
 
 
-#endif // Global_translator_HH
+#endif // GLOBAL_TRANSLATOR_HH