X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=9409762d66f0bbf2eb9b1514336569c677e5ce05;hb=2c77bcc3dd446189af62d320d96359a165335179;hp=34833fb24b877381d1b89ed18bbd33c5cea0962c;hpb=1bdf3db27451a0873b2c97545f0beab2f5cce06a;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 34833fb24b..9409762d66 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,74 +1,65 @@
-//
-// midistream.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include <fstream.h>
-#include <time.h>
-#include "string.hh"
-#include "string-convert.hh"
-#include "main.hh"
-#include "misc.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
-#include "debug.hh"
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-Midi_stream::Midi_stream (String filename_str)
-{
-  filename_str_ = filename_str;
-  os_p_ = 0;
-  open();
-}
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-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_;
-}
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-Midi_stream&
-Midi_stream::operator <<(String str)
-{
-  if (check_debug && !monitor->silent_b("Midistrings"))
-    str = String_convert::bin2hex_str (str);
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-  *os_p_ << str;
+#include "midi-stream.hh"
 
-  if (check_debug && !monitor->silent_b ("Midistrings"))
-    *os_p_ << "\n";
+#include <cerrno>
+using namespace std;
 
-  return *this;
+#include "international.hh"
+#include "main.hh"
+#include "midi-chunk.hh"
+#include "misc.hh"
+#include "program-option.hh"
+#include "stream.hh"
+#include "string-convert.hh"
+#include "warn.hh"
+
+Midi_stream::Midi_stream (string file_name)
+{
+  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::operator <<(Midi_item const& mitem_c_r)
+Midi_stream::~Midi_stream ()
 {
-  //    *this << mitem_c_r.str();
-  mitem_c_r.output (this);
-  if (check_debug && !monitor->silent_b("Midistrings"))
-    *os_p_ << "\n";
-  return *this;
+  fclose (out_file_);
 }
 
-Midi_stream&
-Midi_stream::operator <<(int i)
+void
+Midi_stream::write (string str)
 {
-  // output binary string ourselves
-  *this << Midi_item::i2varint_str (i);
-  return *this;
+  size_t sz = sizeof (Byte);
+  size_t n = str.length ();
+  size_t written = fwrite (str.data (), sz, n, out_file_);
+
+  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 ());
-  if (!*os_p_)
-    error (_("can't open `") + filename_str_ + "\'");
+  string str = midi.to_string ();
+
+  return write (str);
 }
+