X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=7611d7554378e2ced26e1b0fe3162e0bb08c1e71;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=cb77d13c1eafc71ae6f9f694c9c78025dff3a66e;hpb=bdd3b8c31fbba8a411da9da1073e4067708c6893;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index cb77d13c1e..7611d75543 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,71 +1,35 @@
-/*   
-  lyric-combine-music.cc --  implement Lyric_combine_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2002 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"
-
-Lyric_combine_music::Lyric_combine_music ()
-  : Music ()
-{
-}
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  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.
 
-void
-Lyric_combine_music::transpose (Pitch p)
-{
-  get_music ()->transpose (p);
-  get_lyrics () ->transpose (p);
-}
+  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.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-Moment
-Lyric_combine_music::get_length () const
-{
-  return get_music ()->get_length ();
-}
+#include "music.hh"
 
-Pitch
-Lyric_combine_music::to_relative_octave (Pitch p)
+struct Lyric_combine_music
 {
-  p = get_music ()->to_relative_octave (p);
-  return get_lyrics () ->to_relative_octave (p);
-}
+public:
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+};
 
-void
-Lyric_combine_music::compress (Moment m)
+MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1);
+SCM
+Lyric_combine_music::length_callback (SCM m)
 {
-  get_music ()->compress (m);
+  Music *me = Music::unsmob (m);
+  Music *melody = Music::unsmob (scm_car (me->get_property ("elements")));
+  return melody->get_length ().smobbed_copy ();
 }
-
-
-
-Music*
-Lyric_combine_music::get_music () const
-{
-  SCM l = get_mus_property ("elements");
-  if (!gh_pair_p (l))
-    return 0;
-  return unsmob_music (gh_car (l));
-}
-
-
-Music*
-Lyric_combine_music::get_lyrics () const
-{
-  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));
-}
-
-
-ADD_MUSIC (Lyric_combine_music);