* lily/font-select.cc (get_font_by_design_size): revert

[lilypond.git] / lily / lyric-combine-music.cc

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 82f1e56de7eba7cd5299ec13c0c7eab07375c6f2..440e0b231987805424ef46dc04ab888a1490f28a 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,48 +1,27 @@
 /*   
-  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>
+  (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 ()
-{
-}
-
-Moment
-Lyric_combine_music::get_length () const
-{
-  return get_music ()->get_length ();
-}
-
-Music*
-Lyric_combine_music::get_music () const
+struct Lyric_combine_music
 {
-  SCM l = get_property ("elements");
-  if (!scm_is_pair (l))
-    return 0;
-  return unsmob_music (scm_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_property ("elements");
-  if (!scm_is_pair (l))
-    return 0;
-  l = scm_cdr (l);
-  if (!scm_is_pair (l))
-    return 0;
-  return unsmob_music (scm_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);