release: 0.1.7

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 83d8b7aa6ce107066ed1137666a328fc0eb001ea..04777b50c881d078d171cddec9be3c49b1d421e5 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -15,14 +15,11 @@
 #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();
 }
 
 Midi_stream::~Midi_stream()
@@ -37,13 +34,18 @@ Midi_stream::operator <<( String str )
        str = String_convert::bin2hex_str( str );
     
     *os_p_ << str;
+
+    if ( check_debug )
+        *os_p_ << "\n";
+
     return *this;
 }
 
 Midi_stream&
 Midi_stream::operator <<( Midi_item const& mitem_c_r )
 {
-    mitem_c_r.output_midi( *this );
+//    *this << mitem_c_r.str();
+    mitem_c_r.output( this );
     if ( check_debug )
         *os_p_ << "\n";
     return *this;
@@ -57,20 +59,6 @@ Midi_stream::operator <<( int i )
     return *this;
 }
 
-void
-Midi_stream::header()
-{
-/*
-                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_ );
-}
-
 void
 Midi_stream::open()
 {