X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=f765a3193772b021c0bcda98209810b2f676753e;hb=d929a664c85112ffecaa16c5e114d6f75cf002e2;hp=bee85fb5f95a8e7c0d26e5aec9c47302fa7dd0ca;hpb=4b7fe583960d3db4c42b149d796972712fb5d9cb;p=lilypond.git

diff --git a/lily/performance.cc b/lily/performance.cc
index bee85fb5f9..f765a31937 100644
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -3,41 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <time.h>
-#include "warn.hh"
-#include "string.hh"
-#include "string-convert.hh"
+#include "performance.hh"
+
+#include <ctime>
+using namespace std;
+
+#include "audio-column.hh"
+#include "audio-staff.hh"
+#include "file-name.hh"
+#include "international.hh"
+#include "lily-version.hh"
 #include "main.hh"
-#include "midi-def.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
-#include "audio-column.hh"
-#include "audio-item.hh"
-#include "audio-staff.hh"
-#include "performance.hh"
 #include "score.hh"
-#include "file-path.hh"
-#include "lily-version.hh"
-
-#include "killing-cons.tcc"
+#include "string-convert.hh"
+#include "warn.hh"
 
 Performance::Performance ()
 {
-  midi_ =0;
-  audio_elem_p_list_ = 0;
+  midi_ = 0;
 }
 
-
 Performance::~Performance ()
 {
-  delete audio_elem_p_list_;
+  junk_pointers (audio_elements_);
 }
 
 void
-Performance::output (Midi_stream& midi_stream)
+Performance::output (Midi_stream &midi_stream)
 {
   int tracks_i = audio_staffs_.size () + 1;
 
@@ -46,58 +43,58 @@ Performance::output (Midi_stream& midi_stream)
 
   midi_stream << Midi_header (1, tracks_i, clocks_per_4_i);
   output_header_track (midi_stream);
-  progress_indication ("\n");
-  progress_indication (_ ("Track ... "));
+  message (_ ("Track...") + " ");
   int channel = 0;
-  for (int i =0; i < audio_staffs_.size (); i++)
+  for (vsize i = 0; i < audio_staffs_.size (); i++)
     {
       Audio_staff *s = audio_staffs_[i];
-      if (verbose_global_b)
-	progress_indication ("[" + to_string (i)) ;
+      if (be_verbose_global)
+	progress_indication ("[" + to_string (i));
 
       /*
 	MIDI players tend to ignore instrument settings on
 	channel 10, the percussion channel by default.
-       */
+      */
       if (channel % 16 == 9)
-	 channel++;
-
+	channel++;
 
       /*
 	Huh? Why does each staff also have a separate channel? We
 	should map channels to voices, not staves. --hwn.
-	*/
+      */
       if (s->channel_ < 0)
 	{
 	  s->channel_ = channel % 16;
 	  if (channel > 15)
-	    warning ("MIDI channel wrapped around. Remapping modulo 16.");
+	    {
+	      warning (_ ("MIDI channel wrapped around"));
+	      warning (_ ("remapping modulo 16"));
+	    }
 	}
-      
+
       s->output (midi_stream, channel++);
-      if (verbose_global_b)
+      if (be_verbose_global)
 	progress_indication ("]");
     }
 }
 
-
 void
-Performance::output_header_track (Midi_stream& midi_stream)
+Performance::output_header_track (Midi_stream &midi_stream)
 {
   Midi_track midi_track;
 
   midi_track.channel_ = 9;
 
   // perhaps multiple text events?
-  String id_string;
-  String str = String (_ ("Creator: "));
+  string id_string;
+  string str = string (_ ("Creator: "));
   id_string = String_convert::pad_to (gnu_lilypond_version_string (), 30);
   str += id_string;
 
   /*
     This seems silly, but in fact the audio elements should
     be generated elsewhere: not midi-specific.
-   */
+  */
   Audio_text creator_a (Audio_text::TEXT, str);
   Midi_text creator (&creator_a);
   midi_track.add (Moment (0), &creator);
@@ -105,22 +102,21 @@ Performance::output_header_track (Midi_stream& midi_stream)
   /* Better not translate this */
   str = "Generated automatically by: ";
   str += id_string;
-  
+
   Audio_text generate_a (Audio_text::TEXT, str);
   Midi_text generate (&generate_a);
   midi_track.add (Moment (0), &generate);
-  
+
   str = _ ("at ");
   time_t t (time (0));
   str += ctime (&t);
-  str = str.left_string (str.length () - 1);
+  str = str.substr (0, str.length () - 1);
   str = String_convert::pad_to (str, 60);
-  
+
   Audio_text at_a (Audio_text::TEXT, str);
   Midi_text at (&at_a);
   midi_track.add (Moment (0), &at);
 
-
   // TODO:
   //  str = _f ("from musical definition: %s", origin_string_);
 
@@ -131,7 +127,7 @@ Performance::output_header_track (Midi_stream& midi_stream)
   Audio_text track_name_a (Audio_text::TRACK_NAME, "Track "
 			   + String_convert::int2dec (0, 0, '0'));
   Midi_text track_name (&track_name_a);
-			
+
   midi_track.add (Moment (0), &track_name);
 
   // Some sequencers read track 0 last.
@@ -145,32 +141,27 @@ Performance::output_header_track (Midi_stream& midi_stream)
 void
 Performance::add_element (Audio_element *p)
 {
-  if (Audio_staff*s=dynamic_cast<Audio_staff *> (p)) 
-    {
-      audio_staffs_.push (s);
-    }
-  else if (Audio_column *c = dynamic_cast<Audio_column*> (p))
-    {
-      c->performance_ = this;
-    }
-  audio_elem_p_list_ = new Killing_cons<Audio_element> (p, audio_elem_p_list_);
+  if (Audio_staff *s = dynamic_cast<Audio_staff *> (p))
+    audio_staffs_.push_back (s);
+
+  audio_elements_.push_back (p);
 }
 
-SCM
-Performance::process (String out)
+void
+Performance::write_output (string out)
 {
   if (out == "-")
     out = "lelie.midi";
-  
+
   /* Maybe a bit crude, but we had this before */
-  Path p = split_path (out);
-  p.ext = "midi";
-  out = p.to_string ();
-  
+  File_name file_name (out);
+  file_name.ext_ = "midi";
+  out = file_name.to_string ();
+
   Midi_stream midi_stream (out);
-  progress_indication (_f ("MIDI output to `%s'...", out));
+  message (_f ("MIDI output to `%s'...", out));
 
   output (midi_stream);
   progress_indication ("\n");
-  return SCM_UNDEFINED;
 }
+