release: 0.1.11

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 88e5eb2dc605568b454956c0ac7d150dbc66083c..0521e87c756537bd54d7075da9af731bcef7ef3c 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,7 +1,7 @@
 //
 // midistream.cc
 //
-// source file of the LilyPond music typesetter
+// source file of the GNU LilyPond music typesetter
 //
 // (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
 
@@ -15,76 +15,54 @@
 #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_;
+  delete os_p_;
 }
 
 Midi_stream&
-Midi_stream::operator <<( String str )
+Midi_stream::operator <<(String str)
 {
-    // still debugging...
-    if ( check_debug )
-       str = String_convert::bin2hex_str( str );
-    // string now 1.0.26-2 handles binary streaming
-    *os_p_ << str;
-    return *this;
-}
+  if (check_debug)
+       str = String_convert::bin2hex_str (str);
+  
+  *os_p_ << 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;
+  if (check_debug)
+      *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)
+      *os_p_ << "\n";
+  return *this;
 }
 
-void
-Midi_stream::header()
+Midi_stream&
+Midi_stream::operator <<(int i)
 {
-//    *os_p_ << "% Creator: " << get_version();
-//    *os_p_ << "% Automatically generated, at ";
-//    time_t t(time(0));
-//    *os_p_ << ctime(&t);
-
-//                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
-
-//    char const ch_c_l = "0000" "0006" "0001" "0001" "0060";
-//    str += String_convert::hex2bin_str( ch_c_l );
-//    *os_p_ << str;
-
-//      *this << Midi_header( 1, 1, tempo_i_ );
-      *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_);
+  if (!*os_p_)
+       error ("can't open `" + filename_str_ + "\'");
 }