X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=c7a48ad706d1ee04456b214e7bf65f7e6ac34b18;hb=c9f2e5f23fd435ab69b4313a2e5902556cc91511;hp=e6a2e35b3c83a3eec383e71a73a00dea5d8750e4;hpb=8309cbcd6660ea1f0b35abacbb424ddc4158e448;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index e6a2e35b3c..c7a48ad706 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,90 +1,65 @@
-//
-// midistream.cc
-//
-// source file of the LilyPond music typesetter
-//
-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#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"
+  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-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();
-}
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-Midi_stream::~Midi_stream()
-{
-    delete os_p_;
-}
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-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;
-}
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-Midi_stream&
-Midi_stream::operator <<( Midi_item const& mitem_c_r )
+#include "midi-stream.hh"
+
+#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 (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);
-
-//                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;
+  size_t sz = sizeof (Byte);
+  size_t n = str.length ();
+  size_t written = fwrite (str.data (), sz, n, out_file_);
 
-//      *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);
 }
+