Fix rosegarden FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1250647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 2d59c280c1
commit 69c1fdb63e

@ -2001,7 +2001,7 @@ LilyPondExporter::writeBar(Segment *s,
if ((stringNum <= barreStart) && (stringNum >= barreEnd)) { if ((stringNum <= barreStart) && (stringNum >= barreEnd)) {
str << stringNum << "-" << barreFret << ";"; str << stringNum << "-" << barreFret << ";";
} else { } else {
str << stringNum << "-" << stringStatus << ";"; str << stringNum << "-" << stringtqStatus << ";";
} }
} }
} }

@ -330,13 +330,13 @@ ChordNameRuler::recalculate(timeT from, timeT to)
NOTATION_DEBUG << "ChordNameRuler::recalculate: overallStatus.from==overallStatus.to, ignoring" << endl; NOTATION_DEBUG << "ChordNameRuler::recalculate: overallStatus.from==overallStatus.to, ignoring" << endl;
level = RecalcNone; level = RecalcNone;
} else if (overalltqStatus.from() >= from && overalltqStatus.to() <= to) { } else if (overalltqStatus.from() >= from && overalltqStatus.to() <= to) {
NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl; NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl;
level = RecalcVisible; level = RecalcVisible;
} else if (overalltqStatus.from() >= to || overalltqStatus.to() <= from) { } else if (overalltqStatus.from() >= to || overalltqStatus.to() <= from) {
NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl; NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl;
level = RecalcNone; level = RecalcNone;
} else { } else {
NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl; NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl;
level = RecalcWhole; level = RecalcWhole;
} }
} }

@ -227,7 +227,7 @@ int main(int argc, char *argv[])
if (roseSeq->checkExternalTransport()) { if (roseSeq->checkExternalTransport()) {
atLeisure = false; atLeisure = false;
} else if (lastSeqtqStatus != roseSeq->gettqStatus()) { } else if (lastSeqtqStatus != roseSeq->gettqStatus()) {
SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqStatus << " to " << roseSeq->gettqStatus() << endl; SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqtqStatus << " to " << roseSeq->gettqStatus() << endl;
roseSeq->notifySequencertqStatus(); roseSeq->notifySequencertqStatus();
lastSeqtqStatus = roseSeq->gettqStatus(); lastSeqtqStatus = roseSeq->gettqStatus();
atLeisure = false; atLeisure = false;

Loading…
Cancel
Save