release: 0.1.11

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

diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh
index ce34cfb52751b7d655fd4366b06c254fe8816624..ae97418b7ffd6494082ddc9eb780002f5db5d8b2 100644 (file)
--- a/lily/include/global-translator.hh
+++ b/lily/include/global-translator.hh
@@ -1,5 +1,5 @@
 /*
-  global-acceptor.hh -- declare Global_acceptor
+  global-translator.hh -- declare Global_translator
 
   source file of the GNU LilyPond music typesetter
 
@@ -7,32 +7,35 @@
 */
 
 
-#ifndef GLOBAL_ACCEPTOR_HH
-#define GLOBAL_ACCEPTOR_HH
+#ifndef GLOBAL_TRANSLATOR_HH
+#define GLOBAL_TRANSLATOR_HH
 
-#include "acceptor.hh"
+#include "translator.hh"
 #include "pqueue.hh"
 
 class Global_translator : public virtual Translator {
-    PQueue<Moment> extra_mom_pq_;
-    Moment last_mom_;
+  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() {}
+  Moment last_mom_;
+  Global_translator();
+  int moments_left_i() const;
+  void modify_next (Moment&);
+  void add_moment_to_process (Moment);
+
+  virtual Music_output *get_output_p ();     
+  virtual void prepare (Moment);
+  virtual void process() {}
+  virtual void finish() {}
+  virtual void start() {}
     
+  DECLARE_MY_RUNTIME_TYPEINFO;
 protected:
-    virtual int depth_i() const;
-    virtual Translator *ancestor_l(int);
+    
+  virtual Global_translator *global_l() { return this; }
+  virtual int depth_i() const;
+  virtual Translator *ancestor_l (int);
 };
 
 
 
-#endif // Global_translator_HH
+#endif // GLOBAL_TRANSLATOR_HH