* input/mutopia/F.Schubert/standchen.ly (trebleThrough): fixes

[lilypond.git] / lily / part-combine-music-iterator.cc

diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc
index fcc99f05babc9718492fd710f9534d28f28a6ac5..b249224f3b368ed4da4d051daf2e0b8597b19e13 100644 (file)
--- a/lily/part-combine-music-iterator.cc
+++ b/lily/part-combine-music-iterator.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "part-combine-music.hh"
 #include "part-combine-music-iterator.hh"
 #include "translator-group.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "music-sequence.hh"
 #include "lily-guile.hh"
 #include "warn.hh"
@@ -20,7 +19,6 @@ Part_combine_music_iterator::Part_combine_music_iterator ()
   second_iter_ = 0;
   first_until_ = 0;
   second_until_ = 0;
-
   state_ = 0;
 }
 
@@ -83,13 +81,14 @@ Part_combine_music_iterator::ok () const
   return first_iter_->ok () || second_iter_->ok ();
 }
 
+
 void
 Part_combine_music_iterator::construct_children ()
 {
-  Part_combine_music const * m = dynamic_cast<Part_combine_music const*> (get_music ());
-  
-  first_iter_ = unsmob_iterator (get_iterator (m->get_first ()));
-  second_iter_ = unsmob_iterator (get_iterator (m->get_second ()));
+  SCM lst = get_music ()->get_mus_property ("elements");
+
+  first_iter_ = unsmob_iterator (get_iterator (unsmob_music (gh_car (lst))));
+  second_iter_ = unsmob_iterator (get_iterator (unsmob_music (gh_cadr (lst))));
 }
 
 void
@@ -153,25 +152,22 @@ get_music_info (Moment m, Music_iterator* iter, SCM *pitches, SCM *durations)
       for (SCM i = iter->get_pending_events (m); gh_pair_p (i); i = ly_cdr (i))
        {
          Music *m = unsmob_music (ly_car (i));
-         if (m->is_mus_type ("melodic-event"))
-           *pitches = gh_cons (m->get_mus_property ("pitch"), *pitches);
-         if (m->is_mus_type ("rhythmic-event"))
-           {
-             SCM d = m->get_mus_property ("duration");
-             if (d == SCM_EOL)
-               m->origin ()->warning ("Rhythmic_req has no duration\n");
-             else
-               *durations = gh_cons (d, *durations);
-           }
+         SCM p = m->get_mus_property ("pitch");
+         SCM d = m->get_mus_property ("duration");
+         if (unsmob_pitch (p))
+           *pitches = gh_cons (p, *pitches);
+         if (unsmob_duration (d))
+           *durations = gh_cons (d, *durations);
        }
     }
 }
-  
+
 int
 Part_combine_music_iterator::get_state (Moment)
 {
   int state = UNKNOWN;
-  Part_combine_music const *p = dynamic_cast<Part_combine_music const* > (get_music ());
+  
+  Music *p = get_music ();
 
   String w = ly_scm2string (p->get_mus_property ("what"));
     
@@ -232,10 +228,8 @@ Part_combine_music_iterator::get_state (Moment)
 
          if (first_pitches != SCM_EOL && second_pitches != SCM_EOL)
            {
-             scm_sort_list_x (first_pitches,
-                              scm_primitive_eval (ly_symbol2scm ("Pitch::less_p")));
-             scm_sort_list_x (second_pitches,
-                              scm_primitive_eval (ly_symbol2scm ("Pitch::less_p")));
+             scm_sort_list_x (first_pitches, Pitch::less_p_proc);
+             scm_sort_list_x (second_pitches, Pitch::less_p_proc);
 
              interval = gh_int2scm (unsmob_pitch (ly_car (first_pitches))->steps ()
                                     - unsmob_pitch (ly_car (scm_last_pair (second_pitches)))->steps ());
@@ -244,15 +238,15 @@ Part_combine_music_iterator::get_state (Moment)
          if (first_durations != SCM_EOL)
            {
              scm_sort_list_x (first_durations,
-                              scm_primitive_eval (ly_symbol2scm ("Duration::less_p")));
-             first_mom += unsmob_duration (ly_car (first_durations))->length_mom ();
+                              Duration::less_p_proc);
+             first_mom += unsmob_duration (ly_car (first_durations))->get_length ();
            }
          
          if (second_durations != SCM_EOL)
            {
              scm_sort_list_x (second_durations,
-                              scm_primitive_eval (ly_symbol2scm ("Duration::less_p")));
-             second_mom += unsmob_duration (ly_car (second_durations))->length_mom ();
+                              Duration::less_p_proc);
+             second_mom += unsmob_duration (ly_car (second_durations))->get_length ();
            }
          
          if (first_pitches != SCM_EOL && second_pitches == SCM_EOL
@@ -371,8 +365,7 @@ s      Consider thread switching: threads "one", "two" and "both".
   else
     state = state_;
   
-  Part_combine_music const *p =
-    dynamic_cast<Part_combine_music const* > (get_music ());
+  Music *p =get_music ();
 
 
   bool previously_combined_b = first_iter_->report_to ()->daddy_trans_