X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=d3f2eafe853c04265f6f11ae99f3516568446f70;hb=cf5b2dd83e1f12e53181e9b43c62aa2e70137622;hp=3ab20f6d33af597aef3f625f2c25915e45cffdbb;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 3ab20f6d33..d3f2eafe85 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,78 +1,24 @@
-/*   
-  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>
-  
- */
-
-#include "lyric-combine-music.hh"
-#include "lyric-combine-music-iterator.hh"
-#include "pitch.hh"
-
-Lyric_combine_music::Lyric_combine_music (SCM l)
-  : Music (l)
-{
-  set_mus_property ("iterator-ctor",
-		    Lyric_combine_music_iterator::constructor_cxx_function);
-}
-
-
-void
-Lyric_combine_music::transpose (Pitch p)
-{
-  music_l ()->transpose (p);
-  lyrics_l () ->transpose (p);
-}
-
-
-Moment
-Lyric_combine_music::length_mom () const
-{
-  return music_l ()->length_mom ();
-}
-
-Pitch
-Lyric_combine_music::to_relative_octave (Pitch p)
-{
-  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);
-}
-
+/*
+  lyric-combine-music.cc -- implement Lyric_combine_music
 
+  source file of the GNU LilyPond music typesetter
 
-Music*
-Lyric_combine_music::music_l () const
-{
-  SCM l = get_mus_property ("elements");
-  if (!gh_pair_p (l))
-    return 0;
-  return unsmob_music (gh_car (l));
-}
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
+#include "music.hh"
 
-Music*
-Lyric_combine_music::lyrics_l () const
+struct Lyric_combine_music
 {
-  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));
-}
+public:
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+};
 
-Lyric_combine_music::Lyric_combine_music ()
-  : Music (SCM_EOL)
+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 ();
 }
-
-ADD_MUSIC (Lyric_combine_music);