2003 -> 2004

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index f47aaa78d2b0e2ec95dd481b68789ef453f519d4..5ce6da278f67517387cee3748116b846e21a91fb 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <time.h>
@@ -19,7 +19,7 @@
 #include "audio-staff.hh"
 #include "performance.hh"
 #include "score.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
 #include "file-path.hh"
 #include "lily-version.hh"
 
@@ -110,8 +110,9 @@ Performance::output_header_track (Midi_stream& midi_stream)
   Midi_text at (&at_a);
   midi_track.add (Moment (0), &at);
 
-  
-  str = _f ("from musical definition: %s", origin_string_);
+
+  // TODO:
+  //  str = _f ("from musical definition: %s", origin_string_);
 
   Audio_text from_a (Audio_text::TEXT, str);
   Midi_text from (&from_a);
@@ -147,23 +148,15 @@ Performance::add_element (Audio_element *p)
 
 
 void
-Performance::process ()
+Performance::process (String out)
 {
-  String out = output_name_global;
   if (out == "-")
     out = "lelie.midi";
-  int def = midi_->get_next_score_count ();
-  if (def)
-    {
-      Path p = split_path (out);
-      p.base += "-" + to_string (def);
-      out = p.string ();
-    }
-
+  
   /* Maybe a bit crude, but we had this before */
   Path p = split_path (out);
   p.ext = "midi";
-  out = p.string ();
+  out = p.to_string ();
   
   Midi_stream midi_stream (out);
   progress_indication (_f ("MIDI output to `%s'...", out));