-/*
- lyric-combine-music.cc -- implement Lyric_combine_music
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-
-#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);
-}
-
-
-void
-Lyric_combine_music::transpose (Musical_pitch p)
-{
- music_l ()->transpose (p);
- lyrics_l () ->transpose (p);
-}
+/*
+ lyric-combine-music.cc -- implement Lyric_combine_music
+ source file of the GNU LilyPond music typesetter
-Moment
-Lyric_combine_music::length_mom () const
-{
- return music_l ()->length_mom ();
-}
+ (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
-Musical_pitch
-Lyric_combine_music::to_relative_octave ( Musical_pitch p )
-{
- p = music_l ()->to_relative_octave (p);
- return lyrics_l () ->to_relative_octave (p);
-}
+#include "music.hh"
-void
-Lyric_combine_music::compress (Moment m)
+struct Lyric_combine_music
{
- 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 = unsmob_music (m);
+ Music *melody = unsmob_music (scm_car (me->get_property ("elements")));
+ return melody->get_length ().smobbed_copy ();
}