Issue 4997/3: Use Preinit in Music

diff --git a/lily/include/music.hh b/lily/include/music.hh
index c904dc3347fa457ad469aa04ad736a679a3dd835..32ca55babcdfaa9deff2d17706728d0f8e529961 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -27,9 +27,10 @@
 
 #define is_mus_type(x) internal_is_music_type (ly_symbol2scm (x))
 
-class Music : public Prob
+class Music : public Preinit<Music>, public Prob
 {
 public:
+  void pre_init ();
   Music (SCM init);
   Music (Music const &m);
   VIRTUAL_COPY_CONSTRUCTOR (Music, Music);

diff --git a/lily/music.cc b/lily/music.cc
index bbf7fe4f585da5c8ed909088627346767bb1971d..994d685ed2582e921bdd4519a0cf027b4d1c4099 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -45,12 +45,16 @@ Music::internal_is_music_type (SCM k) const
   return scm_is_true (scm_c_memq (k, ifs));
 }
 
-Music::Music (SCM init)
-  : Prob (ly_symbol2scm ("Music"), init)
+void
+Music::pre_init ()
 {
   length_callback_ = SCM_EOL;
   start_callback_ = SCM_EOL;
+}
 
+Music::Music (SCM init)
+  : Prob (ly_symbol2scm ("Music"), init)
+{
   length_callback_ = get_property ("length-callback");
   if (!ly_is_procedure (length_callback_))
     length_callback_ = duration_length_callback_proc;