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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 51069c4cc6..4c1aa56423 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,90 +1,54 @@
-//
-// 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"
-#include "main.hh"
-#include "misc.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
-#include "debug.hh"
+  source file of the GNU LilyPond music typesetter
 
-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();
-}
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-Midi_stream::~Midi_stream()
-{
-    delete os_p_;
-}
+#include "midi-stream.hh"
 
-Midi_stream&
-Midi_stream::operator <<( 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;
-}
+#include <cerrno>
+using namespace std;
+
+#include "international.hh"
+#include "main.hh"
+#include "midi-chunk.hh"
+#include "misc.hh"
+#include "program-option.hh"
+#include "stream.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
-Midi_stream&
-Midi_stream::operator <<( Midi_item const& mitem_c_r )
+Midi_stream::Midi_stream (string file_name)
 {
-    mitem_c_r.output_midi( *this );
-    if ( check_debug )
-        *os_p_ << "\n";
-    return *this;
+  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::operator <<( int i )
+Midi_stream::~Midi_stream ()
 {
-    // output binary string ourselves
-    *this << Midi_item::i2varint_str( i );
-    return *this;
+  fclose (out_file_);
 }
 
 void
-Midi_stream::header()
+Midi_stream::write (string str)
 {
-//    *os_p_ << "% Creator: " << get_version();
-//    *os_p_ << "% Automatically generated, at ";
-//    time_t t(time(0));
-//    *os_p_ << ctime(&t);
+  size_t sz = sizeof (Byte);
+  size_t n = str.length ();
+  size_t written = fwrite (str.data (), sz, n, out_file_);
 
-//                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;
-
-//      *this << Midi_header( 1, 1, tempo_i_ );
-      *this << Midi_header( 1, tracks_i_, clocks_per_4_i_ );
+  if (written != sz * n)
+    warning (_f ("cannot write to file: `%s'", str.data ()));
 }
 
 void
-Midi_stream::open()
+Midi_stream::write (Midi_chunk const &midi)
 {
-    os_p_ = new ofstream( filename_str_ );
-    if ( !*os_p_ )
-	error ("can't open `" + filename_str_ + "\'" );
+  string str = midi.to_string ();
+
+  return write (str);
 }
+