X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-stream.hh;h=4f02d6cbca7a9f469ceb2317587aff3927750182;hb=af770f3440264c18ce01525dce1aa76b86ace0d5;hp=f367d62a2ab16f5284c60ca8999dcf3167281155;hpb=78ed9c22a8cbf56ff5390553e0a2854aa42cbbc5;p=lilypond.git

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index f367d62a2a..4f02d6cbca 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--1999 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2006 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& midi_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