Run `make grand-replace'.

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 78070a064a39f8b57c640faca06fc8b0234c7a00..4fa167d8261f93c14fed3f63ff14116ccad1a6df 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performance.hh"
@@ -17,7 +17,7 @@ using namespace std;
 #include "international.hh"
 #include "lily-version.hh"
 #include "main.hh"
-#include "midi-item.hh"
+#include "midi-chunk.hh"
 #include "midi-stream.hh"
 #include "score.hh"
 #include "string-convert.hh"
@@ -38,11 +38,9 @@ Performance::output (Midi_stream &midi_stream) const
 {
   int tracks_ = audio_staffs_.size ();
 
-  // ugh
-  int clocks_per_4 = 384;
-
-  midi_stream << Midi_header (1, tracks_, clocks_per_4);
-  message (_ ("Track...") + " ");
+  midi_stream.write (Midi_header (1, tracks_, 384));
+  if (be_verbose_global)
+    progress_indication (_ ("Track...") + " ");
   
   int channel = 0;
   for (vsize i = 0; i < audio_staffs_.size (); i++)
@@ -96,7 +94,6 @@ Performance::write_output (string out) const
 
   /* Maybe a bit crude, but we had this before */
   File_name file_name (out);
-  file_name.ext_ = "midi";
   out = file_name.to_string ();
 
   Midi_stream midi_stream (out);
@@ -108,20 +105,12 @@ Performance::write_output (string out) const
 
 
 void
-Performance::remap_grace_durations ()
+Performance::process ()
 {
-  for (vsize i = 0; i < audio_elements_.size (); i++)
-    {
-      if (Audio_column * col = dynamic_cast<Audio_column*> (audio_elements_[i]))
-       {
-         col->when_.main_part_ = col->when_.main_part_ + Rational (1,4) * col->when_.grace_part_;
-         col->when_.grace_part_ = Rational (0);
-       }
-    }
 }
 
-void
-Performance::process ()
+Performance *
+unsmob_performance (SCM x)
 {
-  remap_grace_durations ();
+  return dynamic_cast<Performance*> (unsmob_music_output (x));
 }