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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 1bd6b7ddb3..4c1aa56423 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,24 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "midi-stream.hh"
 
-#include "stream.hh"
-#include "string.hh"
-#include "string-convert.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 "program-option.hh"
+#include "stream.hh"
+#include "string-convert.hh"
 #include "warn.hh"
-#include "scm-option.hh"
 
-Midi_stream::Midi_stream (String filename)
+Midi_stream::Midi_stream (string file_name)
 {
-  filename_string_ = filename;
-  out_file_ = fopen (filename.to_str0(), "wb");
+  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 ()
@@ -28,54 +33,22 @@ Midi_stream::~Midi_stream ()
   fclose (out_file_);
 }
 
-Midi_stream&
-Midi_stream::operator << (String str)
-{
-  Byte * b = str.get_bytes ();
-  for (int sz = str.length (); sz--;)
-    {
-      fputc (*b, out_file_);
-      b++;
-    }
-  return *this;
-}
-
-Midi_stream&
-Midi_stream::operator << (Midi_item const& midi_c_r)
+void
+Midi_stream::write (string str)
 {
-  String str = midi_c_r.string ();
-
+  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) + "\n";
-    // ugh, should have separate debugging output with Midi*::print routines
-    int i = str.index ("0a");
-    while (i >= 0)
-      {
-        str[i] = '\n';
-        str[i + 1] = '\t';
-    	i = str.index ("0a");
-      }
-    }
-  else
-    {
-      Byte * b = str.get_bytes ();
-      for (int sz = str.length (); sz--;)
-	{
-	  fputc (*b, out_file_);
-	  b++;
-	}
-    }
-  
-  return *this;
+  if (written != sz * n)
+    warning (_f ("cannot write to file: `%s'", str.data ()));
 }
 
-Midi_stream&
-Midi_stream::operator << (int i)
+void
+Midi_stream::write (Midi_chunk const &midi)
 {
-  // output binary string ourselves
-  *this << Midi_item::i2varint_string (i);
-  return *this;
+  string str = midi.to_string ();
+
+  return write (str);
 }