* The grand 2005-2006 replace.

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 16536ccc2d01d153d665fadfdefc26024e35c101..140c95c02a8809abbea1d9c81439744f73cb560f 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,31 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_HH
 #define MUSIC_HH
 
 #include "virtual-methods.hh"
-#include "minterval.hh"
-#include "music-constructor.hh"
+#include "smobs.hh"
+#include "moment.hh"
+#include "pitch.hh"
 
 #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-/** 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_sequence
-
-
-  TODO: make a equalp function for general music. 
-  */
 class Music
 {
 public:
@@ -35,16 +23,19 @@ public:
   Music (Music const &m);
   VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
 
-  Input *origin () const; 
+  Input *origin () const;
   void set_spot (Input);
 
   SCM internal_get_property (SCM) const;
-  void internal_set_property (SCM , SCM val);
-  SCM get_property_alist (bool mut) const;
+  void internal_set_property (SCM, SCM val);
+  SCM internal_get_object (SCM) const;
+  void internal_set_object (SCM, SCM val);
+  SCM get_property_alist (bool mutble) const;
   bool internal_is_music_type (SCM) const;
-  int duration_log () const;
-  
-  virtual Pitch to_relative_octave (Pitch);
+
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
+  Pitch to_relative_octave (Pitch);
+  Pitch generic_to_relative_octave (Pitch);
   String name () const;
   Moment get_length () const;
   Moment start_mom () const;
@@ -52,12 +43,14 @@ public:
 
   /// Transpose, with the interval central C to #p#
   void transpose (Pitch p);
-  
+
   /// Scale the music in time by #factor#.
   void compress (Moment factor);
-  
+
+  DECLARE_SCHEME_CALLBACK (duration_length_callback, (SCM));
 protected:
   DECLARE_SMOBS (Music,);
+
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
 protected:
@@ -66,11 +59,10 @@ protected:
   friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-DECLARE_TYPE_P(Music);
-DECLARE_UNSMOB(Music,music);
+DECLARE_TYPE_P (Music);
+DECLARE_UNSMOB (Music, music);
 
 Music *make_music_by_name (SCM sym);
 SCM ly_music_deep_copy (SCM);
-SCM ly_music_scorify (SCM, SCM);
 
 #endif /* MUSIC_HH */