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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index e6835f42fd..4c1aa56423 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "midi-stream.hh"
@@ -13,7 +13,7 @@ using namespace std;
 
 #include "international.hh"
 #include "main.hh"
-#include "midi-item.hh"
+#include "midi-chunk.hh"
 #include "misc.hh"
 #include "program-option.hh"
 #include "stream.hh"
@@ -25,7 +25,7 @@ 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)));
+    error (_f ("cannot open for write: %s: %s", file_name, strerror (errno)));
 }
 
 Midi_stream::~Midi_stream ()
@@ -33,43 +33,22 @@ Midi_stream::~Midi_stream ()
   fclose (out_file_);
 }
 
-Midi_stream &
-Midi_stream::operator << (string str)
+void
+Midi_stream::write (string str)
 {
   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 (_ (cannot write to file: `%s'"));
-
-  return *this;
+    warning (_f ("cannot write to file: `%s'", str.data ()));
 }
 
-Midi_stream &
-Midi_stream::operator << (Midi_item const &midi_c_r)
+void
+Midi_stream::write (Midi_chunk const &midi)
 {
-  string str = midi_c_r.to_string ();
-
-  // 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';
-	}
-    }
+  string str = midi.to_string ();
 
-  return operator << (str);
-}
-
-Midi_stream &
-Midi_stream::operator << (int i)
-{
-  // output binary string ourselves
-  *this << Midi_item::i2varint_string (i);
-  return *this;
+  return write (str);
 }