patch::: 1.3.132.jcn1

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 83d8b7aa6ce107066ed1137666a328fc0eb001ea..cdaf316cf898bbd53eab0527a78b998303305443 100644 (file)
--- 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
+
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include <fstream.h>
-#include <time.h>
+#include "paper-stream.hh"
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
@@ -15,66 +16,55 @@
 #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)
 {
-    filename_str_ = filename_str;
-    tracks_i_ = tracks_i;
-    clocks_per_4_i_ = clocks_per_4_i;
-    os_p_ = 0;
-    open();
-    header();
+  filename_str_ = filename;
+  os_p_ = open_file_stream (filename, ios::out|ios::bin);
 }
 
-Midi_stream::~Midi_stream()
+Midi_stream::~Midi_stream ()
 {
-    delete os_p_;
+  close_file_stream (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;
+  *os_p_ << str;
+  return *this;
 }
 
+extern bool verbose_global_b;
 Midi_stream&
-Midi_stream::operator <<( Midi_item const& mitem_c_r )
+Midi_stream::operator << (Midi_item const& midi_c_r)
 {
-    mitem_c_r.output_midi( *this );
-    if ( check_debug )
-        *os_p_ << "\n";
-    return *this;
-}
+  String str = midi_c_r.str ();
+#if 0
+  if (flower_dstream && !flower_dstream->silent_b ("Midistrings"))
+#else    
+  if (verbose_global_b)
+#endif    
+    {
+     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");
+      }
+    }
 
-Midi_stream&
-Midi_stream::operator <<( int i )
-{
-    // output binary string ourselves
-    *this << Midi_item::i2varint_str( i );
-    return *this;
+  *os_p_ << str;
+  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_ + "\'" );
-}