From: fred <fred>
Date: Sun, 24 Mar 2002 19:52:14 +0000 (+0000)
Subject: lilypond-0.0.77.jcn1
X-Git-Tag: release/1.5.59~4207
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=72a4a76ea68f966311afcab673331abb2f2b84bb;p=lilypond.git

lilypond-0.0.77.jcn1
---

diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index a8a7b2c236..64e7a17ae0 100644
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -101,9 +101,8 @@ IImenuetto = \melodic{
 }
 
 \score{
-	% huh? how to set id_str
 	\melodic{ 
-		\id "Staff" "Cello"; \IImenuetto 
+		\id "Staff" "cello"; \IImenuetto 
 	}
 	\paper{
 		unitspace= 9.0\mm  ;% to get lily to use only three lines
diff --git a/lily/include/key-performer.hh b/lily/include/key-performer.hh
index b2612147f0..a14c19cc56 100644
--- a/lily/include/key-performer.hh
+++ b/lily/include/key-performer.hh
@@ -20,7 +20,7 @@ public:
 
 protected:
     void do_print() const;
-    virtual bool try_request( Request* req_l );
+    virtual bool do_try_request( Request* req_l );
     virtual void process_requests();
 
 private:
diff --git a/lily/include/lyric-performer.hh b/lily/include/lyric-performer.hh
index e9bd22a2ee..cd07a96fde 100644
--- a/lily/include/lyric-performer.hh
+++ b/lily/include/lyric-performer.hh
@@ -22,7 +22,7 @@ public:
 
 protected:
     void do_print() const;
-    virtual bool try_request( Request* req_l );
+    virtual bool do_try_request( Request* req_l );
     virtual void process_requests();
 
 private:
diff --git a/lily/include/meter-performer.hh b/lily/include/meter-performer.hh
index 13cbec5bd0..e72451d5b8 100644
--- a/lily/include/meter-performer.hh
+++ b/lily/include/meter-performer.hh
@@ -20,7 +20,7 @@ public:
 
 protected:
     void do_print() const;
-    virtual bool try_request( Request* req_l );
+    virtual bool do_try_request( Request* req_l );
     virtual void process_requests();
 
 private:
diff --git a/lily/include/note-performer.hh b/lily/include/note-performer.hh
index 0105fc4b35..cae7505685 100644
--- a/lily/include/note-performer.hh
+++ b/lily/include/note-performer.hh
@@ -20,25 +20,15 @@ public:
     Note_performer();
     ~Note_performer();
 
+protected:
     virtual void process_requests();
-    virtual bool /*do_*/try_request( Request *req_l ) ;
 
-protected:
+    virtual bool do_try_request( Request *req_l ) ;
     virtual void do_print() const;
 
-#if 0
-    virtual void /*do_*/process_requests();
-    virtual void /*do_*/pre_move_processing();
-    virtual void /*do_*/post_move_processing();
-#endif
-
 private:
     Melodic_req * note_req_l_;
-//    Rhythmic_req * note_req_l_;
-
-//    Melodic_req* current_l_;
     Moment off_mom_;
-//    Moment on_mom_;
 };
 
 #endif // NOTE_PERFORMER_HH
diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh
index aeba3222fe..b3a1239d5a 100644
--- a/lily/include/performer-group-performer.hh
+++ b/lily/include/performer-group-performer.hh
@@ -26,11 +26,13 @@ public:
     Performer_group_performer();
     ~Performer_group_performer();
 
-    bool is_bottom_performer_b() const;
-    virtual Performer_group_performer* find_performer_l( String name, String id );
-    
     virtual void add( Performer* perf_p );
-    virtual bool try_request( Request* req_l );
+    virtual void print()const { Performer::print() ; }
+    virtual Moment get_mom() const;
+    virtual bool do_try_request( Request* req_l );
+    virtual bool try_request(Request*r) { return Performer::try_request(r) ; }
+
+protected:
 
     virtual Translator* find_get_translator_l( String name, String id );
     virtual Translator* get_default_interpreter();
@@ -38,12 +40,14 @@ public:
     Translator * ancestor_l( int l = 1 );
     virtual int depth_i() const;
 
-    virtual Moment get_mom() const;
-
-    virtual void midi_output( Midi_stream* midi_stream_l );
     virtual void process_requests();
-    virtual void set_track( Midi_def* midi_l, int& track_i_r );
+    virtual void do_removal_processing();
+    virtual void do_creation_processing();
 
+    bool is_bottom_performer_b() const;
+    virtual Performer_group_performer* find_performer_l( String name, String id );
+    
+    virtual void do_print()const;
 private:
     Pointer_list<Performer*> perf_p_list_;
     
diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh
index 32f6572f34..f85c501915 100644
--- a/lily/include/staff-performer.hh
+++ b/lily/include/staff-performer.hh
@@ -21,16 +21,14 @@ public:
     String instrument_str();
 
 protected:
-    virtual void midi_output( Midi_stream* midi_stream_l_ );
     virtual void play_event( Midi_item* l );
-    virtual void set_track( Midi_def* midi_l, int& track_i_r );
+    virtual void do_removal_processing();
+    virtual void do_creation_processing();
 
 private:
     void header();
 
-    Midi_def* midi_l_;
     Moment midi_mom_;
-    int track_i_;
     Midi_track* midi_track_p_;
 };
 
