From ef13416bfc43e51ef4e20919e0fab81ae05e0fe2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:14:51 -0600 Subject: Rename old tq methods that no longer need a unique name --- src/sequencer/main.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/sequencer/main.cpp') diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp index 4c10362..af3d9a3 100644 --- a/src/sequencer/main.cpp +++ b/src/sequencer/main.cpp @@ -131,21 +131,21 @@ int main(int argc, char *argv[]) // make sure the loop doesn't eat up all the // processor - we're not in that much of a rush! // - TransporttqStatus lastSeqtqStatus = roseSeq->gettqStatus(); + TransportStatus lastSeqStatus = roseSeq->getStatus(); RealTime sleepTime = RealTime(0, 10000000); - while (!_exiting && roseSeq && roseSeq->gettqStatus() != TQUIT) { + while (!_exiting && roseSeq && roseSeq->getStatus() != TQUIT) { bool atLeisure = true; - switch (roseSeq->gettqStatus()) { + switch (roseSeq->getStatus()) { case STARTING_TO_PLAY: if (!roseSeq->startPlaying()) { // send result failed and stop Sequencer - roseSeq->settqStatus(STOPPING); + roseSeq->setStatus(STOPPING); } else { - roseSeq->settqStatus(PLAYING); + roseSeq->setStatus(PLAYING); } break; @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) if (!roseSeq->keepPlaying()) { // there's a problem or the piece has // finished - so stop playing - roseSeq->settqStatus(STOPPING); + roseSeq->setStatus(STOPPING); } else { // process any async events // @@ -163,9 +163,9 @@ int main(int argc, char *argv[]) case STARTING_TO_RECORD: if (!roseSeq->startPlaying()) { - roseSeq->settqStatus(STOPPING); + roseSeq->setStatus(STOPPING); } else { - roseSeq->settqStatus(RECORDING); + roseSeq->setStatus(RECORDING); } break; @@ -173,7 +173,7 @@ int main(int argc, char *argv[]) if (!roseSeq->keepPlaying()) { // there's a problem or the piece has // finished - so stop playing - roseSeq->settqStatus(STOPPING); + roseSeq->setStatus(STOPPING); } else { // Now process any incoming MIDI events // and return them to the gui @@ -196,7 +196,7 @@ int main(int argc, char *argv[]) // There's no call to roseSeq to actually process the // stop, because this arises from a DCOP call from the GUI // direct to roseSeq to start with - roseSeq->settqStatus(STOPPED); + roseSeq->setStatus(STOPPED); SEQUENCER_DEBUG << "RosegardenSequencer - Stopped" << endl; break; @@ -226,10 +226,10 @@ int main(int argc, char *argv[]) // we want to process transport changes immediately if (roseSeq->checkExternalTransport()) { atLeisure = false; - } else if (lastSeqtqStatus != roseSeq->gettqStatus()) { - SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqtqStatus << " to " << roseSeq->gettqStatus() << endl; - roseSeq->notifySequencertqStatus(); - lastSeqtqStatus = roseSeq->gettqStatus(); + } else if (lastSeqStatus != roseSeq->getStatus()) { + SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqStatus << " to " << roseSeq->getStatus() << endl; + roseSeq->notifySequencerStatus(); + lastSeqStatus = roseSeq->getStatus(); atLeisure = false; } -- cgit v1.2.1