X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-stream.cc;h=d0f853109468727e0d038adeb1fb2a5194f4ad36;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c7a48ad706d1ee04456b214e7bf65f7e6ac34b18;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index c7a48ad706..d0f8531094 100644
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,11 +27,10 @@ using namespace std;
 #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)
+Midi_stream::Midi_stream (const string &file_name)
 {
   file_name_string_ = file_name;
   out_file_ = fopen (file_name.c_str (), "wb");
@@ -45,14 +44,14 @@ Midi_stream::~Midi_stream ()
 }
 
 void
-Midi_stream::write (string str)
+Midi_stream::write (const string &str)
 {
   size_t sz = sizeof (Byte);
   size_t n = str.length ();
   size_t written = fwrite (str.data (), sz, n, out_file_);
 
   if (written != sz * n)
-    warning (_f ("cannot write to file: `%s'", str.data ()));
+    warning (_f ("cannot write to file: `%s'", file_name_string_.c_str ()));
 }
 
 void