X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper.cc;h=4486f589c8071c8621833e2c9ff33f3025312fc5;hb=01378c85f23e4bdbc07cd1f3b06ddfd573377bb9;hp=ffcba963366d7dc7fdd934377b0aa158dcd28319;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc index ffcba96336..4486f589c8 100644 --- a/lily/music-wrapper.cc +++ b/lily/music-wrapper.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2003 Han-Wen Nienhuys */ @@ -13,41 +13,29 @@ -void -Music_wrapper::transpose (Musical_pitch p) +Music_wrapper::Music_wrapper () + : Music () { - if (element ()) - element ()-> transpose (p); -} - - -Music_wrapper::Music_wrapper(Music*p) -{ - set_mus_property ("element", p->self_scm ()); - scm_unprotect_object (p->self_scm ()); } Moment -Music_wrapper::length_mom () const -{ - return element ()->length_mom (); -} - -Musical_pitch -Music_wrapper::to_relative_octave (Musical_pitch p) +Music_wrapper::get_length () const { - return element ()->to_relative_octave (p); + return element ()->get_length (); } - Music* Music_wrapper::element () const { return unsmob_music (get_mus_property ("element")); } -void -Music_wrapper::compress (Moment m) + +ADD_MUSIC (Music_wrapper); + + +Moment +Music_wrapper::start_mom () const { - element ()->compress (m); + return element ()->start_mom (); }