diff --git a/lily/include/swallow-perf.hh b/lily/include/swallow-perf.hh
index 7c6ec8d4ae..eec24e9643 100644
--- a/lily/include/swallow-perf.hh
+++ b/lily/include/swallow-perf.hh
@@ -15,7 +15,8 @@
 class Swallow_performer : public Performer {
 public:
     NAME_MEMBERS();
-    virtual bool try_request (Request* ) { return true; }
+protected:
+    virtual bool do_try_request (Request* ) { return true; }
 };
 
 #endif // SWALLOW_PERF_HH
diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 0ed1f33afa..5e620ff7c9 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -11,7 +11,7 @@
 #include "midi-item.hh"
 
 
-IMPLEMENT_STATIC_NAME(Key_performer);
+
 IMPLEMENT_IS_TYPE_B1(Key_performer,Performer);
 ADD_THIS_PERFORMER(Key_performer);
 
@@ -49,7 +49,7 @@ Key_performer::process_requests()
 }
 
 bool
-Key_performer::try_request( Request* req_l )
+Key_performer::do_try_request( Request* req_l )
 {
     if ( key_req_l_ )
 	return false;
diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 81014b9d5d..e623e5881c 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -12,7 +12,7 @@
 #include "midi-item.hh"
 
 
-IMPLEMENT_STATIC_NAME(Lyric_performer);
+
 IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
 ADD_THIS_PERFORMER(Lyric_performer);
 
@@ -45,7 +45,7 @@ Lyric_performer::process_requests()
 }
 
 bool
-Lyric_performer::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() ) 
diff --git a/lily/meter-performer.cc b/lily/meter-performer.cc
index c04bf3bf56..ac5bb9f3b5 100644
--- a/lily/meter-performer.cc
+++ b/lily/meter-performer.cc
@@ -11,7 +11,7 @@
 #include "midi-item.hh"
 
 
-IMPLEMENT_STATIC_NAME(Meter_performer);
+
 IMPLEMENT_IS_TYPE_B1(Meter_performer,Performer);
 ADD_THIS_PERFORMER(Meter_performer);
 
@@ -44,7 +44,7 @@ Meter_performer::process_requests()
 }
 
 bool
-Meter_performer::try_request( Request* req_l )
+Meter_performer::do_try_request( Request* req_l )
 {
     if ( meter_req_l_ )
 	return false;
diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 1543a56634..9caa676231 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -12,7 +12,7 @@
 #include "debug.hh"
 
 IMPLEMENT_IS_TYPE_B1(Note_performer,Performer);
-IMPLEMENT_STATIC_NAME(Note_performer);
+
 ADD_THIS_PERFORMER(Note_performer);
 
 Note_performer::Note_performer()
@@ -63,7 +63,7 @@ Note_performer::process_requests()
 }
 
 bool 
-Note_performer::try_request( Request* req_l )
+Note_performer::do_try_request( Request* req_l )
 {
     if ( note_req_l_ )
 	return false;
diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 1ffffd7ab0..b21bc5c45a 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -15,34 +15,45 @@
 #include "string.hh"
 #include "string-convert.hh"
 
-IMPLEMENT_STATIC_NAME(Staff_performer);
+
 IMPLEMENT_IS_TYPE_B1(Staff_performer,Performer_group_performer);
 ADD_THIS_PERFORMER(Staff_performer);
 
 Staff_performer::Staff_performer()
 {
     midi_mom_ = 0;
-    track_i_ = 0;
-    midi_track_p_ = 0;
+    midi_track_p_ = new Midi_track;
+}
+void
+Staff_performer::do_creation_processing()
+{
+    header();
+}
+
+void
+Staff_performer::do_removal_processing()
+{
+    Performer::play_event( midi_track_p_);
 }
 
 Staff_performer::~Staff_performer()
 {
-     delete midi_track_p_;
+    delete midi_track_p_;
 }
 
 void
 Staff_performer::header()
 {
     // set track name
-    Midi_text track_name( Midi_text::TRACK_NAME, "Track " + String_convert::i2dec_str( track_i_, 0, '0' ) );
+    Midi_text track_name( Midi_text::TRACK_NAME, instrument_str());
     midi_track_p_->add( Moment( 0 ), &track_name );
 
     // set instrument :-)
     Midi_text instrument_name( Midi_text::INSTRUMENT_NAME, instrument_str() );
     midi_track_p_->add( Moment( 0 ), &instrument_name );
 
-    Midi_tempo midi_tempo( midi_l_->get_tempo_i( Moment( 1, 4 ) ) );
+    
+    Midi_tempo midi_tempo( get_tempo_i(  ) );
     midi_track_p_->add( Moment( 0 ), &midi_tempo );
 }
 
@@ -52,28 +63,12 @@ Staff_performer::instrument_str()
     return Translator::id_str_; 
 }
 
-void
-Staff_performer::midi_output( Midi_stream* midi_stream_l )
-{
-    *mlog << "[" << track_i_ << "]";
-    *midi_stream_l << *midi_track_p_;
-}
-
 void 
 Staff_performer::play_event( Midi_item* l )
 {
     Moment mom = get_mom();
     Moment delta_t = mom - midi_mom_ ;
     midi_mom_ += delta_t;
-    midi_track_p_->add( delta_t, l );    
-}
-
-void
-Staff_performer::set_track( Midi_def* midi_l, int& track_i_r ) 
-{ 
-    midi_l_ = midi_l;
-    track_i_ = track_i_r++;
-    midi_track_p_ = new Midi_track( track_i_ );
-    header();
+    midi_track_p_->add( delta_t, l);
 }