X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-stream.hh;h=a14ac80e204f24d7b82878ce6fb21736623d5619;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=879f74474009eaace0f880d128f6f37ee0876b2b;hpb=4f614af85a13f7a74e96d6b4dbc38a0bfbca1136;p=lilypond.git

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index 879f744740..a14ac80e20 100644
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,28 +1,43 @@
 /*
-  midi-stream.hh -- declare Midi_stream
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 filename_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 (const string &file_name_string);
+  ~Midi_stream ();
 
+  void write (const string&);
+  void write (Midi_chunk const &);
   void open ();
 
   FILE *out_file_;
-  String filename_string_;
+  string file_name_string_;
 };
 
 #endif // MIDI_STREAM_HH