X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=b5d02f84004baa4094a72ad163b028a34a280dcc;hb=13d99989ef160475a01ee7310993fed3b4fa567a;hp=83d8b7aa6ce107066ed1137666a328fc0eb001ea;hpb=6dc4e4d14a67f65f337ec1a06466e748c68dcad5;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 83d8b7aa6c..b5d02f8400 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,80 +1,75 @@
-//
-// 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>
-#include "string.hh"
-#include "string-convert.hh"
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "midi-stream.hh"
+
+#include <cerrno>
+using namespace std;
+
+#include "international.hh"
 #include "main.hh"
-#include "misc.hh"
 #include "midi-item.hh"
-#include "midi-stream.hh"
-#include "debug.hh"
+#include "misc.hh"
+#include "program-option.hh"
+#include "stream.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
-Midi_stream::Midi_stream( String filename_str, int tracks_i, int clocks_per_4_i ) 
+Midi_stream::Midi_stream (string file_name)
 {
-    filename_str_ = filename_str;
-    tracks_i_ = tracks_i;
-    clocks_per_4_i_ = clocks_per_4_i;
-    os_p_ = 0;
-    open();
-    header();
+  file_name_string_ = file_name;
+  out_file_ = fopen (file_name.c_str (), "wb");
+  if (!out_file_)
+    error (_f ("cannot open for write: %s: %s", file_name, strerror (errno)));
 }
 
-Midi_stream::~Midi_stream()
+Midi_stream::~Midi_stream ()
 {
-    delete os_p_;
+  fclose (out_file_);
 }
 
-Midi_stream&
-Midi_stream::operator <<( String str )
+Midi_stream &
+Midi_stream::operator << (string str)
 {
-    if ( check_debug )
-	str = String_convert::bin2hex_str( str );
-    
-    *os_p_ << str;
-    return *this;
-}
+  size_t sz = sizeof (Byte);
+  size_t n = str.length ();
+  size_t written = fwrite (str.data (), sz, n, out_file_);
 
-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 (written != sz * n)
+    warning (_ ("cannot write to file: `%s'"));
 
-Midi_stream&
-Midi_stream::operator <<( int i )
-{
-    // output binary string ourselves
-    *this << Midi_item::i2varint_str( i );
-    return *this;
+  return *this;
 }
 
-void
-Midi_stream::header()
+Midi_stream &
+Midi_stream::operator << (Midi_item const &midi_c_r)
 {
-/*
-                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_ );
+  string str = midi_c_r.to_string ();
+
+  // ugh, should have separate debugging output with Midi*::print routines
+  if (do_midi_debugging_global)
+    {
+      str = String_convert::bin2hex (str) + "\n";
+      for (ssize i = str.find ("0a"); i != NPOS; i = str.find ("0a"))
+	{
+	  str[i] = '\n';
+	  str[i + 1] = '\t';
+	}
+    }
+
+  return operator << (str);
 }
 
-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_string (i);
+  return *this;
 }
+