X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=95f956dea51ce5bb9a7367f07d41a7d6772b3eb9;hb=5287c2ed78ed3d434d67651896902f23a9b52eb1;hp=9b3365753c18d9e7fecdfa4c3944e1661b817c32;hpb=5f68ba5ca0edd64f0f6723e65c27993c2dfb1e96;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 9b3365753c..95f956dea5 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
@@ -14,51 +14,54 @@
 #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;
-#if __GCC__ > 2
-  os_p_ = open_file_stream (filename, ios::out|ios::bin);
-#else
-  os_p_ = open_file_stream (filename, ios::out|ios::binary);
-#endif
+  filename_string_ = filename;
+  os_ = open_file_stream (filename, std::ios::out|std::ios::binary);
 }
 
 Midi_stream::~Midi_stream ()
 {
-  close_file_stream (os_p_);
+  close_file_stream (os_);
 }
 
 Midi_stream&
 Midi_stream::operator << (String str)
 {
-  *os_p_ << str;
+  Byte * b = str.get_bytes ();
+  for (int sz = str.length (); sz--;)
+    *os_ << *b ++;
   return *this;
 }
 
 Midi_stream&
 Midi_stream::operator << (Midi_item const& midi_c_r)
 {
-  String str = midi_c_r.str ();
+  String str = midi_c_r.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--;)
+	*os_ << *b++;
+    }
+  
   return *this;
 }
 
@@ -66,7 +69,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;
 }