release: 0.1.13

[lilypond.git] / lily / lyric-performer.cc

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index e623e5881cb5d9cb5898fb9bababb7703882151d..f55844044c4db3bf140d6e69066c635ca7951d51 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -9,12 +9,12 @@
 #include "lyric-performer.hh"
 #include "text-def.hh"
 #include "musical-request.hh"
-#include "midi-item.hh"
+#include "audio-item.hh"
 
 
 
 IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_PERFORMER(Lyric_performer);
+ADD_THIS_TRANSLATOR(Lyric_performer);
 
 Lyric_performer::Lyric_performer()
 {
@@ -28,30 +28,27 @@ void
 Lyric_performer::do_print() const
 {
 #ifndef NPRINT
-    if ( lreq_arr_.size() )
-       lreq_arr_[ 0 ]->print();
+  if (lreq_arr_.size())
+       lreq_arr_[ 0 ]->print();
 #endif
 }
 
 void
-Lyric_performer::process_requests()
+Lyric_performer::do_process_requests()
 {
-    if ( lreq_arr_.size() ) {
-       Midi_text t( Midi_text::LYRIC, lreq_arr_[ 0 ]->tdef_p_->text_str_ );
-       play_event( &t );
-    }
-
-    lreq_arr_.clear();
+  if (lreq_arr_.size() && lreq_arr_[ 0 ]->tdef_p_->text_str_.length_i())
+       play (new Audio_text (Audio_text::LYRIC, lreq_arr_[ 0 ]->tdef_p_->text_str_));
+  lreq_arr_.clear();
 }
 
 bool
-Lyric_performer::do_try_request( Request* req_l )
+Lyric_performer::do_try_request (Request* req_l)
 {
-    Musical_req* m_l = req_l->musical();
-    if ( !m_l || ! m_l->lreq_l() ) 
+  Musical_req* m_l = req_l->musical();
+  if (!m_l || ! m_l->lreq_l()) 
        return false;
-    lreq_arr_.push( m_l->lreq_l() );
+  lreq_arr_.push (m_l->lreq_l());
 
-    return true;
+  return true;
 }