X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=3d5b366a1008b7801755686cfb8576eb9603a3b8;hb=7cb049f7f3705e414c2a49c7cf14f43a51914c48;hp=89aab84a8b618f7650d2e63b76917aa6b8b7a97d;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 89aab84a8b..3d5b366a10 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,11 +1,13 @@
-//
-// midi-stream.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  midi-stream.cc -- implement Midi_stream
 
-#include <fstream.h>
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+
+#include "stream.hh"
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
@@ -13,40 +15,41 @@
 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "debug.hh"
+#include "scm-option.hh"
 
-Midi_stream::Midi_stream (String filename_str)
+Midi_stream::Midi_stream (String filename)
 {
-  filename_str_ = filename_str;
-  os_p_ = 0;
-  open ();
+  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
 }
 
 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_;
+  close_file_stream (os_p_);
 }
 
 Midi_stream&
 Midi_stream::operator << (String str)
 {
-  *os_p_ << str;
+  Byte * b = str.byte_l();
+  for (int sz = str.length_i (); sz--;)
+    *os_p_ << *b ++;
   return *this;
 }
 
 Midi_stream&
-Midi_stream::operator << (Midi_item const& mitem_c_r)
+Midi_stream::operator << (Midi_item const& midi_c_r)
 {
-//    *this <<mitem_c_r.str (); 
-  String str = mitem_c_r.str ();
-  if (check_debug && !monitor->silent_b ("Midistrings")) 
+  String str = midi_c_r.str ();
+
+
+  if (midi_debug_global_b)
     {
-    str = String_convert::bin2hex_str (str) + "\n";
+     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)
@@ -56,8 +59,13 @@ Midi_stream::operator << (Midi_item const& mitem_c_r)
     	i = str.index_i ("0a");
       }
     }
-
-  *os_p_ << str;
+  else
+    {
+      Byte * b = str.byte_l();
+      for (int sz = str.length_i (); sz--;)
+	*os_p_ << *b++;
+    }
+  
   return *this;
 }
 
@@ -69,10 +77,3 @@ Midi_stream::operator << (int i)
   return *this;
 }
 
-void
-Midi_stream::open ()
-{
-  os_p_ = new ofstream (filename_str_.ch_C ());
-  if (!*os_p_)
-    error (_ ("can't open `") + filename_str_ + "\'");
-}