patch::: 1.3.130.jcn3

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 685076461b5b3b5e16ad37078e4568f4dc07fe57..1917ef03c6d22164a04546506f1e9666b30187d0 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -19,12 +19,6 @@ Midi_def::Midi_def()
   set_tempo (Moment (1, 4), 60);
 }
 
-Midi_def::~Midi_def()
-{
-}
-
-
-
 int
 Midi_def::get_tempo_i (Moment one_beat_mom)
 {
@@ -44,16 +38,16 @@ Midi_def::set_tempo (Moment one_beat_mom, int beats_per_minute_i)
 }
 
 
-int Midi_def::default_count_i_=0;
+int Midi_def::score_count_i_=0;
 
 int
-Midi_def::get_next_default_count () const
+Midi_def::get_next_score_count () const
 {
-  return default_count_i_++;
+  return score_count_i_++;
 }
 
 void
-Midi_def::reset_default_count ()
+Midi_def::reset_score_count ()
 {
-  default_count_i_ = 0;
+  score_count_i_ = 0;
 }