Minor fix from Werner.

[lilypond.git] / lily / midi-stream.cc

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 04777b50c881d078d171cddec9be3c49b1d421e5..d5b62fee5978490d7a34f37ff6e29e6e57844d91 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,68 +1,75 @@
-//
-// 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>
-#include "string.hh"
-#include "string-convert.hh"
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "midi-stream.hh"
+
+#include <cerrno>
+using namespace std;
+
+#include "international.hh"
 #include "main.hh"
-#include "misc.hh"
 #include "midi-item.hh"
-#include "midi-stream.hh"
-#include "debug.hh"
+#include "misc.hh"
+#include "program-option.hh"
+#include "stream.hh"
+#include "string-convert.hh"
+#include "warn.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.c_str (), "wb");
+  if (!out_file_)
+    error (_f ("can't open for write: %s: %s", file_name, strerror (errno)));
 }
 
-Midi_stream::~Midi_stream()
+Midi_stream::~Midi_stream ()
 {
-    delete os_p_;
+  fclose (out_file_);
 }
 
-Midi_stream&
-Midi_stream::operator <<( String str )
+Midi_stream &
+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.data (), sz, n, out_file_);
 
-    if ( check_debug )
-        *os_p_ << "\n";
+  if (written != sz * n)
+    warning (_ ("can't write to file: `%s'"));
 
-    return *this;
+  return *this;
 }
 
-Midi_stream&
-Midi_stream::operator <<( Midi_item const& mitem_c_r )
+Midi_stream &
+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 ();
 
-Midi_stream&
-Midi_stream::operator <<( int i )
-{
-    // output binary string ourselves
-    *this << Midi_item::i2varint_str( i );
-    return *this;
+  // ugh, should have separate debugging output with Midi*::print routines
+  if (do_midi_debugging_global)
+    {
+      str = String_convert::bin2hex (str) + "\n";
+      for (ssize i = str.find ("0a"); i != NPOS; i = str.find ("0a"))
+       {
+         str[i] = '\n';
+         str[i + 1] = '\t';
+       }
+    }
+
+  return operator << (str);
 }
 
-void
-Midi_stream::open()
+Midi_stream &
+Midi_stream::operator << (int i)
 {
-    os_p_ = new ofstream( filename_str_ );
-    if ( !*os_p_ )
-       error ("can't open `" + filename_str_ + "\'" );
+  // output binary string ourselves
+  *this << Midi_item::i2varint_string (i);
+  return *this;
 }
+