* lily/grob.cc (mark_smob): mark \layout block from Grob::mark_smob().

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

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index d5dd3087494ad3a9f5401dcfceb76b2dc6b6e7f8..0112fdb73f67c09995cbcbb56b2111fc8c22eb15 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -3,24 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "midi-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 "warn.hh"
 #include "scm-option.hh"
 
-Midi_stream::Midi_stream (String filename)
+Midi_stream::Midi_stream (String file_name)
 {
-  filename_string_ = filename;
-  out_file_ = fopen (filename.to_str0(), "wb");
+  file_name_string_ = file_name;
+  out_file_ = fopen (file_name.to_str0 (), "wb");
 }
 
 Midi_stream::~Midi_stream ()
@@ -28,7 +27,7 @@ Midi_stream::~Midi_stream ()
   fclose (out_file_);
 }
 
-Midi_stream&
+Midi_stream &
 Midi_stream::operator << (String str)
 {
   size_t sz = sizeof (Byte);
@@ -37,13 +36,13 @@ Midi_stream::operator << (String str)
                           sz, n, out_file_);
 
   if (written != sz * n)
-    warning ("Could not write file. Disk full?");
+    warning (_ ("could not write file: `%s'"));
 
   return *this;
 }
 
-Midi_stream&
-Midi_stream::operator << (Midi_item const& midi_c_r)
+Midi_stream &
+Midi_stream::operator << (Midi_item const &midi_c_r)
 {
   String str = midi_c_r.to_string ();