``slikken kreng''

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 1a941c6697387aecb3a668596af812324d043f44..bbaadb50daa008a66414522d46a62c2767b2edee 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -27,7 +27,7 @@
 
 Performance::Performance ()
 {
-  midi_l_ =0;
+  midi_ =0;
   audio_elem_p_list_ = 0;
 }
 
@@ -40,7 +40,7 @@ Performance::~Performance ()
 void
 Performance::output (Midi_stream& midi_stream)
 {
-  int tracks_i = audio_staff_l_arr_.size () + 1;
+  int tracks_i = audio_staffs_.size () + 1;
 
   // ugh
   int clocks_per_4_i = 384;
@@ -50,11 +50,11 @@ Performance::output (Midi_stream& midi_stream)
   progress_indication ("\n");
   progress_indication (_ ("Track ... "));
   int channel = 0;
-  for (int i =0; i < audio_staff_l_arr_.size (); i++)
+  for (int i =0; i < audio_staffs_.size (); i++)
     {
-      Audio_staff *s = audio_staff_l_arr_[i];
+      Audio_staff *s = audio_staffs_[i];
       if (verbose_global_b)
-       progress_indication ("[" + to_str (i)) ;
+       progress_indication ("[" + to_string (i)) ;
 
       /*
        MIDI players tend to ignore instrument settings on
@@ -62,8 +62,8 @@ Performance::output (Midi_stream& midi_stream)
        */
       if (channel == 9)
         channel++;
-      if (s->channel_i_ < 0)
-        s->channel_i_ = channel;
+      if (s->channel_ < 0)
+        s->channel_ = channel;
       s->output (midi_stream, channel++);
       if (verbose_global_b)
        progress_indication ("]");
@@ -76,13 +76,13 @@ Performance::output_header_track (Midi_stream& midi_stream)
 {
   Midi_track midi_track;
 
-  midi_track.channel_i_ = 9;
+  midi_track.channel_ = 9;
 
   // perhaps multiple text events?
-  String id_str;
+  String id_string;
   String str = String (_ ("Creator: "));
-  id_str = String_convert::pad_to (gnu_lilypond_version_str (), 30);
-  str += id_str;
+  id_string = String_convert::pad_to (gnu_lilypond_version_string (), 30);
+  str += id_string;
 
   /*
     This seems silly, but in fact the audio elements should
@@ -94,7 +94,7 @@ Performance::output_header_track (Midi_stream& midi_stream)
 
   /* Better not translate this */
   str = "Generated automatically by: ";
-  str += id_str;
+  str += id_string;
   
   Audio_text generate_a (Audio_text::TEXT, str);
   Midi_text generate (&generate_a);
@@ -103,7 +103,7 @@ Performance::output_header_track (Midi_stream& midi_stream)
   str = _ ("at ");
   time_t t (time (0));
   str += ctime (&t);
-  str = str.left_str (str.length_i () - 1);
+  str = str.left_string (str.length () - 1);
   str = String_convert::pad_to (str, 60);
   
   Audio_text at_a (Audio_text::TEXT, str);
@@ -111,20 +111,20 @@ Performance::output_header_track (Midi_stream& midi_stream)
   midi_track.add (Moment (0), &at);
 
   
-  str = _f ("from musical definition: %s", origin_str_);
+  str = _f ("from musical definition: %s", origin_string_);
 
   Audio_text from_a (Audio_text::TEXT, str);
   Midi_text from (&from_a);
   midi_track.add (Moment (0), &from);
 
   Audio_text track_name_a (Audio_text::TRACK_NAME, "Track "
-                          + String_convert::i2dec_str (0, 0, '0'));
+                          + String_convert::int2dec (0, 0, '0'));
   Midi_text track_name (&track_name_a);
                        
   midi_track.add (Moment (0), &track_name);
 
   // Some sequencers read track 0 last.
-  //  Audio_tempo tempo_a (midi_l_->get_tempo_i (Moment (Rational (1, 4))));
+  //  Audio_tempo tempo_a (midi_->get_tempo (Moment (Rational (1, 4))));
   //  Midi_tempo tempo (&tempo_a);
   //  midi_track.add (Moment (0), &tempo);
 
@@ -136,11 +136,11 @@ Performance::add_element (Audio_element *p)
 {
   if (Audio_staff*s=dynamic_cast<Audio_staff *> (p)) 
     {
-      audio_staff_l_arr_.push (s);
+      audio_staffs_.push (s);
     }
   else if (Audio_column *c = dynamic_cast<Audio_column*> (p))
     {
-      c->performance_l_ = this;
+      c->performance_ = this;
     }
   audio_elem_p_list_ = new Killing_cons<Audio_element> (p, audio_elem_p_list_);
 }
@@ -152,22 +152,22 @@ Performance::process ()
   String out = output_name_global;
   if (out == "-")
     out = "lelie.midi";
-  int def = midi_l_->get_next_score_count ();
+  int def = midi_->get_next_score_count ();
   if (def)
     {
       Path p = split_path (out);
-      p.base += "-" + to_str (def);
-      out = p.str ();
+      p.base += "-" + to_string (def);
+      out = p.string ();
     }
 
   /* Maybe a bit crude, but we had this before */
   Path p = split_path (out);
   p.ext = "midi";
-  out = p.str ();
+  out = p.string ();
   
   Midi_stream midi_stream (out);
   progress_indication (_f ("MIDI output to `%s'...", out));
-  target_str_global_array.push (out);
+  target_string_globals.push (out);
 
   output (midi_stream);
   progress_indication ("\n");