X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=cbfe7075f18401ad05ed67070c306a1cbc70fea9;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=51069c4cc6edc480b9983f81d258475ee2d7ab00;hpb=04f01c7e890bd4f1b358378e5911fb7c117c3802;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 51069c4cc6..cbfe7075f1 100644
--- 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--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+
+#include "stream.hh"
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
@@ -14,77 +15,58 @@
 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "debug.hh"
+#include "scm-option.hh"
 
-Midi_stream::Midi_stream( String filename_str, int tracks_i, int clocks_per_4_i ) 
-{
-    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()
+Midi_stream::Midi_stream (String filename)
 {
-    delete os_p_;
+  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::operator <<( String str )
+Midi_stream::~Midi_stream ()
 {
-    // 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;
+  close_file_stream (os_p_);
 }
 
 Midi_stream&
-Midi_stream::operator <<( Midi_item const& mitem_c_r )
+Midi_stream::operator << (String str)
 {
-    mitem_c_r.output_midi( *this );
-    if ( check_debug )
-        *os_p_ << "\n";
-    return *this;
+  *os_p_ << str;
+  return *this;
 }
 
 Midi_stream&
-Midi_stream::operator <<( int i )
-{
-    // output binary string ourselves
-    *this << Midi_item::i2varint_str( i );
-    return *this;
-}
-
-void
-Midi_stream::header()
+Midi_stream::operator << (Midi_item const& midi_c_r)
 {
-//    *os_p_ << "% Creator: " << get_version();
-//    *os_p_ << "% Automatically generated, at ";
-//    time_t t(time(0));
-//    *os_p_ << ctime(&t);
+  String str = midi_c_r.str ();
 
-//                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 = "0000" "0006" "0001" "0001" "0060";
-//    str += String_convert::hex2bin_str( ch_C );
-//    *os_p_ << 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");
+      }
+    }
 
-//      *this << Midi_header( 1, 1, tempo_i_ );
-      *this << Midi_header( 1, tracks_i_, clocks_per_4_i_ );
+  *os_p_ << str;
+  return *this;
 }
 
-void
-Midi_stream::open()
+Midi_stream&
+Midi_stream::operator << (int i)
 {
-    os_p_ = new ofstream( filename_str_ );
-    if ( !*os_p_ )
-	error ("can't open `" + filename_str_ + "\'" );
+  // output binary string ourselves
+  *this << Midi_item::i2varint_str (i);
+  return *this;
 }
+