release: 1.0.15

[lilypond.git] / lily / include / time-description.hh

diff --git a/lily/include/time-description.hh b/lily/include/time-description.hh
index 5a84817ed93e3c99bf99561d141d0d8d4dbfd58d..5ac4e0330e48eece7c951f75761e2dcdf8f034b6 100644 (file)
--- a/lily/include/time-description.hh
+++ b/lily/include/time-description.hh
@@ -1,7 +1,7 @@
 /*
   moment.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1998 Han-Wen Nienhuys
 */
 
 #ifndef tdes_HH
@@ -9,7 +9,7 @@
 
 #include "moment.hh"
 #include "lily-proto.hh"
-#include "varray.hh"
+#include "array.hh"
 
 /// full info on where we are
 struct Time_description {
@@ -33,20 +33,19 @@ struct Time_description {
   /// idem
   int bars_i_;
 
-  /* *************** */
   void set_cadenza (bool);
   Moment when_mom () const { return when_; }
   void OK() const;
   Time_description();
   void add (Moment dt);
-  bool allow_meter_change_b();
+  bool allow_time_signature_change_b();
   String str() const;
   void print() const;
   void setpartial (Moment p);
   String try_set_partial_str (Moment) const;
   Moment barleft() const;
   Moment next_bar_moment() const;
-  void set_meter (int,int);
+  void set_time_signature (int,int);
   static int compare (const Time_description&, const Time_description&);
 };