Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 140c95c02a8809abbea1d9c81439744f73cb560f..3c43209b47307e256f8b8607ca9938b7f40617fa 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -13,10 +13,11 @@
 #include "smobs.hh"
 #include "moment.hh"
 #include "pitch.hh"
+#include "prob.hh"
 
 #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-class Music
+class Music : public Prob
 {
 public:
   Music (SCM init);
@@ -26,17 +27,11 @@ public:
   Input *origin () const;
   void set_spot (Input);
 
-  SCM internal_get_property (SCM) const;
-  void internal_set_property (SCM, SCM val);
-  SCM internal_get_object (SCM) const;
-  void internal_set_object (SCM, SCM val);
-  SCM get_property_alist (bool mutble) const;
   bool internal_is_music_type (SCM) const;
 
   DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
   Pitch to_relative_octave (Pitch);
   Pitch generic_to_relative_octave (Pitch);
-  String name () const;
   Moment get_length () const;
   Moment start_mom () const;
   void print () const;
@@ -46,23 +41,25 @@ public:
 
   /// Scale the music in time by #factor#.
   void compress (Moment factor);
+  
+  // Broadcast the event in a context's event-source.
+  void send_to_context (Context *c);
 
   DECLARE_SCHEME_CALLBACK (duration_length_callback, (SCM));
+  
 protected:
-  DECLARE_SMOBS (Music,);
-
-  SCM immutable_property_alist_;
-  SCM mutable_property_alist_;
+  virtual SCM copy_mutable_properties () const;
+  virtual void type_check_assignment (SCM, SCM) const;
+  virtual void derived_mark () const;
 protected:
   SCM length_callback_;
   SCM start_callback_;
   friend SCM ly_extended_make_music (SCM, SCM);
 };
 
-DECLARE_TYPE_P (Music);
-DECLARE_UNSMOB (Music, music);
-
+Music *unsmob_music (SCM);
 Music *make_music_by_name (SCM sym);
 SCM ly_music_deep_copy (SCM);
+extern SCM ly_music_p_proc;
 
 #endif /* MUSIC_HH */