changes 2.3.x to 2.5.x.

[lilypond.git] / lily / lyric-combine-music.cc

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index 9abad8a95829c9d05b846febb22aa909562df00e..021c915953faff9a7be9e3ba969871d8c1ad7220 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -25,9 +25,9 @@ Music*
 Lyric_combine_music::get_music () const
 {
   SCM l = get_property ("elements");
-  if (!ly_c_pair_p (l))
+  if (!scm_is_pair (l))
     return 0;
-  return unsmob_music (ly_car (l));
+  return unsmob_music (scm_car (l));
 }
 
 
@@ -35,12 +35,12 @@ Music*
 Lyric_combine_music::get_lyrics () const
 {
   SCM l = get_property ("elements");
-  if (!ly_c_pair_p (l))
+  if (!scm_is_pair (l))
     return 0;
-  l = ly_cdr (l);
-  if (!ly_c_pair_p (l))
+  l = scm_cdr (l);
+  if (!scm_is_pair (l))
     return 0;
-  return unsmob_music (ly_car (l));
+  return unsmob_music (scm_car (l));
 }