patch::: 1.3.108.jcn1

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index ad8dca599f93affbd60d72d04f3cabdd3a22c7c4..a139ae28d4af589a286a80b0a8576d433238f555 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -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,39 +27,47 @@
 
   @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 length_mom () const;
 
-  virtual ~Music(){}
   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 (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