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

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index 02da3a2488..7629009d3e 100644
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -1,38 +1,40 @@
 /*
-  timing-translator.hh -- declare Timing_translator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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