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

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index a91dcb5644..6ce485c48b 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -3,59 +3,69 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2003 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 (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 ("iterator-ctor",
-		    Lyric_combine_music_iterator::constructor_cxx_function);
 }
 
 
 void
 Lyric_combine_music::transpose (Pitch p)
 {
-  music_l ()->transpose (p);
-  lyrics_l () ->transpose (p);
+  get_music ()->transpose (p);
+  get_lyrics () ->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 ();
 }
 
 Pitch
-Lyric_combine_music::to_relative_octave (  Pitch p )
+Lyric_combine_music::to_relative_octave (Pitch p)
 {
-  p = music_l ()->to_relative_octave (p);
-  return lyrics_l () ->to_relative_octave (p);
+  p = get_music ()->to_relative_octave (p);
+  return get_lyrics () ->to_relative_octave (p);
 }
 
 void
 Lyric_combine_music::compress (Moment m)
 {
-  music_l ()->compress (m);
+  get_music ()->compress (m);
 }
 
+
+
 Music*
-Lyric_combine_music::music_l () const
+Lyric_combine_music::get_music () const
 {
-  return unsmob_music (get_mus_property ("music"));
+  SCM l = get_mus_property ("elements");
+  if (!gh_pair_p (l))
+    return 0;
+  return unsmob_music (gh_car (l));
 }
 
+
 Music*
-Lyric_combine_music::lyrics_l () const
+Lyric_combine_music::get_lyrics () const
 {
-  return unsmob_music (get_mus_property ("lyrics"));
+  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));
 }
+
+
+ADD_MUSIC (Lyric_combine_music);