X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=b03d63b7214731e27aac12040b7e0c146b9b2e7a;hb=6c68e65859bae109509e1c464fdfca6de4b5ddd1;hp=88e5eb2dc605568b454956c0ac7d150dbc66083c;hpb=5d9f9a9c6ef58ed7c6ed2311f2bc4d75b8722469;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 88e5eb2dc6..b03d63b721 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,90 +1,75 @@
-//
-// midistream.cc
-//
-// source file of the 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 (std::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 ("can't 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 << (std::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;
-}
+  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 (_ ("can't 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)
 {
-//    *os_p_ << "% Creator: " << get_version();
-//    *os_p_ << "% Automatically generated, at ";
-//    time_t t(time(0));
-//    *os_p_ << ctime(&t);
+  std::string str = midi_c_r.to_string ();
 
-//                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
+  // 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';
+	}
+    }
 
-//    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_ );
+  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;
 }
+