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

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 5676d4cff0..7611d75543 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,75 +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 "musical-pitch.hh"
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-Lyric_combine_music::Lyric_combine_music (Music * m, Music * l)
-{
-  music_p_ = m;
-  lyrics_p_ = l;
-}
+  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.
 
-Lyric_combine_music::~Lyric_combine_music ()
-{
-  delete music_p_;
-  delete lyrics_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.
 
-Lyric_combine_music::Lyric_combine_music (Lyric_combine_music const&s)
-  : Music (s)
-{
-  music_p_ = s.music_p_ ? s.music_p_->clone ():0;
-  lyrics_p_ = s.lyrics_p_ ? s.lyrics_p_->clone ():0;
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-void
-Lyric_combine_music::transpose (Musical_pitch p)
-{
-  music_p_->transpose (p);
-  lyrics_p_->transpose (p);
-}
-
-void
-Lyric_combine_music::do_print () const  
-{
-  music_p_->print();
-  lyrics_p_->print ();
-}
+#include "music.hh"
 
-Moment
-Lyric_combine_music::length_mom () const
+struct Lyric_combine_music
 {
-  return music_p_->length_mom ();
-}
-
-Musical_pitch
-Lyric_combine_music::to_relative_octave (  Musical_pitch p )
-{
-  p = music_p_->to_relative_octave (p);
-  return lyrics_p_->to_relative_octave (p);
-}
-
-void
-Lyric_combine_music::compress (Moment m)
-{
-  music_p_->compress (m);
-}
-
-Music*
-Lyric_combine_music::music_l () const
-{
-  return music_p_;
-}
+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 lyrics_p_;
+  Music *me = Music::unsmob (m);
+  Music *melody = Music::unsmob (scm_car (me->get_property ("elements")));
+  return melody->get_length ().smobbed_copy ();
 }