comparison layer/WaveformLayer.cpp @ 1051:c02c51ae5238 3.0-plus-imaf

Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf
author Chris Cannam
date Wed, 20 Apr 2016 12:06:28 +0100
parents 2adca8f05583 97ea68f62c1f
children
comparison
equal deleted inserted replaced
1050:3691af49291c 1051:c02c51ae5238
976 976
977 RealTime rt0 = RealTime::frame2RealTime(f0, m_model->getSampleRate()); 977 RealTime rt0 = RealTime::frame2RealTime(f0, m_model->getSampleRate());
978 RealTime rt1 = RealTime::frame2RealTime(f1, m_model->getSampleRate()); 978 RealTime rt1 = RealTime::frame2RealTime(f1, m_model->getSampleRate());
979 979
980 if (f1 != f0 + 1 && (rt0.sec != rt1.sec || rt0.msec() != rt1.msec())) { 980 if (f1 != f0 + 1 && (rt0.sec != rt1.sec || rt0.msec() != rt1.msec())) {
981 text += tr("Time:\t%1 - %2") 981 text += tr("Time:\t%1 - %2")
982 .arg(rt0.toText(true).c_str()) 982 .arg(rt0.toText(true).c_str())
983 .arg(rt1.toText(true).c_str()); 983 .arg(rt1.toText(true).c_str());
984 } else { 984 } else {
985 text += tr("Time:\t%1") 985 text += tr("Time:\t%1")
986 .arg(rt0.toText(true).c_str()); 986 .arg(rt0.toText(true).c_str());
987 } 987 }
988 988
989 int channels = 0, minChannel = 0, maxChannel = 0; 989 int channels = 0, minChannel = 0, maxChannel = 0;
990 bool mergingChannels = false, mixingChannels = false; 990 bool mergingChannels = false, mixingChannels = false;