* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

[lilypond.git] / lily / music-wrapper.cc

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 7106707d5a4abe8f2f6e23df8959cb801a664253..d66d9085f92a60307a5652d535320d65e15b1eee 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -8,14 +8,7 @@
 
 #include "music-wrapper.hh"
 
-Music_wrapper::Music_wrapper (SCM x)
-  : Music (x)
-{
-  if (!ly_c_procedure_p (length_callback_))
-    length_callback_ = length_callback_proc;
-  if (!ly_c_procedure_p (start_callback_))
-    start_callback_ = length_callback_proc;
-}
+#include "music.hh"
 
 MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
 SCM
@@ -35,11 +28,3 @@ Music_wrapper::length_callback (SCM m)
   return elt->get_length ().smobbed_copy ();
 }
 
-Music *
-Music_wrapper::element () const
-{
-  return unsmob_music (get_property ("element"));
-}
-
-ADD_MUSIC (Music_wrapper);
-