X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmidi-stream.cc;h=b5d02f84004baa4094a72ad163b028a34a280dcc;hb=e07c4f38ab5ccd77c67a60f222267bea51e100eb;hp=59b25ef27f47f08e55695bcd5f81d3dc1088d9bb;hpb=d79efa6efaa15be34beda70e5b24731a1d372f0e;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 59b25ef27f..b5d02f8400 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,64 +3,73 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <fstream.h>
-#include "paper-stream.hh"
-#include "string.hh"
-#include "string-convert.hh"
+#include "midi-stream.hh"
+
+#include <cerrno>
+using namespace std;
+
+#include "international.hh"
 #include "main.hh"
-#include "misc.hh"
 #include "midi-item.hh"
-#include "midi-stream.hh"
-#include "debug.hh"
+#include "misc.hh"
+#include "program-option.hh"
+#include "stream.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
-Midi_stream::Midi_stream (String filename)
+Midi_stream::Midi_stream (string file_name)
 {
-  filename_str_ = filename;
-  os_p_ = open_file_stream (filename, ios::out|ios::bin);
+  file_name_string_ = file_name;
+  out_file_ = fopen (file_name.c_str (), "wb");
+  if (!out_file_)
+    error (_f ("cannot open for write: %s: %s", file_name, strerror (errno)));
 }
 
 Midi_stream::~Midi_stream ()
 {
-  close_file_stream (os_p_);
+  fclose (out_file_);
 }
 
-Midi_stream&
-Midi_stream::operator << (String str)
+Midi_stream &
+Midi_stream::operator << (string str)
 {
-  *os_p_ << str;
+  size_t sz = sizeof (Byte);
+  size_t n = str.length ();
+  size_t written = fwrite (str.data (), sz, n, out_file_);
+
+  if (written != sz * n)
+    warning (_ ("cannot 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)
 {
-//    *this <<midi_c_r.str (); 
-  String str = midi_c_r.str ();
-  if (flower_dstream && !flower_dstream->silent_b ("Midistrings")) 
+  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 (str) + "\n";
-    // ugh, should have separate debugging output with Midi*::print routines
-    int i = str.index_i ("0a");
-    while (i >= 0)
-      {
-        str[i] = '\n';
-        str[i + 1] = '\t';
-    	i = str.index_i ("0a");
-      }
+      str = String_convert::bin2hex (str) + "\n";
+      for (ssize i = str.find ("0a"); i != NPOS; i = str.find ("0a"))
+	{
+	  str[i] = '\n';
+	  str[i + 1] = '\t';
+	}
     }
 
-  *os_p_ << str;
-  return *this;
+  return operator << (str);
 }
 
-Midi_stream&
+Midi_stream &
 Midi_stream::operator << (int i)
 {
   // output binary string ourselves
-  *this << Midi_item::i2varint_str (i);
+  *this << Midi_item::i2varint_string (i);
   return *this;
 }