release: 1.1.62

[lilypond.git] / lily / include / music.hh

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 767c109a535d78952aedcef851e98df25ab62a7a..0bd1e966d07330c1a066670649d844c5a3be10b5 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -17,38 +17,35 @@
 #include "lily-proto.hh"
 #include "string.hh"
 
-/** 
-  Anything which has length or pitch.
+/** Music is anything that has duration and supports both time compression and
+  transposition.
   
   In Lily, everything that can be thought to have a length and a pitch
   (which has a duration which can be transposed) is considered "music",
 
   Music is hierarchical: 
 
-  @see Music_list
+  @see Music_sequence
 
   */
 class Music:public Input {
 public:
-  Music_list * parent_music_l_;
     
-  /** The kind of iterator needed to walk this music.  This doesn't
-    make sense for simple (ie non-list) music, but it does no harm
-    here. Yes, it did harm Music_list: you can forget to copy it.
-      
-    */
-  String translator_type_str_;
 
-  /// what name (or look for this name)
-  String translator_id_str_;    
+  virtual Musical_pitch to_relative_octave (Musical_pitch);
+
+  /// The duration of this piece of music
+  virtual Moment length_mom () const;
 
-  virtual MInterval time_int() const;
   virtual ~Music(){}
   void print() const;
-  virtual void transpose (Melodic_req const *);
-  virtual void translate (Moment dt);
-  VIRTUAL_COPY_CONS(Music,Music);
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  /// Transpose, with the interval central C to #p#
+  virtual void transpose (Musical_pitch p);
+
+  /// Scale the music in time by #factor#.
+  virtual void compress (Moment factor);
+  VIRTUAL_COPY_CONS(Music);
+  
   Music();
 protected:
   virtual void do_print() const;