X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-stream.hh;h=18e38ca2c00c6cebb41367b32d9128d02ff170f4;hb=474c8729dc274a30558102a015a01fa5882673db;hp=f3a3781ed3c72662ae7136cee87c411745012a75;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index f3a3781ed3..18e38ca2c0 100644
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,28 +1,33 @@
 /*
   midi-stream.hh -- declare Midi_stream
 
-  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MIDI_STREAM_HH
 #define MIDI_STREAM_HH
 
-#include <iostream.h>
-#include "string.hh"
+#include <cstdio>
+using namespace std;
+
+#include "std-string.hh"
+
+class Midi_item;
 
 /// Midi outputfile
-struct Midi_stream {
-    Midi_stream (String filename_str);
-    ~Midi_stream();
+struct Midi_stream
+{
+  Midi_stream (string file_name_string);
+  ~Midi_stream ();
 
-    Midi_stream& operator <<( String str);
-    Midi_stream& operator <<( Midi_item const& mitem_c_r);
-    Midi_stream& operator <<( int i);
+  Midi_stream &operator << (string str);
+  Midi_stream &operator << (Midi_item const &midi_c_r);
+  Midi_stream &operator << (int i);
 
-    void open();
+  void open ();
 
-    ostream* os_p_;
-    String filename_str_;
+  FILE *out_file_;
+  string file_name_string_;
 };
 
 #endif // MIDI_STREAM_HH