X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-stream.hh;h=d5525295e2e510e5bd6bb747e17755f40bc1a3bc;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2622027d6de5977c572a76c651b43c07d11a8d3f;hpb=ffbaef8018d42f1636c9cd47885fbc187a08f3a8;p=lilypond.git

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index 2622027d6d..d5525295e2 100644
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,28 +1,30 @@
 /*
   midi-stream.hh -- declare Midi_stream
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MIDI_STREAM_HH
 #define MIDI_STREAM_HH
 
-#include <stdio.h>
-#include "string.hh"
+#include <cstdio>
+using namespace std;
 
-/// Midi outputfile
-struct Midi_stream {
-  Midi_stream (String file_name_string);
-  ~Midi_stream ();
+#include <string.h>
+#include "std-string.hh"
+#include "lily-proto.hh"
 
-  Midi_stream& operator << ( String str);
-  Midi_stream& operator << ( Midi_item const& midi_c_r);
-  Midi_stream& operator << ( int i);
+struct Midi_stream
+{
+  Midi_stream (string file_name_string);
+  ~Midi_stream ();
 
+  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