X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=fa85fca91e8b8de0b25609941bbd951e8639d8b6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=246fc603e219bf51e1fd4cbc8ced5076394be65f;hpb=bdabe71a2bdda41b64c0000da6023771701f4def;p=lilypond.git

diff --git a/lily/performer.cc b/lily/performer.cc
index 246fc603e2..fa85fca91e 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,125 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
+#include "context.hh"
+#include "performer-group.hh"
+#include "warn.hh"
 
-#include "performer-group-performer.hh"
-#include "debug.hh"
 
-
-IMPLEMENT_IS_TYPE_B(Performer);
-
-Performer::Performer()
-{
-    daddy_perf_l_ = 0;
-    init_b_ =false;
-}
-
-Performer::~Performer()
+Performer_group *
+Performer::get_daddy_performer () const
 {
+  return
+    dynamic_cast<Performer_group *> (get_daddy_translator ());
 }
 
 void
-Performer::do_print() const
+Performer::acknowledge_audio_element (Audio_element_info)
 {
 }
 
-Moment
-Performer::get_mom() const
-{
-    return daddy_perf_l_->get_mom();
-}
-
-void 
-Performer::play( Audio_item* p ) 
-{ 
-    daddy_perf_l_->play( p ); 
-}
-
-void 
-Performer::play( Midi_item* l ) 
-{ 
-    daddy_perf_l_->play( l ); 
-}
-
-int
-Performer::get_tempo_i()const
-{
-    return daddy_perf_l_->get_tempo_i();
-}
-
-void
-Performer::print() const
-{
-#ifndef NPRINT
-    mtor << "\n" << name() << " {";
-    do_print();
-    mtor << "}";
-#endif
-}
-
 void
-Performer::process_requests()
+Performer::create_audio_elements ()
 {
 }
 
 void
-Performer::set( Moment )
+Performer::announce_element (Audio_element_info i)
 {
-} 
+  if (!i.origin_trans_)
+    i.origin_trans_ = this;
 
-//<ugh>
-int
-Performer::get_track_i() const
-{
-    return daddy_perf_l_->get_track_i();
-}
-
-void
-Performer::set_track( int& )
-{
-}
-//</ugh>
-
-bool 
-Performer::do_try_request( Request* req_l )
-{
-    return false;
-}
-
-bool
-Performer::try_request(Request*r)
-{
-    if (!init_b_) { 
-	creation_processing();
-    }
-    return do_try_request(r);
-}
-
-void
-Performer::creation_processing()
-{
-    if (!init_b_) { 
-/*	if ( daddy_perf_l_ ) {
-	    init_b_ = true;	// ugh. avoid recursion
-	    daddy_perf_l_->creation_processing();
-	    init_b_ = false;
-	}
-	
-	*/
-	do_creation_processing();
-	init_b_ = true;
-    }
-}
-void
-Performer::do_creation_processing()
-{
-}
-
-void
-Performer::do_removal_processing()
-{
+  get_daddy_performer ()->announce_element (i);
 }