release: 0.1.24

[lilypond.git] / mi2mu / midi-score-parser.cc

diff --git a/mi2mu/midi-score-parser.cc b/mi2mu/midi-score-parser.cc
index a12c135cb04bd9e4b041d945fe9cea38ea1c43c9..7a787d062f4957ba10e076258fb4bebe81640078 100644 (file)
--- a/mi2mu/midi-score-parser.cc
+++ b/mi2mu/midi-score-parser.cc
@@ -1,5 +1,5 @@
 /*
-  midi-score-parser.cc -- implement 
+  midi-score-parser.cc -- implement
 
   source file of the GNU LilyPond music typesetter
 
@@ -21,7 +21,7 @@ Midi_score_parser::open (String filename_str, Sources* sources_l)
 {
   info_l_->source_l_ = sources_l->get_file_l (filename_str);
   if (!info_l_->source_l_)
-    ::error ("can't find: `" + filename_str + "'");
+    ::error (_("can't find: `") + filename_str + "'");
   info_l_->byte_L_ = (Byte const*)info_l_->source_l_->ch_C ();
 //  info_l_->end_byte_L_ = info_l_->byte_L_ + info_l_->source_l_->length_i ();
   info_l_->end_byte_L_ = info_l_->byte_L_ + info_l_->source_l_->length_i () + 1;
@@ -42,21 +42,21 @@ Midi_score_parser::parse_header ()
 {
   String str = get_str (4);
   if ( str != "MThd" )
-    exit ("MIDI header expected");
+    exit (_("MIDI header expected"));
 
   int length_i = get_i (4);
   // is this signed?
   if (length_i < 6)
-    exit ("Invalid header length");
+    exit (_("Invalid header length"));
   info_l_->format_i_ = get_i (2);
   if (info_l_->format_i_ != 0 && info_l_->format_i_ != 1)
-    exit ("Invalid midi format");
+    exit (_("Invalid midi format"));
   info_l_->tracks_i_ = get_i (2);
   if (info_l_->tracks_i_ < 0 || info_l_->tracks_i_ > 32 )
-    exit ("Invalid number of tracks");
+    exit (_("Invalid number of tracks"));
   info_l_->division_1_i_ = get_i (2) * 4;
   if (info_l_->division_1_i_ < 0)
-    exit ("Cannot handle non-metrical time");
+    exit (_("Cannot handle non-metrical time"));
   // ugh
   Duration::division_1_i_s = info_l_->division_1_i_;
   forward_byte_L (length_i - 6);
@@ -77,7 +77,7 @@ Midi_score_parser::find_earliest_i (Link_array<Midi_track_parser>& tracks)
     }
   return earliest_i;
 }
-    
+
 Mudela_score*
 Midi_score_parser::parse_score ()
 {
@@ -92,14 +92,14 @@ Midi_score_parser::parse_score ()
   for (int i = 0; i < info_l_->tracks_i_; i++)
     tracks.push (new Midi_track_parser (info_l_, i));
 
-  LOGOUT (NORMAL_ver) << "Parsing...\n";
+  LOGOUT (NORMAL_ver) << _("Parsing...\n");
   while (tracks.size ())
     {
       int i = find_earliest_i (tracks);
       Moment at_mom = tracks [i]->at_mom ();
       Mudela_column* column_l = score_p->get_column_l (at_mom);
       Mudela_staff* staff_p = tracks [i]->parse (column_l);
-      if ( staff_p ) 
+      if ( staff_p )
        {
          score_p->add_staff (staff_p);
          delete tracks [i];
@@ -109,15 +109,14 @@ Midi_score_parser::parse_score ()
       //  brr, musta have some progress
       for (int ii = 0; !info_l_->bar_mom_ && ii < tracks.size (); ii++)
        info_l_->bar_mom_ = tracks [ii]->info_l_->bar_mom_;
-      
-      int bar_i = (int) (at_mom 
+
+      int bar_i = (int) (at_mom
            / (info_l_->bar_mom_ ? info_l_->bar_mom_ : bar4_mom)) + 1;
-      if (bar_i > current_bar_i) 
+      if (bar_i > current_bar_i)
        {
-         LOGOUT (NORMAL_ver) << '[' << bar_i << ']' << flush; 
+         LOGOUT (NORMAL_ver) << '[' << bar_i << ']' << flush;
          current_bar_i = bar_i;
        }
     }
   return score_p;
 }
-