2003 -> 2004

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

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index 5f67f7b9843fdf7c2fd57e1ec451db80f1b7c726..c2aaf37d66c39eff2152a3491ce07df3ce6dd335 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -3,35 +3,32 @@
 
   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>
 */
 
 
 #ifndef TIMING_TRANSLATOR_HH
 #define TIMING_TRANSLATOR_HH
 
+#include "moment.hh"
 #include "translator.hh"
-#include "time-description.hh"
-#include "rhythmic-grouping.hh"
+
 #include "parray.hh"
 
 class Timing_translator : public virtual Translator
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Time_signature_change_req * time_signature_req_l () const;
-  Timing_translator ();
-  
-  Time_description time_;
-  Rhythmic_grouping  default_grouping_;
-  Link_array<Timing_req> timing_req_l_arr_;
+  //  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Timing_translator);
+
+
 protected: 
-  virtual void do_print () const;
-  virtual void do_creation_processing ();
-  virtual bool do_try_music (Music *req_l);
-  virtual void do_process_requests();
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
+  virtual void initialize ();
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
 
+public:
+  Moment measure_position () const;
+  Rational measure_length () const;  
 };
 #endif // TIMING_TRANSLATOR_HH