X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftiming-translator.hh;h=f30f596b919f519d4d88f93037a67425052197b4;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=02da3a2488f3480e4a966a898d987b1dcf927a45;hpb=225485917d3e66bd7eb907d6462e981ae1bd1654;p=lilypond.git

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index 02da3a2488..f30f596b91 100644
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -3,36 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef TIMING_TRANSLATOR_HH
 #define TIMING_TRANSLATOR_HH
 
+#include "moment.hh"
 #include "translator.hh"
-#include "time-description.hh"
-#include "grouping.hh"
-#include "parray.hh"
 
-class Timing_translator : public virtual Translator
+class Timing_translator : public Translator
 {
 public:
-  TRANSLATOR_CLONE(Timing_translator);
-  Meter_change_req * meter_req_l () const;
-  Timing_translator ();
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Time_description time_;
-  Rhythmic_grouping  default_grouping_;
-  Link_array<Timing_req> timing_req_l_arr_;
-protected: 
-  virtual void do_print () const;
-  virtual void do_creation_processing ();
-  virtual bool do_try_request (Request *req_l);
-  virtual void do_process_requests();
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
-
-  bool mmrest_b_;
+  TRANSLATOR_DECLARATIONS (Timing_translator);
+
+protected:
+  virtual void initialize ();
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
+
+public:
+  Rational measure_length () const;
 };
+
 #endif // TIMING_TRANSLATOR_HH