Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 87a1b581d3f7d99dba15e837e304ff33eea51749..b5d02f84004baa4094a72ad163b028a34a280dcc 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,27 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "midi-stream.hh"
 
-#include <errno.h>
+#include <cerrno>
+using namespace std;
 
-#include "stream.hh"
-#include "string-convert.hh"
+#include "international.hh"
 #include "main.hh"
-#include "misc.hh"
 #include "midi-item.hh"
-#include "warn.hh"
+#include "misc.hh"
 #include "program-option.hh"
+#include "stream.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
-Midi_stream::Midi_stream (String file_name)
+Midi_stream::Midi_stream (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)));
+    error (_f ("cannot open for write: %s: %s", file_name, strerror (errno)));
 }
 
 Midi_stream::~Midi_stream ()
@@ -32,15 +34,14 @@ 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 ();
-  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 (_ ("can't write to file: `%s'"));
+    warning (_ ("cannot write to file: `%s'"));
 
   return *this;
 }
@@ -48,13 +49,13 @@ Midi_stream::operator << (String str)
 Midi_stream &
 Midi_stream::operator << (Midi_item const &midi_c_r)
 {
-  String str = midi_c_r.to_string ();
+  string str = midi_c_r.to_string ();
 
   // ugh, should have separate debugging output with Midi*::print routines
   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';