patch::: 1.3.136.jcn3

[lilypond.git] / lily / include / midi-def.hh

diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh
index 9673783d25fed2cecd240c36ebd37f197d172e6d..9ec31677208695d1b9a17b7fdf0727f772ccdb56 100644 (file)
--- a/lily/include/midi-def.hh
+++ b/lily/include/midi-def.hh
@@ -3,40 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
-#ifndef MIDIDEF_HH
-#define MIDIDEF_HH
+#ifndef MIDI_DEF_HH
+#define MIDI_DEF_HH
+
 #include "lily-proto.hh"
 #include "real.hh"
 #include "string.hh"
 #include "moment.hh"
-
+#include "music-output-def.hh"
 
 /** 
+  definitions for midi output. Rather empty
  */
-struct Midi_def {
-    // ugh!
-    static int den_i_s;
-    static int num_i_s;
+class Midi_def : public Music_output_def {
+  static int score_count_i_;
 
-    /// output file name
-    String outfile_str_;
+public:
+  VIRTUAL_COPY_CONS (Music_output_def);
 
-    /// duration of whole note
-    Real whole_seconds_f_;
+  Midi_def ();
 
-    Midi_def();
-    Midi_def(Midi_def const& midi_c_r);
-    ~Midi_def();
-
-    Real duration_to_seconds_f(Moment);
-    int get_tempo_i( Moment moment );
-    void set_tempo( Moment moment, int count_per_minute_i );
-    void print() const;
+  int get_tempo_i (Moment moment);
+  void set_tempo (Moment moment, int count_per_minute_i);
+  virtual int get_next_score_count () const;
+  static void reset_score_count ();
 };
 
-#endif // MIDIDEF_HH //
-
+#endif // MIDI_DEF_HH