* lily/parser.yy (command_element): move clef stuff into Scheme.

[lilypond.git] / lily / music-sequence.cc

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 44ec103c4092f7f8ab39769b6f6d80fec7125302..0b38de2006e642705c4eab4dc4e47a37f819df05 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -28,8 +28,8 @@ Music_sequence::append_music (Music *m)
   scm_gc_unprotect_object (m->self_scm ());
 }
 
-Music_sequence::Music_sequence (SCM l)
-  : Music (l)
+Music_sequence::Music_sequence ( )
+  : Music ()
 {
 }
 
@@ -54,7 +54,7 @@ Music_sequence::cumulative_length (SCM l)
 
   for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
     {
-      Moment l = unsmob_music (ly_car (s))->length_mom ();
+      Moment l = unsmob_music (ly_car (s))->get_length ();
       if (last_len.grace_part_ && l.main_part_)
        {
          last_len.grace_part_ = Rational (0);
@@ -83,7 +83,7 @@ Music_sequence::maximum_length (SCM l)
   for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
     {
       Music * m = unsmob_music (ly_car (s));
-      Moment l = m->length_mom ();
+      Moment l = m->get_length ();
       dur = dur >? l;
     }
 
@@ -134,12 +134,6 @@ Music_sequence::compress_list (SCM l, Moment m)
 
 ADD_MUSIC (Music_sequence);
 
-Music_sequence::Music_sequence ()
-  : Music (SCM_EOL)
-{
-  
-}
-
 Moment
 Music_sequence::minimum_start (SCM l)
 {
@@ -160,7 +154,7 @@ Music_sequence::first_start (SCM l)
   for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
     {
       Music * mus = unsmob_music (ly_car (s));
-      Moment l = mus->length_mom ();
+      Moment l = mus->get_length ();
       Moment s = mus->start_mom ();
       if (l.to_bool () || s.to_bool ())
        return s;