X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=7895e154a75eb536080c9034e0c1d1e469b54fc1;hb=5bc9118a9fca0752373f52b4aa7d599b8880862f;hp=0b1f86b332836e5d207d0f9164dea67942bceb97;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 0b1f86b332..7895e154a7 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,63 +1,24 @@
-/*   
-  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 "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 ());  
-}
-
-
-void
-Lyric_combine_music::transpose (Musical_pitch p)
-{
-  music_l ()->transpose (p);
-  lyrics_l () ->transpose (p);
-}
-
-void
-Lyric_combine_music::do_print () const  
-{
-  music_l ()->print();
-  lyrics_l () ->print ();
-}
+/*
+  lyric-combine-music.cc -- implement Lyric_combine_music
 
-Moment
-Lyric_combine_music::length_mom () const
-{
-  return music_l ()->length_mom ();
-}
+  source file of the GNU LilyPond music typesetter
 
-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);
-}
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-void
-Lyric_combine_music::compress (Moment m)
-{
-  music_l ()->compress (m);
-}
+#include "music.hh"
 
-Music*
-Lyric_combine_music::music_l () const
+struct Lyric_combine_music
 {
-  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 ();
 }