From: fred <fred>
Date: Tue, 25 Feb 1997 00:05:39 +0000 (+0000)
Subject: lilypond-0.0.35
X-Git-Tag: release/1.5.59~6296
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b4b858c61fbb5ae5c9db3a21b2078fd2cca4630a;p=lilypond.git

lilypond-0.0.35
---

diff --git a/hdr/clefreg.hh b/hdr/clefreg.hh
index ff9e5903a7..8f9e25042c 100644
--- a/hdr/clefreg.hh
+++ b/hdr/clefreg.hh
@@ -20,7 +20,7 @@ public:
     /* ************** */
     virtual void process_request();
     virtual void do_pre_move_process();
-    virtual bool try_request(Nonmusical_req*);
+    virtual bool try_request(Request*);
     Clef_register(Complex_walker*);
     void read_req(Clef_change_req*);
     bool set_type(String);
diff --git a/src/clefreg.cc b/src/clefreg.cc
index 81c87e953a..ed6f78073b 100644
--- a/src/clefreg.cc
+++ b/src/clefreg.cc
@@ -13,7 +13,7 @@
 #include "commandrequest.hh"
 #include "timedescription.hh"
 #include "complexwalker.hh"
-#include "stcol.hh"
+#include "staffcolumn.hh"
 
 Clef_register::Clef_register(Complex_walker*w)
     : Request_register(w)
@@ -48,14 +48,16 @@ Clef_register::read_req(Clef_change_req*c_l)
 }
 
 bool
-Clef_register::try_request(Nonmusical_req* r_l)
+Clef_register::try_request(Request * r_l)
 {
-    if (!r_l->clefchange())
+    
+    Command_req* creq_l= r_l->command();
+    if (!creq_l || !creq_l->clefchange())
 	return false;
 
-    accepted_req_arr_.push(r_l);
+    accepted_req_arr_.push(creq_l);
     // do it now! Others have to read c0_pos.
-    read_req(r_l->clefchange()); 
+    read_req(creq_l->clefchange()); 
     return true;
 }