patch::: 1.3.108.jcn3

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index efc244c5de69538a56b997c85f5be076d2ce8112..f84544976fd6f0d6bb110cb34debb876d30af0ed 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,12 +1,11 @@
 //
-// midistream.cc
+// midi-stream.cc
 //
 // source file of the GNU LilyPond music typesetter
 //
-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+// (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
 #include <fstream.h>
-#include <time.h>
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
@@ -27,7 +26,7 @@ Midi_stream::~Midi_stream ()
   *os_p_ << flush;             // ugh. Share with tex_stream.
   if (!*os_p_)
     {
-      warning (_ ("error syncing file (disk full?)"));
+      warning (_ ("Error syncing file (disk full?)"));
       exit_status_i_ = 1;
     }
   delete os_p_;
@@ -41,11 +40,11 @@ Midi_stream::operator << (String str)
 }
 
 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 (); 
-  String str = mitem_c_r.str ();
-  if (check_debug && !monitor->silent_b ("Midistrings")) 
+//    *this <<midi_c_r.str (); 
+  String str = midi_c_r.str ();
+  if (flower_dstream && !flower_dstream->silent_b ("Midistrings")) 
     {
     str = String_convert::bin2hex_str (str) + "\n";
     // ugh, should have separate debugging output with Midi*::print routines
@@ -73,7 +72,7 @@ Midi_stream::operator << (int i)
 void
 Midi_stream::open ()
 {
-  os_p_ = new ofstream (filename_str_.ch_C ());
+  os_p_ = new ofstream (filename_str_.ch_C (),ios::out|ios::bin);
   if (!*os_p_)
-    error (_ ("can't open `") + filename_str_ + "\'");
+    error (_f ("can't open file: `%s'", filename_str_));
 }