patch::: 1.3.62.hwn1

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

diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh
index 788cf1dc4f6399eaa357eef34978abfc25b7f3b0..6d65f6baeae0c8a5765f5221990c4a576badadf6 100644 (file)
--- a/lily/include/midi-def.hh
+++ b/lily/include/midi-def.hh
@@ -3,47 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
 #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;
-
-    /// output file name
-    String outfile_str_;
-
-    Assoc<String, Real> *real_vars_p_;
-    Input_performer* iperf_p_;
-
-    /// duration of whole note
-    Real whole_seconds_f_;
-
-    Midi_def();
-    Midi_def( Midi_def const& midi_c_r );
-    ~Midi_def();
-
-    Real duration_to_seconds_f(Moment);
-    Global_translator* get_global_translator_p() const;
-    Real get_var( String s ) const;
-    int get_tempo_i( Moment moment );
-    void print() const;
-    void set( Input_performer* iperf_p );
-    void set_var( String s, Real r );
-    void set_tempo( Moment moment, int count_per_minute_i );
+class Midi_def : public Music_output_def {
+  static int default_count_i_;
+
+public:
+  VIRTUAL_COPY_CONS(Music_output_def);
+
+  /// duration of whole note measured in seconds.
+  Moment whole_in_seconds_mom_;
+
+  Midi_def();
+  ~Midi_def();
+
+  Real length_mom_to_seconds_f (Moment);
+  int get_tempo_i (Moment moment);
+  void print() const;
+  void set_tempo (Moment moment, int count_per_minute_i);
+  virtual int get_next_default_count () const;
+  static void reset_default_count();
 };
 
 #endif // MIDI_DEF_HH
-