release: 1.1.39

[lilypond.git] / mi2mu / mudela-voice.cc

diff --git a/mi2mu/mudela-voice.cc b/mi2mu/mudela-voice.cc
index 92c9b2ef3ef17954784ce5839274f9d4c90b10c0..6f92d03f2257fd3a4e8258dba6db7d2c79f06d63 100644 (file)
--- a/mi2mu/mudela-voice.cc
+++ b/mi2mu/mudela-voice.cc
@@ -19,21 +19,21 @@ Mudela_voice::Mudela_voice (Mudela_staff* mudela_staff_l)
 void
 Mudela_voice::add_item (Mudela_item* mudela_item_l)
 {
-  mudela_item_l_list_.append (new Cons<Mudela_item> (mudela_item_l, 0));
+  mudela_item_l_list_.bottom().add (mudela_item_l);
 }
 
 Moment 
-Mudela_voice::begin_mom ()
+Mudela_voice::begin_mom()
 {
-  return !mudela_item_l_list_.empty_b () ? 
-    mudela_item_l_list_.car_l ()->at_mom () : Moment (0);
+  return mudela_item_l_list_.size() ? 
+    mudela_item_l_list_.top()->at_mom() : Moment (0);
 }
 
 Moment 
-Mudela_voice::end_mom ()
+Mudela_voice::end_mom()
 {
-  return !mudela_item_l_list_.empty_b () ? 
-    mudela_item_l_list_.tail_car_l ()->at_mom () : Moment (0);
+  return mudela_item_l_list_.size() ? 
+    mudela_item_l_list_.bottom()->at_mom() : Moment (0);
 }
 
 static int const FAIRLY_LONG_VOICE_i = 6;
@@ -41,37 +41,37 @@ static int const FAIRLY_LONG_VOICE_i = 6;
 void
 Mudela_voice::output (Mudela_stream& mudela_stream_r)
 {
-  if (mudela_item_l_list_.empty_b ())
+  if  (!mudela_item_l_list_.size())
     return;
   
-  if (mudela_item_l_list_.size_i () > FAIRLY_LONG_VOICE_i)
+  if  (mudela_item_l_list_.size() > FAIRLY_LONG_VOICE_i)
     mudela_stream_r << '\n';
 
   int current_bar_i = 0;
-  Moment bar_mom = mudela_staff_l_->mudela_time_signature_l_->bar_mom ();
+  Moment bar_mom = mudela_staff_l_->mudela_time_signature_l_->bar_mom();
 
-  for (Cons<Mudela_item>* i = mudela_item_l_list_.head_cons_p_; i; i = i->next_cons_p_)
+  for  (PCursor<Mudela_item*> i (mudela_item_l_list_); i.ok(); i++) 
     {
-      Moment at_mom = i->car_p_->mudela_column_l_->at_mom ();
+      Moment at_mom = i->mudela_column_l_->at_mom();
       int bar_i = (int) (at_mom / bar_mom) + 1;
-      if (bar_i > current_bar_i) 
+      if  (bar_i > current_bar_i) 
        {
-         if (current_bar_i) 
+         if  (current_bar_i) 
            {
-             if (at_mom == Moment (bar_i - 1) * bar_mom)
+             if  (at_mom == Moment (bar_i - 1) * bar_mom)
                mudela_stream_r << "|";
              mudela_stream_r << "\n% ";
              mudela_stream_r << String_convert::i2dec_str (bar_i, 0, ' ');
              mudela_stream_r << '\n';
            }
-         LOGOUT (NORMAL_ver) << "[" << bar_i << "]" << flush; 
+         LOGOUT(NORMAL_ver) << "[" << bar_i << "]" << flush; 
          current_bar_i = bar_i;
        }
 
-      mudela_stream_r << *i->car_p_;
+      mudela_stream_r << **i;
     }
 
-  if (mudela_item_l_list_.size_i () > FAIRLY_LONG_VOICE_i)
+  if  (mudela_item_l_list_.size() > FAIRLY_LONG_VOICE_i)
     mudela_stream_r << '\n';
 }