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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 2db634bdb6..cfc5a60eca 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,78 +1,70 @@
-//
-// midi-stream.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+/*
+  midi-stream.cc -- implement Midi_stream
 
-#include <fstream.h>
-#include "string.hh"
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "midi-stream.hh"
+
+#include "stream.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_str)
+Midi_stream::Midi_stream (String file_name)
 {
-  filename_str_ = filename_str;
-  os_p_ = 0;
-  open ();
+  file_name_string_ = file_name;
+  out_file_ = fopen (file_name.to_str0(), "wb");
 }
 
 Midi_stream::~Midi_stream ()
 {
-  *os_p_ << flush;		// ugh. Share with tex_stream.
-  if (!*os_p_)
-    {
-      warning (_ ("Error syncing file (disk full?)"));
-      exit_status_i_ = 1;
-    }
-  delete 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: `%s'"));
+
   return *this;
 }
 
 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 (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;
 }
 
-void
-Midi_stream::open ()
-{
-  os_p_ = new ofstream (filename_str_.ch_C (),ios::out|ios::bin);
-  if (!*os_p_)
-    error (_f ("Can't open file: `%s'", filename_str_));
-}