partial: 1.0.1.jcn

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

diff --git a/lily/meter-performer.cc b/lily/meter-performer.cc
index 812163e04a39fbc8662cd02df66c20257c031208..44849ab744b7813867e73cc1ffa6babdea77f2ba 100644 (file)
--- a/lily/meter-performer.cc
+++ b/lily/meter-performer.cc
@@ -3,19 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
 */
 
 #include "meter-performer.hh"
 #include "command-request.hh"
-#include "midi-item.hh"
+#include "audio-item.hh"
 
 IMPLEMENT_IS_TYPE_B1(Meter_performer,Performer);
-ADD_THIS_PERFORMER(Meter_performer);
+ADD_THIS_TRANSLATOR(Meter_performer);
 
 Meter_performer::Meter_performer()
 {
-    meter_req_l_ = 0;
+  meter_req_l_ = 0;
 }
 
 Meter_performer::~Meter_performer()
@@ -26,33 +26,31 @@ void
 Meter_performer::do_print() const
 {
 #ifndef NPRINT
-    if ( meter_req_l_ )
-       meter_req_l_->print();
+  if (meter_req_l_)
+    meter_req_l_->print();
 #endif
 }
 
 void
-Meter_performer::process_requests()
+Meter_performer::do_process_requests()
 {
-    if ( meter_req_l_ ) {
-       Midi_time m( meter_req_l_->beats_i_, meter_req_l_->one_beat_i_, 18 );
-       play_event( &m );
-       meter_req_l_ = 0;
-    }
+  if (meter_req_l_)
+    play (new Audio_meter (meter_req_l_));
+  meter_req_l_ = 0;
 }
 
 bool
-Meter_performer::do_try_request( Request* req_l )
+Meter_performer::do_try_request (Request* req_l)
 {
-    if ( meter_req_l_ )
-       return false;
+  if (meter_req_l_)
+    return false;
 
-    if ( req_l->command() )
-       meter_req_l_ = req_l->command()->meterchange();
+  if (req_l->command())
+    meter_req_l_ = req_l->command()->meterchange ();
 
-    if ( meter_req_l_ )
-       return true;
+  if (meter_req_l_)
+    return true;
 
-    return false;
+  return false;
 }