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 1d460c29daa4ad5d912dcdfe06a0e8f775075675..1d9066e8654b5de80e9ee713689fbf21924ace52 100644 (file)
--- 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--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef MIDI_STREAM_HH
@@ -17,17 +17,17 @@ class Midi_item;
 /// Midi outputfile
 struct Midi_stream
 {
-  Midi_stream (std::string file_name_string);
+  Midi_stream (string file_name_string);
   ~Midi_stream ();
 
-  Midi_stream &operator << (std::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 ();
 
   FILE *out_file_;
-  std::string file_name_string_;
+  string file_name_string_;
 };
 
 #endif // MIDI_STREAM_HH