X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Fmusical-request.cc;h=1ba4fd7801d1306efb1d05b8969528fa5198b736;hb=3f374e66968308461daa390a7aeed0b013bfe33d;hp=c7a848a18f071a584c703bb8ef188e05a6daf837;hpb=04cf544172e512b5799bc42c2109e34616f67b1c;p=lilypond.git diff --git a/lily/musical-request.cc b/lily/musical-request.cc index c7a848a18f..1ba4fd7801 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -65,12 +65,11 @@ Span_req::do_print() const Request::Request() { elt_l_ = 0; - defined_ch_C_ = 0; } Request::Request(Request const&src) + :Input(src) { elt_l_ = 0; - defined_ch_C_ = src.defined_ch_C_; } /* *************** */ Spacing_req::Spacing_req() @@ -115,8 +114,7 @@ Melodic_req::transpose(Melodic_req const & delta) } accidental_i_ += delta.accidental_i_; if (abs(accidental_i_) > 2) { - warning("transposition makes accidental larger than 2", - delta.defined_ch_C_); + delta.warning("transposition makes accidental larger than 2"); } } @@ -363,7 +361,7 @@ Request::voice_l() if (!elt_l_) return 0; else - return (Voice*)elt_l_->voice_l_; + return (Voice*)elt_l_->voice_C_; } /* *************** */