2003 -> 2004

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 1bd6b7ddb3acffda2212ebadf0ad1a51af8daebb..e5c760e7c07dc8e62dffd8dd22509a4d92027d72 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
@@ -31,44 +31,34 @@ Midi_stream::~Midi_stream ()
 Midi_stream&
 Midi_stream::operator << (String str)
 {
-  Byte * b = str.get_bytes ();
-  for (int sz = str.length (); sz--;)
-    {
-      fputc (*b, out_file_);
-      b++;
-    }
+  size_t sz = sizeof (Byte);
+  size_t n = str.length ();
+  size_t written = fwrite (str.get_bytes (),
+                          sz, n, out_file_);
+
+  if (written != sz * n)
+    warning (_ ("Could not write file. Disk full?"));
+
   return *this;
 }
 
 Midi_stream&
 Midi_stream::operator << (Midi_item const& midi_c_r)
 {
-  String str = midi_c_r.string ();
-
+  String str = midi_c_r.to_string ();
 
+  // ugh, should have separate debugging output with Midi*::print routines
   if (midi_debug_global_b)
     {
-     str = String_convert::bin2hex (str) + "\n";
-    // ugh, should have separate debugging output with Midi*::print routines
-    int i = str.index ("0a");
-    while (i >= 0)
-      {
-        str[i] = '\n';
-        str[i + 1] = '\t';
-       i = str.index ("0a");
-      }
-    }
-  else
-    {
-      Byte * b = str.get_bytes ();
-      for (int sz = str.length (); sz--;)
+      str = String_convert::bin2hex (str) + "\n";
+      for (int i = str.index ("0a"); i >= 0; i = str.index ("0a"))
        {
-         fputc (*b, out_file_);
-         b++;
+         str[i] = '\n';
+         str[i + 1] = '\t';
        }
     }
-  
-  return *this;
+
+  return operator << (str);
 }
 
 Midi_stream&