release: 1.3.83

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index ce355795d97dba423846a152a5f270d647932bee..9e50aa0998d47ef547b9d722efb9de174e59208b 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -12,10 +12,10 @@
 #define MUSIC_HH
 
 #include "virtual-methods.hh"
-#include "input.hh"
 #include "minterval.hh"
 #include "lily-proto.hh"
 #include "string.hh"
+#include "smobs.hh"
 
 /** Music is anything that has duration and supports both time compression and
   transposition.
@@ -27,15 +27,28 @@
 
   @see Music_sequence
 
+
+  TODO: make a equalp function for general music. 
   */
-class Music:public Input {
+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);
+
   virtual Musical_pitch to_relative_octave (Musical_pitch);
 
   /// The duration of this piece of music
   virtual Moment length_mom () const;
 
-  virtual ~Music(){}
   void print() const;
   /// Transpose, with the interval central C to #p#
   virtual void transpose (Musical_pitch p);
@@ -43,12 +56,18 @@ public:
   /// Scale the music in time by #factor#.
   virtual void compress (Moment factor);
   VIRTUAL_COPY_CONS(Music);
-  
+  Music (Music const &m);
   Music();
 protected:
   virtual void do_print() const;
+  DECLARE_SMOBS(Music,);
+  SCM immutable_property_alist_;
+  SCM mutable_property_alist_;
+ 
 };
 
+
+Music * unsmob_music (SCM);
 #endif // MUSIC_HH