* Documentation/user/tutorial.itely: Revised (continued).

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 7f6c4e89503a7a5d78c4641c73c3cef67db3cac7..78d1be7bde982e4274190a3a77fc440e8397c372 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -19,8 +19,6 @@
 #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))
 
 /** Music is anything that has duration and supports both time compression and
@@ -36,18 +34,23 @@
 
   TODO: make a equalp function for general music. 
   */
-class Music {
+class Music
+{
 public:
+  Music ();
+  Music (Music const &m);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Music);
+
   Input *origin () const; 
   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;
   
   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;
@@ -57,9 +60,7 @@ public:
 
   /// Scale the music in time by #factor#.
   virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS (Music);
-  Music ();
-  Music (Music const &m);
+  
 protected:
   DECLARE_SMOBS (Music,);
   SCM immutable_property_alist_;
@@ -71,6 +72,6 @@ protected:
 DECLARE_UNSMOB(Music,music);
 
 Music* make_music_by_name (SCM sym);
-
+SCM ly_deep_mus_copy (SCM);
 
 #endif // MUSIC_HH