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

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index cb77d13c1e..c290ee2dd4 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,71 +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 "pitch.hh"
-
-Lyric_combine_music::Lyric_combine_music ()
-  : Music ()
-{
-}
-
+/*
+  lyric-combine-music.cc -- implement Lyric_combine_music
 
-void
-Lyric_combine_music::transpose (Pitch p)
-{
-  get_music ()->transpose (p);
-  get_lyrics () ->transpose (p);
-}
-
-
-Moment
-Lyric_combine_music::get_length () const
-{
-  return get_music ()->get_length ();
-}
-
-Pitch
-Lyric_combine_music::to_relative_octave (Pitch p)
-{
-  p = get_music ()->to_relative_octave (p);
-  return get_lyrics () ->to_relative_octave (p);
-}
-
-void
-Lyric_combine_music::compress (Moment m)
-{
-  get_music ()->compress (m);
-}
+  source file of the GNU LilyPond music typesetter
 
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
+#include "music.hh"
 
-Music*
-Lyric_combine_music::get_music () const
+struct Lyric_combine_music
 {
-  SCM l = get_mus_property ("elements");
-  if (!gh_pair_p (l))
-    return 0;
-  return unsmob_music (gh_car (l));
-}
-
+public:
+  DECLARE_SCHEME_CALLBACK (length_callback, (SCM));
+};
 
-Music*
-Lyric_combine_music::get_lyrics () const
+MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1);
+SCM
+Lyric_combine_music::length_callback (SCM m)
 {
-  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));
+  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);