Merge with master

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

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index 995c0483329ded0f1aaa2d8addc6351422a04059..1d9066e8654b5de80e9ee713689fbf21924ace52 100644 (file)
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,28 +1,33 @@
 /*
   midi-stream.hh -- declare Midi_stream
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MIDI_STREAM_HH
 #define MIDI_STREAM_HH
 
-#include <iostream>
-#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);
+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);
+  void write (string);
+  void write (Midi_item const &);
+  void write (int);
 
   void open ();
 
-  std::ostream* os_p_;
-  String filename_str_;
+  FILE *out_file_;
+  string file_name_string_;
 };
 
 #endif // MIDI_STREAM_HH