* lily/include/music.hh (class Music): unvirtualize transpose().

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index d804cfa6856175df8941504007ebb200f1266666..16536ccc2d01d153d665fadfdefc26024e35c101 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,25 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-
 #ifndef MUSIC_HH
 #define MUSIC_HH
 
 #include "virtual-methods.hh"
 #include "minterval.hh"
-#include "lily-proto.hh"
-#include "string.hh"
-#include "smobs.hh"
 #include "music-constructor.hh"
 
-
-#define get_mus_property(x) internal_get_mus_property(ly_symbol2scm(x))
-#define set_mus_property(x,y) internal_set_mus_property(ly_symbol2scm (x), y)
-#define is_mus_type(x) internal_is_music_type(ly_symbol2scm (x))
+#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.
@@ -36,40 +28,49 @@
 
   TODO: make a equalp function for general music. 
   */
-class Music {
+class Music
+{
 public:
+  Music (SCM init);
+  Music (Music const &m);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
+
   Input *origin () const; 
-  void set_spot (Input);  
+  void set_spot (Input);
 
-  SCM internal_get_mus_property (SCM) const;
-  void internal_set_mus_property (SCM , SCM val);
+  SCM internal_get_property (SCM) const;
+  void internal_set_property (SCM , SCM val);
   SCM get_property_alist (bool mut) const;
   bool internal_is_music_type (SCM) const;
+  int duration_log () const;
   
   virtual Pitch to_relative_octave (Pitch);
-  String name ()const;
-  /// The duration of this piece of music
-  virtual Moment get_length () const;
-  virtual Moment start_mom () const;
+  String name () const;
+  Moment get_length () const;
+  Moment start_mom () const;
   void print () const;
-  /// Transpose, with the interval central C to #p#
-  virtual void transpose (Pitch p);
 
+  /// Transpose, with the interval central C to #p#
+  void transpose (Pitch p);
+  
   /// Scale the music in time by #factor#.
-  virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS (Music);
-  Music ();
-  Music (Music const &m);
+  void compress (Moment factor);
+  
 protected:
   DECLARE_SMOBS (Music,);
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
-  friend SCM ly_extended_make_music(SCM,SCM);
+protected:
+  SCM length_callback_;
+  SCM start_callback_;
+  friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-
+DECLARE_TYPE_P(Music);
 DECLARE_UNSMOB(Music,music);
 
-Music* make_music_by_name (SCM sym);
+Music *make_music_by_name (SCM sym);
+SCM ly_music_deep_copy (SCM);
+SCM ly_music_scorify (SCM, SCM);
 
-#endif // MUSIC_HH
+#endif /* MUSIC_HH */