Fix error message and missing audio thumbs with playlists

parent 6ea1f149
......@@ -274,8 +274,8 @@ bool AudioThumbJob::startJob()
m_successful = true;
return true;
}
bool ok = computeWithFFMPEG();
ok = ok || computeWithMlt();
bool ok = m_binClip->clipType() == ClipType::Playlist ? false : computeWithFFMPEG();
ok = ok ? ok : computeWithMlt();
Q_ASSERT(ok == m_done);
if (ok && m_done && !m_audioLevels.isEmpty()) {
......
......@@ -268,6 +268,10 @@ bool ClipModel::hasAudio() const
{
READ_LOCK();
QString service = getProperty("mlt_service");
if (service == QLatin1String("xml")) {
// Playlist clip, assume audio
return true;
}
return (service.contains(QStringLiteral("avformat")) || service == QLatin1String("timewarp")) && (getIntProperty(QStringLiteral("audio_index")) > -1);
}
......
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