* 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 2b11f459c166b8bad89e1b04d1a41f9c1cc32806..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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -19,6 +19,8 @@
 #include "music-constructor.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.
   
@@ -32,43 +34,44 @@
 
   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 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_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 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);
 
   /// Scale the music in time by #factor#.
   virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS (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);
+SCM ly_deep_mus_copy (SCM);
 
+#endif // MUSIC_HH