release: 1.5.21

[lilypond.git] / lily / midi-stream.cc

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 9f9008dfed5f99897e722829e7145295d248dc69..9b3365753c18d9e7fecdfa4c3944e1661b817c32 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,12 +1,13 @@
-//
-// midistream.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  midi-stream.cc -- implement Midi_stream
 
-#include <fstream.h>
-#include <time.h>
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+
+#include "stream.hh"
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
@@ -14,61 +15,58 @@
 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "debug.hh"
+#include "scm-option.hh"
 
-Midi_stream::Midi_stream (String filename_str)
+Midi_stream::Midi_stream (String filename)
 {
-  filename_str_ = filename_str;
-  os_p_ = 0;
-  open();
+  filename_str_ = filename;
+#if __GCC__ > 2
+  os_p_ = open_file_stream (filename, ios::out|ios::bin);
+#else
+  os_p_ = open_file_stream (filename, ios::out|ios::binary);
+#endif
 }
 
-Midi_stream::~Midi_stream()
+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_;
+  close_file_stream (os_p_);
 }
 
 Midi_stream&
-Midi_stream::operator <<(String str)
+Midi_stream::operator << (String str)
 {
-  if (check_debug && !monitor->silence("Midistrings"))
-    str = String_convert::bin2hex_str (str);
-  
   *os_p_ << str;
-
-  if (check_debug && !monitor->silence("Midistrings"))
-    *os_p_ << "\n";
-
   return *this;
 }
 
 Midi_stream&
-Midi_stream::operator <<(Midi_item const& mitem_c_r)
+Midi_stream::operator << (Midi_item const& midi_c_r)
 {
-  //    *this << mitem_c_r.str();
-  mitem_c_r.output (this);
-  if (check_debug && !monitor->silence("Midistrings"))
-    *os_p_ << "\n";
+  String str = midi_c_r.str ();
+
+
+  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");
+      }
+    }
+
+  *os_p_ << str;
   return *this;
 }
 
 Midi_stream&
-Midi_stream::operator <<(int i)
+Midi_stream::operator << (int i)
 {
   // output binary string ourselves
   *this << Midi_item::i2varint_str (i);
   return *this;
 }
 
-void
-Midi_stream::open()
-{
-  os_p_ = new ofstream (filename_str_.ch_C ());
-  if (!*os_p_)
-    error ("can't open `" + filename_str_ + "\'");
-}