* Documentation/user/refman.itely: remove superfluous -'s

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 59b25ef27f47f08e55695bcd5f81d3dc1088d9bb..1013a5068ac8a081121fea03969d2b4ed87f7066 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,56 +3,71 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <fstream.h>
-#include "paper-stream.hh"
+
+#include "stream.hh"
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
-#include "debug.hh"
+#include "warn.hh"
+#include "scm-option.hh"
 
 Midi_stream::Midi_stream (String filename)
 {
-  filename_str_ = filename;
-  os_p_ = open_file_stream (filename, ios::out|ios::bin);
+  filename_string_ = filename;
+  out_file_ = fopen (filename.to_str0(), "wb");
 }
 
 Midi_stream::~Midi_stream ()
 {
-  close_file_stream (os_p_);
+  fclose (out_file_);
 }
 
 Midi_stream&
 Midi_stream::operator << (String str)
 {
-  *os_p_ << str;
+  Byte * b = str.get_bytes ();
+  for (int sz = str.length (); sz--;)
+    {
+      fputc (*b, out_file_);
+      b++;
+    }
   return *this;
 }
 
 Midi_stream&
 Midi_stream::operator << (Midi_item const& midi_c_r)
 {
-//    *this <<midi_c_r.str (); 
-  String str = midi_c_r.str ();
-  if (flower_dstream && !flower_dstream->silent_b ("Midistrings")) 
+  String str = midi_c_r.to_string ();
+
+
+  if (midi_debug_global_b)
     {
-    str = String_convert::bin2hex_str (str) + "\n";
+     str = String_convert::bin2hex (str) + "\n";
     // ugh, should have separate debugging output with Midi*::print routines
-    int i = str.index_i ("0a");
+    int i = str.index ("0a");
     while (i >= 0)
       {
         str[i] = '\n';
         str[i + 1] = '\t';
-       i = str.index_i ("0a");
+       i = str.index ("0a");
       }
     }
-
-  *os_p_ << str;
+  else
+    {
+      Byte * b = str.get_bytes ();
+      for (int sz = str.length (); sz--;)
+       {
+         fputc (*b, out_file_);
+         b++;
+       }
+    }
+  
   return *this;
 }
 
@@ -60,7 +75,7 @@ Midi_stream&
 Midi_stream::operator << (int i)
 {
   // output binary string ourselves
-  *this << Midi_item::i2varint_str (i);
+  *this << Midi_item::i2varint_string (i);
   return *this;
 }