(get_indexed_char): scale metrics by

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

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index c61e8307fd024c18d8e720f24a64360e9c43a79a..064fdd2292deb1ff2986e00fc069e7a543410171 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -3,20 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
+#include "midi-item.hh"
+
 #include "warn.hh"
 #include "main.hh"
 #include "misc.hh"
-#include "string.hh"
 #include "string-convert.hh"
-#include "midi-item.hh"
 #include "midi-stream.hh"
-#include "audio-item.hh"
 #include "duration.hh"
 #include "scm-option.hh"
-
 #include "killing-cons.tcc"
 
 #define PITCH_WHEEL_TOP    0x3FFF
@@ -144,11 +142,11 @@ Midi_instrument::to_string () const
   /*
     UGH. don't use eval.
    */
-  SCM proc = scm_primitive_eval (ly_symbol2scm ("midi-program")); 
-  SCM program = gh_call1 (proc, ly_symbol2scm (audio_->str_.to_str0 ()));
+  SCM proc = ly_scheme_function ("midi-program");
+  SCM program = scm_call_1 (proc, ly_symbol2scm (audio_->str_.to_str0 ()));
   found = (program != SCM_BOOL_F);
   if (found)
-    program_byte = gh_scm2int(program);
+    program_byte = scm_to_int (program);
   else
       warning (_f ("no such MIDI instrument: `%s'", audio_->str_.to_str0 ()));
 
@@ -243,7 +241,7 @@ int
 Midi_note::get_fine_tuning () const
 {
   int ft = audio_->pitch_.quartertone_pitch ();
-  ft -= 2 * audio_->pitch_.semitone_pitch();
+  ft -= 2 * audio_->pitch_.semitone_pitch ();
   ft *= 50; // 1 quarter tone = 50 cents
   return ft;
 }
@@ -460,7 +458,7 @@ Midi_track::data_string () const
   String str = Midi_chunk::data_string ();
   if (midi_debug_global_b)
     str += "\n";
-  for (Cons<Midi_event> *i=event_p_list_.head_; i; i = i->next_) 
+  for (Cons<Midi_event> *i = event_p_list_.head_; i; i = i->next_) 
     {
       str += i->car_->to_string ();
       if (midi_debug_global_b)