Run `make grand-replace'.

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 99010d32ded3dcbcbd9cd5dd1aa1cdf83e595853..4c1aa564235ccc4365ea751949d0414353e015fd 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,28 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 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 "midi-chunk.hh"
 #include "misc.hh"
-#include "midi-item.hh"
-#include "warn.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,44 +33,22 @@ Midi_stream::~Midi_stream ()
   fclose (out_file_);
 }
 
-Midi_stream &
-Midi_stream::operator << (String str)
+void
+Midi_stream::write (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'"));
-
-  return *this;
+    warning (_f ("cannot write to file: `%s'", str.data ()));
 }
 
-Midi_stream &
-Midi_stream::operator << (Midi_item const &midi_c_r)
+void
+Midi_stream::write (Midi_chunk const &midi)
 {
-  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"))
-       {
-         str[i] = '\n';
-         str[i + 1] = '\t';
-       }
-    }
+  string str = midi.to_string ();
 
-  return operator << (str);
-}
-
-Midi_stream&
-Midi_stream::operator << (int i)
-{
-  // output binary string ourselves
-  *this << Midi_item::i2varint_string (i);
-  return *this;
+  return write (str);
 }