X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=cfc5a60ecabf2d84966662d4a25a9155ad5d520d;hb=388121aed1734e9e536ede58bd3de98b68367842;hp=6fc0980ac84277f04ecfcbc46642d93db984f4d1;hpb=aa384518d059d26ffd6c0da3068fbdc2a345ecc1;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 6fc0980ac8..cfc5a60eca 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,75 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "midi-stream.hh"
 
 #include "stream.hh"
-#include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
 #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)
+Midi_stream::Midi_stream (String file_name)
 {
-  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
+  file_name_string_ = file_name;
+  out_file_ = fopen (file_name.to_str0(), "wb");
 }
 
 Midi_stream::~Midi_stream ()
 {
-  close_file_stream (os_p_);
+  fclose (out_file_);
 }
 
 Midi_stream&
 Midi_stream::operator << (String str)
 {
-  Byte * b = str.byte_l();
-  for (int sz = str.length_i (); sz--;)
-    *os_p_ << *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: `%s'"));
+
   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';
+	}
     }
 
-  Byte * b = str.byte_l();
-  for (int sz = str.length_i (); sz--;)
-    *os_p_ << *b;
-  
-  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;
 }