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

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index 2444384838..a14ac80e20 100644
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,32 +1,43 @@
-//
-//  midistream.hh -- part of LilyPond
-//
-//  copyright 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  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 <iostream.h>
-#include "string.hh"
+#include <cstdio>
+using namespace std;
 
-/// Midi output
-struct Midi_stream {
-    ostream* os_p_;
-    String filename_str_;
-    int clocks_per_4_i_;
-    int tracks_i_;
-    
-    Midi_stream( String filename_str, int tracks_i, int clocks_per_4_i_ );
-    ~Midi_stream();
+#include <string.h>
+#include "std-string.hh"
+#include "lily-proto.hh"
 
-    Midi_stream& operator <<( String str );
-    Midi_stream& operator <<( Midi_item const& mitem_c_r );
-    Midi_stream& operator <<( int i );
+struct Midi_stream
+{
+  Midi_stream (const string &file_name_string);
+  ~Midi_stream ();
 
-    void header();
-    void open();
+  void write (const string&);
+  void write (Midi_chunk const &);
+  void open ();
 
-//private:
-//    Midi_stream(Midi_stream const&);
+  FILE *out_file_;
+  string file_name_string_;
 };
-#endif // MIDI_STREAM_HH //
+
+#endif // MIDI_STREAM_HH