X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=4c1aa564235ccc4365ea751949d0414353e015fd;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f51110daed2d448f8ce90965c53deff9ac313a26;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index f51110daed..4c1aa56423 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,78 +1,54 @@
-//
-// 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"
-#include "string-convert.hh"
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "midi-stream.hh"
+
+#include <cerrno>
+using namespace std;
+
+#include "international.hh"
 #include "main.hh"
+#include "midi-chunk.hh"
 #include "misc.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
-#include "debug.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 ("cannot open for write: %s: %s", file_name, strerror (errno)));
 }
 
 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;
-  return *this;
-}
-
-Midi_stream&
-Midi_stream::operator << (Midi_item const& mitem_c_r)
+void
+Midi_stream::write (string str)
 {
-//    *this <<mitem_c_r.str (); 
-  String str = mitem_c_r.str ();
-  if (check_debug && !monitor->silent_b ("Midistrings")) 
-    {
-    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");
-      }
-    }
-
-  *os_p_ << str;
-  return *this;
-}
+  size_t sz = sizeof (Byte);
+  size_t n = str.length ();
+  size_t written = fwrite (str.data (), sz, n, out_file_);
 
-Midi_stream&
-Midi_stream::operator << (int i)
-{
-  // output binary string ourselves
-  *this << Midi_item::i2varint_str (i);
-  return *this;
+  if (written != sz * n)
+    warning (_f ("cannot write to file: `%s'", str.data ()));
 }
 
 void
-Midi_stream::open ()
+Midi_stream::write (Midi_chunk const &midi)
 {
-  os_p_ = new ofstream (filename_str_.ch_C (),ios::out|ios::bin);
-  if (!*os_p_)
-    error (_f ("can't open file: `%s\'", filename_str_));
+  string str = midi.to_string ();
+
+  return write (str);
 }
+