Commit d10c66c5 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch '2008'

parents 45c4e5e6 c7dc53a8
Pipeline #36683 passed with stage
in 13 minutes and 34 seconds
......@@ -292,6 +292,8 @@
</artifact>
</artifacts>
</release>
<release version="20.08.0" date="2020-08-13"/>
<release date="2020-04-15" version="20.07.70"/>
</releases>
<url type="homepage">https://kdenlive.org/</url>
<url type="bugtracker">https://bugs.kde.org</url>
......
......@@ -217,6 +217,7 @@ bool AudioThumbJob::computeWithFFMPEG()
} else if (offset > 250) {
intraOffset = offset / 10;
}
long maxAudioLevel = 1;
if (!m_successful) {
m_done = true;
......
......@@ -424,6 +424,19 @@ bool LoadJob::startJob()
m_errorMessage.append(i18n("ERROR: Could not load clip %1: producer is invalid", m_resource));
return false;
}
if (m_producer->get_length() == INT_MAX && m_producer->get("eof") == QLatin1String("loop")) {
// This is a live source or broken clip
m_done = true;
m_successful = false;
if (m_producer) {
m_producer.reset();
}
qDebug()<<"=== MAX DURATION: "<<INT_MAX<<", DURATION: "<<(INT_MAX / 25 / 60);
QMetaObject::invokeMethod(pCore.get(), "displayBinMessage", Qt::QueuedConnection, Q_ARG(QString, i18n("Cannot get duration for file %1", m_resource)),
Q_ARG(int, (int)KMessageWidget::Warning));
m_errorMessage.append(i18n("ERROR: Could not load clip %1: producer is invalid", m_resource));
return false;
}
processProducerProperties(m_producer, m_xml);
QString clipName = Xml::getXmlProperty(m_xml, QStringLiteral("kdenlive:clipname"));
if (clipName.isEmpty()) {
......
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