* lily/figured-bass-engraver.cc (process_music): check

[lilypond.git] / lily / midi-stream.cc

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 7651b3fe6f3e161cf01e86c9e26d9626649364cd..ffe5196b637c94b88a50ee2becf0acbade54ba02 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -6,18 +6,18 @@
   (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-
-#include <errno.h>
-
 #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)
 {
@@ -41,7 +41,7 @@ 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;
 }
@@ -52,7 +52,7 @@ 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"))
@@ -65,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