X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=7611d7554378e2ced26e1b0fe3162e0bb08c1e71;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f474443bcaf96b7308e3ab6b2d65901e115a3502;hpb=8da6cef580cce3365b219f6aca429b434cb60fcf;p=lilypond.git diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index f474443bca..7611d75543 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -1,61 +1,35 @@ -/* - lyric-combine-music.cc -- implement Lyric_combine_music - - source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. -#include "lyric-combine-music.hh" -#include "lyric-combine-music-iterator.hh" -#include "musical-pitch.hh" - -Lyric_combine_music::Lyric_combine_music (Music * m, Music * l) -{ - set_mus_property ("music", m->self_scm ()); - set_mus_property ("lyrics", l->self_scm ()); - - set_mus_property ("type", - Lyric_combine_music_iterator::constructor_cxx_function); -} + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -void -Lyric_combine_music::transpose (Musical_pitch p) -{ - music_l ()->transpose (p); - lyrics_l () ->transpose (p); -} + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -Moment -Lyric_combine_music::length_mom () const -{ - return music_l ()->length_mom (); -} +#include "music.hh" -Musical_pitch -Lyric_combine_music::to_relative_octave ( Musical_pitch p ) +struct Lyric_combine_music { - p = music_l ()->to_relative_octave (p); - return lyrics_l () ->to_relative_octave (p); -} - -void -Lyric_combine_music::compress (Moment m) -{ - music_l ()->compress (m); -} - -Music* -Lyric_combine_music::music_l () const -{ - return unsmob_music (get_mus_property ("music")); -} +public: + DECLARE_SCHEME_CALLBACK (length_callback, (SCM)); +}; -Music* -Lyric_combine_music::lyrics_l () const +MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1); +SCM +Lyric_combine_music::length_callback (SCM m) { - return unsmob_music (get_mus_property ("lyrics")); + Music *me = Music::unsmob (m); + Music *melody = Music::unsmob (scm_car (me->get_property ("elements"))); + return melody->get_length ().smobbed_copy (); }