2003 -> 2004

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 2c67ebdd90e00bd35743dffe7cc4b4f8871984c7..95a9777f3b1cd2c69c91f401c669d07edcfbc600 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -19,6 +19,10 @@
 #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
   transposition.
   
@@ -36,21 +40,17 @@ class Music {
 public:
   Input *origin () const; 
   void set_spot (Input);  
-  
-  SCM get_mus_property (const char*) const;
-  SCM get_mus_property (SCM) const;
-  void set_mus_property (const char * , SCM val);
-  void set_immutable_mus_property (const char * , SCM val);
-  void set_immutable_mus_property (SCM key, SCM val);  
-  void set_mus_property (SCM , SCM val);  
-  void set_mus_pointer (const char*, SCM val);
-  SCM remove_mus_property (const char* nm);
 
+  SCM internal_get_mus_property (SCM) const;
+  void internal_set_mus_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 length_mom () const;
-
+  virtual Moment get_length () const;
+  virtual Moment start_mom () const;
   void print () const;
   /// Transpose, with the interval central C to #p#
   virtual void transpose (Pitch p);
@@ -60,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);
 };
 
 
-Music * unsmob_music (SCM);
-#endif // MUSIC_HH
-
+DECLARE_UNSMOB(Music,music);
 
+Music* make_music_by_name (SCM sym);
 
+#endif // MUSIC_HH