Cleanup & ensure clip monitor audio thumb is displayed even if timeline thumbnails is off

parent 0feea4d1
Pipeline #24028 passed with stage
in 23 minutes and 44 seconds
......@@ -206,11 +206,11 @@ QString ProjectClip::getXmlProperty(const QDomElement &producer, const QString &
void ProjectClip::updateAudioThumbnail()
{
audioThumbReady();
if (!KdenliveSettings::audiothumbnails()) {
return;
}
m_audioThumbCreated = true;
audioThumbReady();
updateTimelineClips({TimelineModel::ReloadThumbRole});
}
......
......@@ -353,9 +353,16 @@ bool AudioThumbJob::startJob()
}
m_done = false;
bool ok = m_binClip->clipType() == ClipType::Playlist ? (KdenliveSettings::audiothumbnails() ? false : true) : computeWithFFMPEG();
if (!m_done) {
ok = ok ? ok : computeWithMlt();
bool ok = false;
if (m_binClip->clipType() == ClipType::Playlist) {
if (KdenliveSettings::audiothumbnails()) {
ok = computeWithMlt();
}
} else {
ok = computeWithFFMPEG();
if (!ok && KdenliveSettings::audiothumbnails()) {
ok = computeWithMlt();
}
}
Q_ASSERT(ok == m_done);
if (!m_successful) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment