release: 0.0.46.jcn1

[lilypond.git] / lily / staff-walker.cc

diff --git a/lily/staff-walker.cc b/lily/staff-walker.cc
index 74c18f3b18f274fb27dcc8e94cd16cb160f61ef2..ea37d9d63eaf2ce87b43e422784eb3f0677e15a9 100644 (file)
--- a/lily/staff-walker.cc
+++ b/lily/staff-walker.cc
@@ -10,13 +10,13 @@
 #include "plist.hh"
 #include "grouping.hh"
 #include "staff.hh"
-#include "musicalrequest.hh"
+#include "musical-request.hh"
 #include "staff-walker.hh"
 #include "staff-column.hh"
 #include "score-column.hh"
 #include "debug.hh"
 #include "time-description.hh"
-#include "commandrequest.hh"
+#include "command-request.hh"
 #include "grouping.hh"
 #include "score-walker.hh"
 
@@ -57,7 +57,11 @@ Staff_walker::process_timing_reqs()
        if (tr_l->meterchange()) {
            int b_i=tr_l->meterchange()->beats_i_;
            int o_i = tr_l->meterchange()->one_beat_i_;
-           time_.set_meter(b_i, o_i);
+           if (! time_.allow_meter_change_b() )
+               
+                       tr_l->warning("Meterchange should be at start of measure");
+           else
+               time_.set_meter(b_i, o_i);
                        
            *default_grouping = Rhythmic_grouping(
                MInterval(0,Moment(b_i, o_i)), b_i);
@@ -69,7 +73,7 @@ Staff_walker::process_timing_reqs()
        if (tr_l->partial()) {
            time_.setpartial(tr_l->partial()->duration_);
        } else if (tr_l->barcheck() && time_.whole_in_measure_) {
-           warning( "Barcheck failed", tr_l->defined_ch_c_l_ );
+           tr_l ->warning( "Barcheck failed");
        } else if (tr_l->cadenza()) {
            time_.set_cadenza(tr_l->cadenza()->on_b_);
        } else if (tr_l->measuregrouping()) {