comparison view/ViewManager.cpp @ 804:5c4a405a70fc tony_integration

Merge from branch "tonioni"
author Chris Cannam
date Tue, 17 Jun 2014 12:55:18 +0100
parents c58569bd952e
children 40c6c9344ff6
comparison
equal deleted inserted replaced
803:5d2966b7c201 804:5c4a405a70fc
552 emit globalCentreFrameChanged(f); 552 emit globalCentreFrameChanged(f);
553 } else { 553 } else {
554 if (v) emit viewCentreFrameChanged(v, f); 554 if (v) emit viewCentreFrameChanged(v, f);
555 } 555 }
556 556
557 if (!dynamic_cast<Overview *>(v) || (mode != PlaybackIgnore)) { 557 if (!dynamic_cast<Overview *>(v) || (mode == PlaybackScrollContinuous)) {
558 if (m_mainModelSampleRate != 0) { 558 if (m_mainModelSampleRate != 0) {
559 emit activity(tr("Scroll to %1") 559 emit activity(tr("Scroll to %1")
560 .arg(RealTime::frame2RealTime 560 .arg(RealTime::frame2RealTime
561 (f, m_mainModelSampleRate).toText().c_str())); 561 (f, m_mainModelSampleRate).toText().c_str()));
562 } 562 }
563 } 563 }
564 564
565 if (mode == PlaybackIgnore) { 565 if (mode != PlaybackScrollContinuous) {
566 return; 566 return;
567 } 567 }
568 568
569 seek(f); 569 seek(f);
570 } 570 }