release: 0.1.11

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

diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh
index bb96d961e897f50cc4aee9b1f7faaf61eae8ef62..115158dfdcd0cec62a0545452a65f0d5d3c66b09 100644 (file)
--- a/lily/include/midi-def.hh
+++ b/lily/include/midi-def.hh
@@ -13,34 +13,34 @@
 #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_;
-
-    Input_translator* itrans_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;
-    int get_tempo_i (Moment moment);
-    void print() const;
-    void set (Input_translator* itrans_p);
-    void set_tempo (Moment moment, int count_per_minute_i);
+class Midi_def : public Music_output_def {
+public:
+  // ugh!
+  static int den_i_s;
+  static int num_i_s;
+  VIRTUAL_COPY_CONS(Midi_def, Music_output_def);
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  Input_translator* itrans_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);
+  int get_tempo_i (Moment moment);
+  void print() const;
+  void set (Input_translator* itrans_p);
+  void set_tempo (Moment moment, int count_per_minute_i);
+protected:
+  virtual Global_translator * get_global_translator_p ();  
 };
 
 #endif // MIDI_DEF_HH