X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=9cf603a3a4929f70aaef18db2c0a5779f0985c8e;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=a91dcb5644d5c9a0116d29eaf6fe6ba939edc929;hpb=cda8fc1780778b760905c8832f7e984161218f20;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index a91dcb5644..9cf603a3a4 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,61 +1,35 @@
-/*   
-  lyric-combine-music.cc --  implement Lyric_combine_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "lyric-combine-music.hh"
-#include "lyric-combine-music-iterator.hh"
-#include "pitch.hh"
-
-Lyric_combine_music::Lyric_combine_music (Music * m, Music * l)
-{
-  set_mus_property ("music", m->self_scm ());
-  set_mus_property ("lyrics", l->self_scm ());  
-
-  set_mus_property ("iterator-ctor",
-		    Lyric_combine_music_iterator::constructor_cxx_function);
-}
+  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)
-{
-  music_l ()->transpose (p);
-  lyrics_l () ->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::length_mom () const
-{
-  return music_l ()->length_mom ();
-}
+#include "music.hh"
 
-Pitch
-Lyric_combine_music::to_relative_octave (  Pitch p )
+struct Lyric_combine_music
 {
-  p = music_l ()->to_relative_octave (p);
-  return lyrics_l () ->to_relative_octave (p);
-}
-
-void
-Lyric_combine_music::compress (Moment m)
-{
-  music_l ()->compress (m);
-}
-
-Music*
-Lyric_combine_music::music_l () const
-{
-  return unsmob_music (get_mus_property ("music"));
-}
+public:
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+};
 
-Music*
-Lyric_combine_music::lyrics_l () const
+MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1);
+SCM
+Lyric_combine_music::length_callback (SCM m)
 {
-  return unsmob_music (get_mus_property ("lyrics"));
+  Music *me = unsmob<Music> (m);
+  Music *melody = unsmob<Music> (scm_car (me->get_property ("elements")));
+  return melody->get_length ().smobbed_copy ();
 }