X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=9abad8a95829c9d05b846febb22aa909562df00e;hb=81d5f3ea5db5b76b81956c9504fd84dbbb51a060;hp=f474443bcaf96b7308e3ab6b2d65901e115a3502;hpb=8da6cef580cce3365b219f6aca429b434cb60fcf;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index f474443bca..9abad8a958 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -3,59 +3,45 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "lyric-combine-music.hh"
-#include "lyric-combine-music-iterator.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
 
-Lyric_combine_music::Lyric_combine_music (Music * m, Music * l)
+Lyric_combine_music::Lyric_combine_music ()
+  : Music ()
 {
-  set_mus_property ("music", m->self_scm ());
-  set_mus_property ("lyrics", l->self_scm ());  
-
-  set_mus_property ("type",
-		    Lyric_combine_music_iterator::constructor_cxx_function);
 }
 
-
-void
-Lyric_combine_music::transpose (Musical_pitch p)
-{
-  music_l ()->transpose (p);
-  lyrics_l () ->transpose (p);
-}
-
-
 Moment
-Lyric_combine_music::length_mom () const
+Lyric_combine_music::get_length () const
 {
-  return music_l ()->length_mom ();
+  return get_music ()->get_length ();
 }
 
-Musical_pitch
-Lyric_combine_music::to_relative_octave (  Musical_pitch p )
+Music*
+Lyric_combine_music::get_music () const
 {
-  p = music_l ()->to_relative_octave (p);
-  return lyrics_l () ->to_relative_octave (p);
+  SCM l = get_property ("elements");
+  if (!ly_c_pair_p (l))
+    return 0;
+  return unsmob_music (ly_car (l));
 }
 
-void
-Lyric_combine_music::compress (Moment m)
-{
-  music_l ()->compress (m);
-}
 
 Music*
-Lyric_combine_music::music_l () const
+Lyric_combine_music::get_lyrics () const
 {
-  return unsmob_music (get_mus_property ("music"));
+  SCM l = get_property ("elements");
+  if (!ly_c_pair_p (l))
+    return 0;
+  l = ly_cdr (l);
+  if (!ly_c_pair_p (l))
+    return 0;
+  return unsmob_music (ly_car (l));
 }
 
-Music*
-Lyric_combine_music::lyrics_l () const
-{
-  return unsmob_music (get_mus_property ("lyrics"));
-}
+
+ADD_MUSIC (Lyric_combine_music);