patch::: 0.1.31.jcn1: minder ugh

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 83d8b7aa6ce107066ed1137666a328fc0eb001ea..6d2cb2699a61097f4313e8e69d45c3542446a6ba 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -15,66 +15,60 @@
 #include "midi-stream.hh"
 #include "debug.hh"
 
-Midi_stream::Midi_stream( String filename_str, int tracks_i, int clocks_per_4_i ) 
+Midi_stream::Midi_stream (String filename_str)
 {
-    filename_str_ = filename_str;
-    tracks_i_ = tracks_i;
-    clocks_per_4_i_ = clocks_per_4_i;
-    os_p_ = 0;
-    open();
-    header();
+  filename_str_ = filename_str;
+  os_p_ = 0;
+  open();
 }
 
 Midi_stream::~Midi_stream()
 {
-    delete os_p_;
+  *os_p_ << flush;             // ugh. Share with tex_stream.
+  if (!*os_p_)
+    {
+      warning(_("error syncing file (disk full?)"));
+      exit_status_i_ = 1;
+    }
+  delete os_p_;
 }
 
 Midi_stream&
-Midi_stream::operator <<( String str )
+Midi_stream::operator <<(String str)
 {
-    if ( check_debug )
-       str = String_convert::bin2hex_str( str );
-    
-    *os_p_ << str;
-    return *this;
-}
+  if (check_debug && !monitor->silence("Midistrings"))
+    str = String_convert::bin2hex_str (str);
 
-Midi_stream&
-Midi_stream::operator <<( Midi_item const& mitem_c_r )
-{
-    mitem_c_r.output_midi( *this );
-    if ( check_debug )
-        *os_p_ << "\n";
-    return *this;
+  *os_p_ << str;
+
+  if (check_debug && !monitor->silence("Midistrings"))
+    *os_p_ << "\n";
+
+  return *this;
 }
 
 Midi_stream&
-Midi_stream::operator <<( int i )
+Midi_stream::operator <<(Midi_item const& mitem_c_r)
 {
-    // output binary string ourselves
-    *this << Midi_item::i2varint_str( i );
-    return *this;
+  //    *this << mitem_c_r.str();
+  mitem_c_r.output (this);
+  if (check_debug && !monitor->silence("Midistrings"))
+    *os_p_ << "\n";
+  return *this;
 }
 
-void
-Midi_stream::header()
+Midi_stream&
+Midi_stream::operator <<(int i)
 {
-/*
-                4D 54 68 64     MThd
-    String str = "MThd";
-                00 00 00 06     chunk length
-                00 01   format 1
-                00 01   one track
-                00 60   96 per quarter-note
-*/
-      *this << Midi_header( 1, tracks_i_, clocks_per_4_i_ );
+  // output binary string ourselves
+  *this << Midi_item::i2varint_str (i);
+  return *this;
 }
 
 void
 Midi_stream::open()
 {
-    os_p_ = new ofstream( filename_str_ );
-    if ( !*os_p_ )
-       error ("can't open `" + filename_str_ + "\'" );
+  os_p_ = new ofstream (filename_str_.ch_C ());
+  if (!*os_p_)
+    error (_("can't open `") + filename_str_ + "\'");
 }