X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fmusic.hh;h=4ed048fda01448255239261c76830f940b91c318;hb=99539bb94e2fef6ed6c053564c40db64f7808f36;hp=140c95c02a8809abbea1d9c81439744f73cb560f;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 140c95c02a..4ed048fda0 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,20 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_HH
 #define MUSIC_HH
 
-#include "virtual-methods.hh"
 #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 +26,13 @@ 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;
 
+  Stream_event *to_event () 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 +42,30 @@ 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);
+SCM ly_camel_case_2_lisp_identifier (SCM name_sym);
+
+extern SCM ly_music_p_proc;
+
+/* common transposition function for music and event */
+void transpose_mutable (SCM alist, Pitch delta);
 
 #endif /* MUSIC_HH */