X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=ef88ef9f424b54ff1c0d3cd4b5da655f6d40fabb;hb=99433c54bea756a38ed6b2a70bc8c90cd0d37902;hp=5f1b3ee501652a6494d9463950ca771526014b7d;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 5f1b3ee501..ef88ef9f42 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,68 +1,71 @@
-//
-// midistream.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  midi-stream.cc -- implement Midi_stream
 
-#include <fstream.h>
-#include <time.h>
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2004 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()
+Midi_stream::~Midi_stream ()
 {
-  delete os_p_;
+  fclose (out_file_);
 }
 
 Midi_stream&
-Midi_stream::operator <<( String str)
+Midi_stream::operator << (String str)
 {
-  if ( check_debug)
-	str = String_convert::bin2hex_str (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 ( check_debug)
-      *os_p_ << "\n";
+  if (written != sz * n)
+    warning (_ ("could not write file: `%s'"));
 
   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();
-  mitem_c_r.output (this);
-  if ( check_debug)
-      *os_p_ << "\n";
-  return *this;
+  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) + "\n";
+      for (int i = str.index ("0a"); i >= 0; i = str.index ("0a"))
+	{
+	  str[i] = '\n';
+	  str[i + 1] = '\t';
+	}
+    }
+
+  return operator << (str);
 }
 
 Midi_stream&
-Midi_stream::operator <<( int i)
+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_);
-  if ( !*os_p_)
-	error ("can't open `" + filename_str_ + "\'");
-}