X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmidi-stream.cc;h=b3f3f6df148730df33d56092f3df218f2e08155a;hb=3e2eab301d69df7682ef4668c1972681e0ac413d;hp=ef88ef9f424b54ff1c0d3cd4b5da655f6d40fabb;hpb=7af4bf1f7440843fa24de456edc04ad31b616cf9;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index ef88ef9f42..b3f3f6df14 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,24 +3,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
+#include "midi-stream.hh"
+
+#include <errno.h>
+
 #include "stream.hh"
-#include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "midi-item.hh"
-#include "midi-stream.hh"
 #include "warn.hh"
 #include "scm-option.hh"
 
-Midi_stream::Midi_stream (String filename)
+Midi_stream::Midi_stream (String file_name)
 {
-  filename_string_ = filename;
-  out_file_ = fopen (filename.to_str0(), "wb");
+  file_name_string_ = file_name;
+  out_file_ = fopen (file_name.to_str0 (), "wb");
+  if (!out_file_)
+    error (_f ("can't open for write: %s: %s", file_name, strerror (errno)));
 }
 
 Midi_stream::~Midi_stream ()
@@ -28,7 +32,7 @@ Midi_stream::~Midi_stream ()
   fclose (out_file_);
 }
 
-Midi_stream&
+Midi_stream &
 Midi_stream::operator << (String str)
 {
   size_t sz = sizeof (Byte);
@@ -37,13 +41,13 @@ Midi_stream::operator << (String str)
 			   sz, n, out_file_);
 
   if (written != sz * n)
-    warning (_ ("could not write file: `%s'"));
+    warning (_ ("can't write to file: `%s'"));
 
   return *this;
 }
 
-Midi_stream&
-Midi_stream::operator << (Midi_item const& midi_c_r)
+Midi_stream &
+Midi_stream::operator << (Midi_item const &midi_c_r)
 {
   String str = midi_c_r.to_string ();