Run grand replace for 2015.

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

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index 84ca4d0528944f3c2ca40a9fe97a8a2feda83c98..18b4425483449c94c9a40910ca8431b9c0e39698 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -1,11 +1,21 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.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
@@ -13,29 +23,18 @@
 #include "moment.hh"
 #include "translator.hh"
 
-#include "parray.hh"
-
-class Timing_translator : public virtual Translator
+class Timing_translator : public Translator
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Time_signature_change_req * time_signature_req_l () const;
-  Timing_translator ();
-  Link_array<Timing_req> timing_req_l_arr_;
-
-protected: 
-  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();
+  TRANSLATOR_DECLARATIONS (Timing_translator);
 
-public:
-
-  Moment measure_position () const;
-  Moment measure_length () const;  
-  void set_time_signature (int, int);
-  void get_time_signature (int *, int*) const;
+protected:
+  virtual void initialize ();
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
 
+public:
+  Rational measure_length () const;
 };
+
 #endif // TIMING_TRANSLATOR_HH