X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=7895e154a75eb536080c9034e0c1d1e469b54fc1;hb=9d8942c954e7d44d121c89719aceb91cf83d51ed;hp=9b779e5dc47c6892f4bb94f002eb33cfbf4b5892;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 9b779e5dc4..7895e154a7 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,47 +1,24 @@
-/*   
-  lyric-combine-music.cc --  implement Lyric_combine_music
-  
+/*
+  lyric-combine-music.cc -- implement Lyric_combine_music
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "lyric-combine-music.hh"
-#include "pitch.hh"
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-Lyric_combine_music::Lyric_combine_music ()
-  : Music ()
-{
-}
-
-Moment
-Lyric_combine_music::get_length () const
-{
-  return get_music ()->get_length ();
-}
+#include "music.hh"
 
-Music*
-Lyric_combine_music::get_music () const
+struct Lyric_combine_music
 {
-  SCM l = get_mus_property ("elements");
-  if (!gh_pair_p (l))
-    return 0;
-  return unsmob_music (gh_car (l));
-}
-
+public:
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+};
 
-Music*
-Lyric_combine_music::get_lyrics () const
+MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1);
+SCM
+Lyric_combine_music::length_callback (SCM m)
 {
-  SCM l = get_mus_property ("elements");
-  if (!gh_pair_p (l))
-    return 0;
-  l = gh_cdr (l);
-  if (!gh_pair_p (l))
-    return 0;
-  return unsmob_music (gh_car (l));
+  Music *me = unsmob_music (m);
+  Music *melody = unsmob_music (scm_car (me->get_property ("elements")));
+  return melody->get_length ().smobbed_copy ();
 }
-
-
-ADD_MUSIC (Lyric_combine_music);