X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=ffe5196b637c94b88a50ee2becf0acbade54ba02;hb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;hp=aa1619e2c44e1ffe66383c8b7dd5ed641719a920;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index aa1619e2c4..ffe5196b63 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -8,18 +8,23 @@
 
 #include "midi-stream.hh"
 
+#include <cerrno>
+using namespace std;
+
 #include "stream.hh"
 #include "string-convert.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "midi-item.hh"
 #include "warn.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
 
 Midi_stream::Midi_stream (String file_name)
 {
   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 +33,7 @@ Midi_stream::~Midi_stream ()
 }
 
 Midi_stream &
-Midi_stream::operator<< (String str)
+Midi_stream::operator << (String str)
 {
   size_t sz = sizeof (Byte);
   size_t n = str.length ();
@@ -36,18 +41,18 @@ 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::operator << (Midi_item const &midi_c_r)
 {
   String str = midi_c_r.to_string ();
 
   // ugh, should have separate debugging output with Midi*::print routines
-  if (midi_debug_global_b)
+  if (do_midi_debugging_global)
     {
       str = String_convert::bin2hex (str) + "\n";
       for (int i = str.index ("0a"); i >= 0; i = str.index ("0a"))
@@ -60,7 +65,7 @@ Midi_stream::operator<< (Midi_item const &midi_c_r)
   return operator << (str);
 }
 
-Midi_stream&
+Midi_stream &
 Midi_stream::operator << (int i)
 {
   // output binary string ourselves