X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-stream.hh;h=6b9bd0c5732a98983991c36d4780e7674821ed55;hb=32f5956ef64bfa7b0fd6a9f6c34a53760adae04e;hp=be91402d96b19d67c2e90dcf6b9d95975b5f44fa;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index be91402d96..6b9bd0c573 100644
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,7 +1,7 @@
 /*
   midi-stream.hh -- declare Midi_stream
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef MIDI_STREAM_HH
@@ -10,24 +10,21 @@
 #include <cstdio>
 using namespace std;
 
-#include "string.hh"
+#include <string.h>
+#include "std-string.hh"
+#include "lily-proto.hh"
 
-class Midi_item;
-
-/// Midi outputfile
 struct Midi_stream
 {
-  Midi_stream (String file_name_string);
+  Midi_stream (string file_name_string);
   ~Midi_stream ();
 
-  Midi_stream &operator << (String str);
-  Midi_stream &operator << (Midi_item const &midi_c_r);
-  Midi_stream &operator << (int i);
-
+  void write (string);
+  void write (Midi_chunk const &);
   void open ();
 
   FILE *out_file_;
-  String file_name_string_;
+  string file_name_string_;
 };
 
 #endif // MIDI_STREAM_HH