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

Merge branch 'master' of invent.kde.org:multimedia/kdenlive

parents 2b28cbe0 1b3a4f7b
Pipeline #122513 passed with stage
in 9 minutes and 11 seconds
......@@ -116,7 +116,7 @@ ProjectClip::ProjectClip(const QString &id, const QIcon &thumb, const std::share
// Generate clip thumbnail
ClipLoadTask::start({ObjectType::BinClip,m_binId.toInt()}, QDomElement(), true, -1, -1, this);
// Generate audio thumbnail
if (m_clipType == ClipType::AV || m_clipType == ClipType::Audio || m_clipType == ClipType::Playlist || m_clipType == ClipType::Unknown) {
if (KdenliveSettings::audiothumbnails() && (m_clipType == ClipType::AV || m_clipType == ClipType::Audio || m_clipType == ClipType::Playlist || m_clipType == ClipType::Unknown)) {
AudioLevelsTask::start({ObjectType::BinClip, m_binId.toInt()}, this, false);
}
}
......@@ -542,7 +542,7 @@ bool ProjectClip::setProducer(std::shared_ptr<Mlt::Producer> producer)
getFileHash();
// set parent again (some info need to be stored in producer)
updateParent(parentItem().lock());
if (m_clipType == ClipType::AV || m_clipType == ClipType::Audio || m_clipType == ClipType::Playlist || m_clipType == ClipType::Unknown) {
if (KdenliveSettings::audiothumbnails() && (m_clipType == ClipType::AV || m_clipType == ClipType::Audio || m_clipType == ClipType::Playlist || m_clipType == ClipType::Unknown)) {
AudioLevelsTask::start({ObjectType::BinClip, m_binId.toInt()}, this, false);
}
pCore->bin()->reloadMonitorIfActive(clipId());
......
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