* lily/coherent-ligature-engraver.cc,

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index a0599d107f83b41a21212d460c609f82d226cba9..ec5428971ac23ca635d8a11d7407d451a0fbf5b1 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -3,15 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 #include <math.h>
 #include "misc.hh"
 #include "midi-def.hh"
 #include "performance.hh"
-#include "debug.hh"
-#include "scope.hh"
+#include "warn.hh"
+#include "scm-hash.hh"
 
 Midi_def::Midi_def ()
 {
@@ -20,10 +20,10 @@ Midi_def::Midi_def ()
 }
 
 int
-Midi_def::get_tempo_i (Moment one_beat_mom)
+Midi_def::get_tempo (Moment one_beat_mom)
 {
   SCM wis  = ly_symbol2scm ("whole-in-seconds");
-  Moment *w = unsmob_moment (scope_p_->scm_elem (wis));
+  Moment *w = unsmob_moment (lookup_variable (wis));
 
   Moment wholes_per_min = Moment (60);
   if (!w)
@@ -46,20 +46,20 @@ Midi_def::set_tempo (Moment one_beat_mom, int beats_per_minute_i)
   Moment beats_per_second = Moment (beats_per_minute_i) / Moment (60);
 
   Moment m = Moment (1)/Moment (beats_per_second * one_beat_mom);
-  scope_p_->set ("whole-in-seconds", m.smobbed_copy ());
+  set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
 }
 
 
-int Midi_def::score_count_i_=0;
+int Midi_def::score_count_=0;
 
 int
 Midi_def::get_next_score_count () const
 {
-  return score_count_i_++;
+  return score_count_++;
 }
 
 void
 Midi_def::reset_score_count ()
 {
-  score_count_i_ = 0;
+  score_count_ = 0;
 }