X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=9cf603a3a4929f70aaef18db2c0a5779f0985c8e;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=56aef24e9c0323fd91dd553247c769cd51a123c2;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 56aef24e9c..9cf603a3a4 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2010 Han-Wen Nienhuys + Copyright (C) 1999--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1); SCM Lyric_combine_music::length_callback (SCM m) { - Music *me = unsmob_music (m); - Music *melody = unsmob_music (scm_car (me->get_property ("elements"))); + Music *me = unsmob (m); + Music *melody = unsmob (scm_car (me->get_property ("elements"))); return melody->get_length ().smobbed_copy (); }