lilypond-0.1.7

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 353f1f9b133b434b7aa30fcdf95b16e48d5a265a..0126c7b231d7c3bd4db3d364dd2da06f4b06cc28 100644 (file)
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -27,29 +27,20 @@ public:
     Performer();
     virtual ~Performer();
 
-    
     void print() const;
     virtual void process_requests();
 
-    virtual void set( Moment mom );
-    // <ugh>
-    virtual void set_track( int& track_i_r );
-    virtual int get_track_i() const;
-    // </ugh>
-
     virtual bool try_request( Request* req_l );
 
     virtual void do_removal_processing();
     void creation_processing();
+
 protected:
     virtual void do_creation_processing();
-
     virtual bool do_try_request(Request*);
     virtual int get_tempo_i() const;
     virtual void do_print() const;
-    virtual Moment get_mom() const;
-    virtual void play_event( Midi_item* l );
-
+    virtual void play( Audio_element * elem_p  );
 };
 
 #include "global-performers.hh"

diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh
index 95c8721da8f69bf927aa040e678d7a22813a9fe7..b73e9b9fe517d051519e93dc4ce96a7dcc5de375 100644 (file)
--- a/lily/include/staff-performer.hh
+++ b/lily/include/staff-performer.hh
@@ -21,21 +21,12 @@ public:
     String instrument_str();
 
 protected:
-    virtual void play_event( Midi_item* l );
+    virtual void play( Audio_element* p );
     virtual void do_removal_processing();
     virtual void do_creation_processing();
-    // <ugh>
-    virtual void set_track( int& track_i_r );
-    virtual int get_track_i() const;
-    // </ugh>
 
 private:
-    void header();
-
-    Moment midi_mom_;
-    Midi_track* midi_track_p_;
-
-    int track_i_;
+    Audio_staff* audio_staff_p_;
 };
 
 #endif // STAFF_PERFORMER_HH

diff --git a/lily/performer.cc b/lily/performer.cc
index 5e15fc53d6c97d737ba27f153212eaa36aa7dfa2..c1d84ca83b380be89a93bda7be1604105e855b02 100644 (file)
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -1,5 +1,7 @@
 /*
-  performer.cc -- declare Performer
+  performer.cc -- implement Performer
+
+  source file of the GNU LilyPond music typesetter
 
   (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
                  Jan Nieuwenhuizen <jan@digicash.com>
@@ -27,16 +29,10 @@ Performer::do_print() const
 {
 }
 
-Moment
-Performer::get_mom() const
-{
-    return daddy_perf_l_->get_mom();
-}
-
 void 
-Performer::play_event( Midi_item* l ) 
+Performer::play( Audio_element* p ) 
 { 
-    daddy_perf_l_->play_event( l ); 
+    daddy_perf_l_->play( p ); 
 }
 
 int
@@ -60,24 +56,6 @@ Performer::process_requests()
 {
 }
 
-void
-Performer::set( Moment )
-{
-} 
-
-//<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 )
 {
@@ -97,17 +75,11 @@ 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()
 {