2003 -> 2004

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index cbfe7075f18401ad05ed67070c306a1cbc70fea9..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--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
@@ -14,59 +14,58 @@
 #include "misc.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "scm-option.hh"
 
 Midi_stream::Midi_stream (String filename)
 {
-  filename_str_ = filename;
-#if __GCC__ > 2
-  os_p_ = open_file_stream (filename, ios::out|ios::bin);
-#else
-  os_p_ = open_file_stream (filename, ios::out|ios::binary);
-#endif
+  filename_string_ = filename;
+  out_file_ = fopen (filename.to_str0(), "wb");
 }
 
 Midi_stream::~Midi_stream ()
 {
-  close_file_stream (os_p_);
+  fclose (out_file_);
 }
 
 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.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.str ();
-
+  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 (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 (int i = str.index ("0a"); i >= 0; i = str.index ("0a"))
+       {
+         str[i] = '\n';
+         str[i + 1] = '\t';
+       }
     }
 
-  *os_p_ << str;
-  return *this;
+  return operator << (str);
 }
 
 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;
 }