X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-stream.hh;h=4f02d6cbca7a9f469ceb2317587aff3927750182;hb=883e317d51c5e50011bc0e764a785631e5ea8689;hp=c18cb9c4e9761761c110996548c6de57b68f82d5;hpb=04f01c7e890bd4f1b358378e5911fb7c117c3802;p=lilypond.git

diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh
index c18cb9c4e9..4f02d6cbca 100644
--- a/lily/include/midi-stream.hh
+++ b/lily/include/midi-stream.hh
@@ -1,32 +1,33 @@
-//
-//  midistream.hh -- part of GNU LilyPond
-//
-//  copyright 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  midi-stream.hh -- declare Midi_stream
+
+  (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"
 
-/// 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();
+class Midi_item;
 
-    Midi_stream& operator <<( String str );
-    Midi_stream& operator <<( Midi_item const& mitem_c_r );
-    Midi_stream& operator <<( int i );
+/// Midi outputfile
+struct Midi_stream
+{
+  Midi_stream (string file_name_string);
+  ~Midi_stream ();
 
-    void header();
-    void open();
+  Midi_stream &operator << (string str);
+  Midi_stream &operator << (Midi_item const &midi_c_r);
+  Midi_stream &operator << (int i);
 
-//private:
-//    Midi_stream(Midi_stream const&);
+  void open ();
+
+  FILE *out_file_;
+  string file_name_string_;
 };
-#endif // MIDI_STREAM_HH //
+
+#endif // MIDI_STREAM_HH