X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=e8b67e6b07129fa805c43444e681ec09b85a6b02;hb=16e626a8524421eda692cb19be6d0ec5bff723b7;hp=c7f9286b4e687cf9732fa17478ef50319b55f3d0;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index c7f9286b4e..e8b67e6b07 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,47 +1,35 @@
-/*   
-  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>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "lyric-combine-music.hh"
-#include "pitch.hh"
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-Lyric_combine_music::Lyric_combine_music ()
-  : Music ()
-{
-}
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-Moment
-Lyric_combine_music::get_length () const
-{
-  return get_music ()->get_length ();
-}
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-Music*
-Lyric_combine_music::get_music () const
-{
-  SCM l = get_property ("elements");
-  if (!is_pair (l))
-    return 0;
-  return unsmob_music (ly_car (l));
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
+#include "music.hh"
 
-Music*
-Lyric_combine_music::get_lyrics () const
+struct Lyric_combine_music
 {
-  SCM l = get_property ("elements");
-  if (!is_pair (l))
-    return 0;
-  l = ly_cdr (l);
-  if (!is_pair (l))
-    return 0;
-  return unsmob_music (ly_car (l));
-}
-
+public:
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+};
 
-ADD_MUSIC (Lyric_combine_music);
+MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1);
+SCM
+Lyric_combine_music::length_callback (SCM m)
+{
+  Music *me = unsmob_music (m);
+  Music *melody = unsmob_music (scm_car (me->get_property ("elements")));
+  return melody->get_length ().smobbed_copy ();
+}