X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=b03d63b7214731e27aac12040b7e0c146b9b2e7a;hb=6c68e65859bae109509e1c464fdfca6de4b5ddd1;hp=cfc5a60ecabf2d84966662d4a25a9155ad5d520d;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index cfc5a60eca..b03d63b721 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,23 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "midi-stream.hh"
 
-#include "stream.hh"
-#include "string-convert.hh"
+#include <cerrno>
+using namespace std;
+
+#include "international.hh"
 #include "main.hh"
-#include "misc.hh"
 #include "midi-item.hh"
+#include "misc.hh"
+#include "program-option.hh"
+#include "stream.hh"
+#include "string-convert.hh"
 #include "warn.hh"
-#include "scm-option.hh"
 
-Midi_stream::Midi_stream (String file_name)
+Midi_stream::Midi_stream (std::string file_name)
 {
   file_name_string_ = file_name;
-  out_file_ = fopen (file_name.to_str0(), "wb");
+  out_file_ = fopen (file_name.c_str (), "wb");
+  if (!out_file_)
+    error (_f ("can't open for write: %s: %s", file_name, strerror (errno)));
 }
 
 Midi_stream::~Midi_stream ()
@@ -27,30 +33,29 @@ Midi_stream::~Midi_stream ()
   fclose (out_file_);
 }
 
-Midi_stream&
-Midi_stream::operator << (String str)
+Midi_stream &
+Midi_stream::operator << (std::string str)
 {
   size_t sz = sizeof (Byte);
   size_t n = str.length ();
-  size_t written = fwrite (str.get_bytes (),
-			   sz, n, out_file_);
+  size_t written = fwrite (str.data (), 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 ();
+  std::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"))
+      for (ssize i = str.find ("0a"); i != NPOS; i = str.find ("0a"))
 	{
 	  str[i] = '\n';
 	  str[i + 1] = '\t';
@@ -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