X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=1013a5068ac8a081121fea03969d2b4ed87f7066;hb=refs%2Ftags%2Frelease%2F1.7.18;hp=caeeae55c623570772b89113f7e9b68fc6311d58;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index caeeae55c6..1013a5068a 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,63 +1,73 @@
-//
-// midi-stream.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+/*
+  midi-stream.cc -- implement Midi_stream
 
-#include <fstream.h>
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+
+#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_str)
+Midi_stream::Midi_stream (String filename)
 {
-  filename_str_ = filename_str;
-  os_p_ = 0;
-  open ();
+  filename_string_ = filename;
+  out_file_ = fopen (filename.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;
+  Byte * b = str.get_bytes ();
+  for (int sz = str.length (); sz--;)
+    {
+      fputc (*b, out_file_);
+      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.to_string ();
+
+
+  if (midi_debug_global_b)
     {
-    str = String_convert::bin2hex_str (str) + "\n";
+     str = String_convert::bin2hex (str) + "\n";
     // ugh, should have separate debugging output with Midi*::print routines
-    int i = str.index_i ("0a");
+    int i = str.index ("0a");
     while (i >= 0)
       {
         str[i] = '\n';
         str[i + 1] = '\t';
-    	i = str.index_i ("0a");
+    	i = str.index ("0a");
       }
     }
-
-  *os_p_ << str;
+  else
+    {
+      Byte * b = str.get_bytes ();
+      for (int sz = str.length (); sz--;)
+	{
+	  fputc (*b, out_file_);
+	  b++;
+	}
+    }
+  
   return *this;
 }
 
@@ -65,14 +75,7 @@ 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_));
-}