X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=644ba9beb727e5982603ba69485a1c4dfdda15b2;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=7ab62470b567bc5fad37a004329749d7fa7d00a2;hpb=2f0c6eb19208485a86d3416db3f3640a1d54752a;p=lilypond.git

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 7ab62470b5..644ba9beb7 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,7 +30,8 @@ void
 transpose_music_list (SCM lst, Pitch rq)
 {
   for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
-    unsmob_music (scm_car (s))->transpose (rq);
+    if (Prob *p = unsmob<Prob> (scm_car (s)))
+      p->transpose (rq);
 }
 
 Moment
@@ -41,7 +42,7 @@ Music_sequence::cumulative_length (SCM l)
 
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
-      Moment l = unsmob_music (scm_car (s))->get_length ();
+      Moment l = unsmob<Music> (scm_car (s))->get_length ();
       if (last_len.grace_part_ && l.main_part_)
         last_len.grace_part_ = Rational (0);
       cumulative += last_len;
@@ -60,7 +61,7 @@ Music_sequence::maximum_length (SCM l)
   Moment dur = 0;
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music *m = unsmob_music (scm_car (s));
+      Music *m = unsmob<Music> (scm_car (s));
       if (!m)
         programming_error ("Music sequence should have music elements");
       else
@@ -77,7 +78,7 @@ MAKE_SCHEME_CALLBACK (Music_sequence, maximum_length_callback, 1);
 SCM
 Music_sequence::maximum_length_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = unsmob<Music> (m);
   return maximum_length (me->get_property ("elements")).smobbed_copy ();
 }
 
@@ -85,8 +86,8 @@ MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_length_callback, 1);
 SCM
 Music_sequence::event_chord_length_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
-  Duration *d = unsmob_duration (me->get_property ("duration"));
+  Music *me = unsmob<Music> (m);
+  Duration *d = unsmob<Duration> (me->get_property ("duration"));
   // Preset duration is used in chord repetitions.
   if (d)
     {
@@ -100,7 +101,7 @@ MAKE_SCHEME_CALLBACK (Music_sequence, cumulative_length_callback, 1);
 SCM
 Music_sequence::cumulative_length_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = unsmob<Music> (m);
   return cumulative_length (me->get_property ("elements")).smobbed_copy ();
 }
 
@@ -108,7 +109,7 @@ MAKE_SCHEME_CALLBACK (Music_sequence, minimum_start_callback, 1);
 SCM
 Music_sequence::minimum_start_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = unsmob<Music> (m);
   return minimum_start (me->get_property ("elements")).smobbed_copy ();
 }
 
@@ -116,7 +117,7 @@ MAKE_SCHEME_CALLBACK (Music_sequence, first_start_callback, 1);
 SCM
 Music_sequence::first_start_callback (SCM m)
 {
-  Music *me = unsmob_music (m);
+  Music *me = unsmob<Music> (m);
   return first_start (me->get_property ("elements")).smobbed_copy ();
 }
 
@@ -129,7 +130,7 @@ music_list_to_relative (SCM l, Pitch p, bool ret_first)
   Pitch last = p;
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
-      if (Music *m = unsmob_music (scm_car (s)))
+      if (Music *m = unsmob<Music> (scm_car (s)))
         {
           last = m->to_relative_octave (last);
           if (!count++)
@@ -144,7 +145,7 @@ void
 compress_music_list (SCM l, Moment m)
 {
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
-    unsmob_music (scm_car (s))->compress (m);
+    unsmob<Music> (scm_car (s))->compress (m);
 }
 
 Moment
@@ -153,7 +154,7 @@ Music_sequence::minimum_start (SCM l)
   Moment m;
 
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
-    m = min (m, unsmob_music (scm_car (s))->start_mom ());
+    m = min (m, unsmob<Music> (scm_car (s))->start_mom ());
   return m;
 }
 
@@ -163,7 +164,7 @@ Music_sequence::first_start (SCM l)
 
   for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music *mus = unsmob_music (scm_car (s));
+      Music *mus = unsmob<Music> (scm_car (s));
       Moment start = mus->start_mom ();
       if (mus->get_length ().to_bool () || start.to_bool ())
         return start;
@@ -175,35 +176,18 @@ MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2);
 SCM
 Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch)
 {
-  Music *me = unsmob_music (music);
-  Pitch p = *unsmob_pitch (pitch);
-
-  SCM elts = me->get_property ("elements");
-  SCM copied = SCM_EOL;
-  if (lily_1_8_relative)
-    copied = ly_music_deep_copy (elts);
-
-  Pitch retval = music_list_to_relative (elts, p, false);
-
-  if (lily_1_8_relative)
-    {
-
-      Pitch retval_1_8 = music_list_to_relative (copied, p, true);
-      if (retval_1_8 != retval)
-        lily_1_8_compatibility_used = true;
-
-      retval = retval_1_8;
-    }
-
-  return retval.smobbed_copy ();
+  Music *me = unsmob<Music> (music);
+  Pitch p = *unsmob<Pitch> (pitch);
+  return music_list_to_relative (me->get_property ("elements"),
+                                 p, false).smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2);
 SCM
 Music_sequence::event_chord_relative_callback (SCM music, SCM pitch)
 {
-  Music *me = unsmob_music (music);
-  Pitch p = *unsmob_pitch (pitch);
+  Music *me = unsmob<Music> (music);
+  Pitch p = *unsmob<Pitch> (pitch);
   return music_list_to_relative (me->get_property ("elements"),
                                  p, true).smobbed_copy ();
 }