X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic.hh;h=2b11f459c166b8bad89e1b04d1a41f9c1cc32806;hb=fc3e875d6bf06f0680e897faffdcab36ad975a03;hp=efb2f712ee2681f8a4d38bfaf0d5525aecb93cb8;hpb=ae9dfbb452eff2e47f1330854a12d73161fcb677;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index efb2f712ee..2b11f459c1 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,54 +12,62 @@
 #define MUSIC_HH
 
 #include "virtual-methods.hh"
-#include "input.hh"
 #include "minterval.hh"
 #include "lily-proto.hh"
 #include "string.hh"
+#include "smobs.hh"
+#include "music-constructor.hh"
+
 
 /** Music is anything that has duration and supports both time compression and
   transposition.
   
   In Lily, everything that can be thought to have a length and a pitch
-  (which has a duration which can be transposed) is considered "music",
+ (which has a duration which can be transposed) is considered "music",
 
   Music is hierarchical: 
 
   @see Music_sequence
 
+
+  TODO: make a equalp function for general music. 
   */
-class Music:public Input {
+class Music {
 public:
-    
-  /** The kind of translation needed for this music.  This doesn't
-    make sense for simple (ie non-list) music, but it does no harm
-    here. Yes, it did harm Music_sequence: you can forget to copy it.
-      
-    */
-  String translator_type_str_;
-
-  /// what identification for the translation unit
-  String translator_id_str_;    
+  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);
 
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  virtual Pitch to_relative_octave (Pitch);
 
   /// The duration of this piece of music
-  virtual Moment duration () const;
+  virtual Moment length_mom () const;
 
-  virtual ~Music(){}
-  void print() const;
+  void print () const;
   /// Transpose, with the interval central C to #p#
-  virtual void transpose (Musical_pitch p);
+  virtual void transpose (Pitch p);
 
   /// Scale the music in time by #factor#.
   virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS(Music,Music);
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Music();
+  VIRTUAL_COPY_CONS (Music);
+  Music (Music const &m);
+  Music (SCM);
 protected:
-  virtual void do_print() const;
+  DECLARE_SMOBS (Music,);
+  SCM immutable_property_alist_;
+  SCM mutable_property_alist_;
 };
 
+
+Music * unsmob_music (SCM);
 #endif // MUSIC_HH