release: 1.3.15

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

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index 2e97184c5f685b4d38fd4b6c2cce2f1ec8717cac..5c11973c2e8a8446725d8d5d4be4d26c7834f87d 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -3,16 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 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
@@ -21,17 +21,22 @@ 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_;
 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();
 
+public:
+  /// JUNKME
+  int bars_i () const;
+
+  Moment measure_position () const;
+  Moment measure_length () const;  
+  void set_time_signature (int, int);
+  void get_time_signature (int *, int*) const;
+
 };
 #endif // TIMING_TRANSLATOR_HH