(pango_item_string_stencil): put

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index 83a9b910480ab8616d7520943fa6d528176531c8..985901c01cac1466af0dbfde49288548b131f614 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -9,6 +9,7 @@
 #include "performance.hh"
 
 #include <ctime>
+using namespace std;
 
 #include "audio-column.hh"
 #include "audio-staff.hh"
@@ -26,12 +27,12 @@
 Performance::Performance ()
 {
   midi_ = 0;
-  audio_elem_p_list_ = 0;
+  audio_element_list_ = 0;
 }
 
 Performance::~Performance ()
 {
-  delete audio_elem_p_list_;
+  delete audio_element_list_;
 }
 
 void
@@ -128,7 +129,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.
@@ -143,14 +144,12 @@ void
 Performance::add_element (Audio_element *p)
 {
   if (Audio_staff *s = dynamic_cast<Audio_staff *> (p))
-    {
-      audio_staffs_.push (s);
-    }
-  audio_elem_p_list_ = new Killing_cons<Audio_element> (p, audio_elem_p_list_);
+    audio_staffs_.push (s);
+  audio_element_list_ = new Killing_cons<Audio_element> (p, audio_element_list_);
 }
 
-SCM
-Performance::process (String out)
+void
+Performance::write_output (String out)
 {
   if (out == "-")
     out = "lelie.midi";
@@ -165,5 +164,5 @@ Performance::process (String out)
 
   output (midi_stream);
   progress_indication ("\n");
-  return SCM_UNDEFINED;
 }
+