release: 0.1.11

[lilypond.git] / lily / midi-item.cc

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 47af53eb3b59591637a8bb4628a939b1dbbd52a4..e7e914782de5af34bdd6ae166f1e1acf615839bf 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -71,7 +71,7 @@ Midi_duration::Midi_duration (Real seconds_f)
 String
 Midi_duration::str() const
 {
-  return String ("<duration: ") + String (seconds_f_ ) + ">";
+  return String ("<duration: ") + String (seconds_f_) + ">";
 }
 
 Midi_header::Midi_header (int format_i, int tracks_i, int clocks_per_4_i)
@@ -270,14 +270,14 @@ String
 Midi_instrument::str() const
 {
   Byte program_byte = 0;
-  for ( int i = 0; instrument_name_sz_a_[i]; i++)
-    if ( instrument_str_ == String (instrument_name_sz_a_[ i ])) 
+  for (int i = 0; instrument_name_sz_a_[i]; i++)
+    if (instrument_str_ == String (instrument_name_sz_a_[ i ])) 
       {
        program_byte = (Byte)i;
        break;
       }
 
-  String str = String ((char)( 0xc0 + channel_i_) );
+  String str = String ((char)(0xc0 + channel_i_));
   str += String ((char)program_byte);
   return str;
 }
@@ -298,7 +298,7 @@ String
 Midi_item::i2varint_str (int i)
 {
   int buffer_i = i & 0x7f;
-  while ( (i >>= 7) > 0) 
+  while ((i >>= 7) > 0) 
     {
       buffer_i <<= 8;
       buffer_i |= 0x80;
@@ -306,10 +306,10 @@ Midi_item::i2varint_str (int i)
     }
 
   String str;
-  while ( 1) 
+  while (1) 
     {
       str += (char)buffer_i;
-      if ( buffer_i & 0x80)
+      if (buffer_i & 0x80)
        buffer_i >>= 8;
       else
        break;
@@ -330,7 +330,7 @@ Midi_key::str() const
   int flats_i = k->flats_i();
 
   // midi cannot handle non-conventional keys
-  if ( flats_i && sharps_i)
+  if (flats_i && sharps_i)
     return "";
   int accidentals_i = sharps_i - flats_i;
 
@@ -356,7 +356,7 @@ Midi_meter::str() const
 
   String str = "ff5804";
   str += String_convert::i2hex_str (num_i, 2, '0');
-  str += String_convert::i2hex_str (intlog2( den_i) , 2, '0' );
+  str += String_convert::i2hex_str (intlog2(den_i) , 2, '0');
   str += String_convert::i2hex_str (clocks_per_1_i_, 2, '0');
   str += String_convert::i2hex_str (8, 2, '0');
   return String_convert::hex2bin_str (str);
@@ -383,16 +383,16 @@ Midi_note::pitch_i() const
 String
 Midi_note::str() const
 {
-  if ( pitch_i() == INT_MAX)
+  if (pitch_i() == INT_MAX)
     return String ("");
 
-  Byte status_byte = (char)( 0x90 + channel_i_);
+  Byte status_byte = (char)(0x90 + channel_i_);
 
   String str = String ((char)status_byte);
-  str += (char)( pitch_i() + c0_pitch_i_c_);
+  str += (char)(pitch_i() + c0_pitch_i_c_);
 
   // poor man's staff dynamics:
-  str += (char)( dynamic_byte_ - 0x10 * channel_i_);
+  str += (char)(dynamic_byte_ - 0x10 * channel_i_);
 
   return str;
 }
@@ -414,13 +414,13 @@ Midi_note_off::pitch_i() const
 String
 Midi_note_off::str() const
 {
-  if ( pitch_i() == INT_MAX)
+  if (pitch_i() == INT_MAX)
     return String ("");
 
-  Byte status_byte = (char)( 0x80 + channel_i_);
+  Byte status_byte = (char)(0x80 + channel_i_);
 
   String str = String ((char)status_byte);
-  str += (char)( pitch_i() + Midi_note::c0_pitch_i_c_);
+  str += (char)(pitch_i() + Midi_note::c0_pitch_i_c_);
   str += (char)aftertouch_byte_;
   return str;
 }
@@ -428,7 +428,7 @@ Midi_note_off::str() const
 Midi_tempo::Midi_tempo (Audio_item* audio_item_l)
   : Midi_item (audio_item_l)
 {
-  per_minute_4_i_ = ( (Audio_tempo*)audio_item_l_)->per_minute_4_i_;
+  per_minute_4_i_ = ((Audio_tempo*)audio_item_l_)->per_minute_4_i_;
 }
 
 Midi_tempo::Midi_tempo (int per_minute_4_i)
@@ -449,8 +449,8 @@ Midi_tempo::str() const
 Midi_text::Midi_text (Audio_item* audio_item_l)
   : Midi_item (audio_item_l)
 {
-  text_str_ = ( (Audio_text*)audio_item_l_)->text_str_;
-  type_ = (Type)( (Audio_text*)audio_item_l_)->type_;
+  text_str_ = ((Audio_text*)audio_item_l_)->text_str_;
+  type_ = (Type)((Audio_text*)audio_item_l_)->type_;
 }
 
 Midi_text::Midi_text (Midi_text::Type type, String text_str)
@@ -512,14 +512,14 @@ Midi_track::Midi_track()
 void 
 Midi_track::add (int delta_time_i, String event_str)
 {
-  if ( delta_time_i < 0) 
+  if (delta_time_i < 0) 
     {
-      cout << String_convert::bin2hex_str (i2varint_str (delta_time_i) ) << endl;
+      cout << String_convert::bin2hex_str (i2varint_str (delta_time_i)) << endl;
       cout << String_convert::bin2hex_str (event_str) << endl;
     }
   assert (delta_time_i >= 0);
   assert(event_str.length_i());
-  Midi_chunk::add (i2varint_str (delta_time_i) + event_str );
+  Midi_chunk::add (i2varint_str (delta_time_i) + event_str);
 }
 
 void 
@@ -527,8 +527,8 @@ Midi_track::add (Moment delta_time_moment, Midi_item* mitem_l)
 {
   // use convention of 384 clocks per 4
   // use Duration_convert
-  int delta_time_i = delta_time_moment * Moment (384) / Moment (1, 4 );
-  // ? int ( delta_time_moment * 4 * 384) 
+  int delta_time_i = delta_time_moment * Moment (384) / Moment (1, 4);
+  // ? int (delta_time_moment * 4 * 384) 
   add (delta_time_i, mitem_l->str());
 }