* Another grand 2003 update.

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index d89c24f70eed9240031b5421f969f2e6d3fb5a57..f85ecd8bb313b726078a8f8df667cf1e603ebdfb 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -21,6 +21,7 @@
 
 #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
   transposition.
@@ -42,18 +43,13 @@ public:
 
   SCM internal_get_mus_property (SCM) const;
   void internal_set_mus_property (SCM , SCM val);
-#if 0
-  void set_immutable_mus_property (const char * , SCM val);
-  void set_immutable_mus_property (SCM key, SCM val);
-
-  SCM remove_mus_property (const char* nm);
-#endif
-
-
+  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 length_mom () const;
+  virtual Moment get_length () const;
   virtual Moment start_mom () const;
   void print () const;
   /// Transpose, with the interval central C to #p#
@@ -64,16 +60,16 @@ public:
   VIRTUAL_COPY_CONS (Music);
   Music ();
   Music (Music const &m);
-  Music (SCM);
 protected:
   DECLARE_SMOBS (Music,);
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
+  friend SCM ly_extended_make_music(SCM,SCM);
 };
 
 
 DECLARE_UNSMOB(Music,music);
-#endif // MUSIC_HH
-
 
+Music* make_music_by_name (SCM sym);
 
+#endif // MUSIC_HH