X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=a7766abbef024853e5fd2518ca54aea150bd0d2d;hb=10fce7970987502ec8340819411897a829f6be23;hp=9abad8a95829c9d05b846febb22aa909562df00e;hpb=ba858880848d6aca1de4401d185860eb2017a01c;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 9abad8a958..a7766abbef 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -3,45 +3,25 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "lyric-combine-music.hh"
+#include "music.hh"
 #include "pitch.hh"
 
-Lyric_combine_music::Lyric_combine_music ()
-  : Music ()
+struct Lyric_combine_music
 {
-}
+public:
+  DECLARE_SCHEME_CALLBACK(length_callback, (SCM));
+};
 
-Moment
-Lyric_combine_music::get_length () const
-{
-  return get_music ()->get_length ();
-}
 
-Music*
-Lyric_combine_music::get_music () const
+MAKE_SCHEME_CALLBACK(Lyric_combine_music, length_callback, 1);
+SCM
+Lyric_combine_music::length_callback (SCM m)
 {
-  SCM l = get_property ("elements");
-  if (!ly_c_pair_p (l))
-    return 0;
-  return unsmob_music (ly_car (l));
+  Music * me = unsmob_music (m);
+  Music *melody = unsmob_music (scm_car (me->get_property ("elements")));
+  return melody->get_length ().smobbed_copy ();
 }
-
-
-Music*
-Lyric_combine_music::get_lyrics () const
-{
-  SCM l = get_property ("elements");
-  if (!ly_c_pair_p (l))
-    return 0;
-  l = ly_cdr (l);
-  if (!ly_c_pair_p (l))
-    return 0;
-  return unsmob_music (ly_car (l));
-}
-
-
-ADD_MUSIC (Lyric_combine_music);