X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=d0f853109468727e0d038adeb1fb2a5194f4ad36;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=315da958607864d794bd8b2f62c405aaf8f44065;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 315da95860..d0f8531094 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,75 +1,64 @@
 /*
-  midi-stream.cc -- implement Midi_stream
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  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.
+
+  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.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "midi-stream.hh"
+
+#include <cerrno>
+using namespace std;
 
-#include "stream.hh"
-#include "string.hh"
-#include "string-convert.hh"
+#include "international.hh"
 #include "main.hh"
+#include "midi-chunk.hh"
 #include "misc.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
+#include "program-option.hh"
+#include "string-convert.hh"
 #include "warn.hh"
-#include "scm-option.hh"
 
-Midi_stream::Midi_stream (String filename)
+Midi_stream::Midi_stream (const string &file_name)
 {
-  filename_str_ = filename;
-  os_p_ = open_file_stream (filename, std::ios::out|std::ios::binary);
+  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 ()
 {
-  close_file_stream (os_p_);
-}
-
-Midi_stream&
-Midi_stream::operator << (String str)
-{
-  Byte * b = str.byte_l();
-  for (int sz = str.length_i (); sz--;)
-    *os_p_ << *b ++;
-  return *this;
+  fclose (out_file_);
 }
 
-Midi_stream&
-Midi_stream::operator << (Midi_item const& midi_c_r)
+void
+Midi_stream::write (const string &str)
 {
-  String str = midi_c_r.str ();
-
+  size_t sz = sizeof (Byte);
+  size_t n = str.length ();
+  size_t written = fwrite (str.data (), sz, n, out_file_);
 
-  if (midi_debug_global_b)
-    {
-     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");
-      }
-    }
-  else
-    {
-      Byte * b = str.byte_l();
-      for (int sz = str.length_i (); sz--;)
-	*os_p_ << *b++;
-    }
-  
-  return *this;
+  if (written != sz * n)
+    warning (_f ("cannot write to file: `%s'", file_name_string_.c_str ()));
 }
 
-Midi_stream&
-Midi_stream::operator << (int i)
+void
+Midi_stream::write (Midi_chunk const &midi)
 {
-  // output binary string ourselves
-  *this << Midi_item::i2varint_str (i);
-  return *this;
+  string str = midi.to_string ();
+
+  return write (str);
 }