*** empty log message ***

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

diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh
index b222111fe4368b3dbc5712c2b1743505551428d0..e84b1d2fbc8e9f1be45439e644cc8b587d6bb52b 100644 (file)
--- a/lily/include/repeated-music.hh
+++ b/lily/include/repeated-music.hh
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#ifndef RepEATED_MUSIC_HH
-#define RepEATED_MUSIC_HH
+#ifndef REPEATED_MUSIC_HH
+#define REPEATED_MUSIC_HH
 
 #include "music.hh"
 
@@ -49,30 +49,27 @@
 class Repeated_music : public Music
 {
 public:
-  Music * body () const;
-  Music_sequence * alternatives () const;
-
-  /// how often do we repeat?
-  int repeat_count( ) const;
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-
-  Moment body_length_mom () const;
-  Moment alternatives_length_mom (bool fold) const;
-
-  DECLARE_SCHEME_CALLBACK(unfolded_music_length, (SCM));
-  DECLARE_SCHEME_CALLBACK(volta_music_length, (SCM));
-  DECLARE_SCHEME_CALLBACK(folded_music_length, (SCM));    
-  
-  /// 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);
-
-  Repeated_music (Music*, int , Music_sequence*);
-  Repeated_music (Repeated_music const&);
+  Repeated_music ();
+  Repeated_music (SCM);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Repeated_music);
+
+  Music *body () const;
+  SCM alternatives () const;
+
+  /* How often do we repeat? */
+  int repeat_count () const;
+  virtual Pitch to_relative_octave (Pitch);
+
+  Moment body_get_length () const;
+  Moment alternatives_get_length (bool fold) const;
+  Moment alternatives_volta_get_length () const;  
+
+  DECLARE_SCHEME_CALLBACK (unfolded_music_length, (SCM));
+  DECLARE_SCHEME_CALLBACK (volta_music_length, (SCM));
+  DECLARE_SCHEME_CALLBACK (folded_music_length, (SCM));    
+  DECLARE_SCHEME_CALLBACK (minimum_start, (SCM));
+  DECLARE_SCHEME_CALLBACK (first_start, (SCM));    
 };
 
 
-#endif /* RepEATED_MUSIC_HH */
+#endif /* REPEATED_MUSIC_HH */