#include "kdenlivedoc.h"
#include "abstractclipitem.h"
#include "abstractgroupitem.h"
+#include "titledocument.h"
+#include "kthumb.h"
#include <mlt++/Mlt.h>
#include <kio/netaccess.h>
#include <QGraphicsItemGroup>
+#include <QtConcurrentRun>
#include <KFileMetaInfo>
ClipManager::ClipManager(KdenliveDoc *doc) :
- QObject(),
- m_audioThumbsQueue(),
- m_doc(doc),
- m_generatingAudioId()
+ QObject(),
+ m_audioThumbsQueue(),
+ m_doc(doc),
+ m_generatingAudioId(),
+ m_abortThumb(false),
+ m_closing(false)
{
m_clipIdCounter = 1;
m_folderIdCounter = 1;
connect(&m_fileWatcher, SIGNAL(deleted(const QString &)), this, SLOT(slotClipMissing(const QString &)));
connect(&m_fileWatcher, SIGNAL(created(const QString &)), this, SLOT(slotClipAvailable(const QString &)));
connect(&m_modifiedTimer, SIGNAL(timeout()), this, SLOT(slotProcessModifiedClips()));
+
+#if KDE_IS_VERSION(4,5,0)
+ KImageCache::deleteCache("kdenlive-thumbs");
+ pixmapCache = new KImageCache("kdenlive-thumbs", 1000000);
+ pixmapCache->setEvictionPolicy(KSharedDataCache::EvictOldest);
+#endif
}
ClipManager::~ClipManager()
{
- qDeleteAll(m_clipList);
- m_clipList.clear();
+ m_closing = true;
+ m_abortThumb = true;
+ m_thumbsThread.waitForFinished();
+ m_thumbsMutex.lock();
+ m_requestedThumbs.clear();
+ m_thumbsMutex.unlock();
m_audioThumbsQueue.clear();
m_generatingAudioId.clear();
+ m_thumbsMutex.lock();
+ m_requestedThumbs.clear();
+ m_thumbsMutex.unlock();
+ qDeleteAll(m_clipList);
+ m_clipList.clear();
+#if KDE_IS_VERSION(4,5,0)
+ delete pixmapCache;
+#endif
}
void ClipManager::clear()
{
+ m_abortThumb = true;
+ m_thumbsThread.waitForFinished();
+ m_thumbsMutex.lock();
+ m_requestedThumbs.clear();
+ m_thumbsMutex.unlock();
+ m_abortThumb = false;
+ m_folderList.clear();
+ m_audioThumbsQueue.clear();
+ m_modifiedClips.clear();
qDeleteAll(m_clipList);
m_clipList.clear();
m_clipIdCounter = 1;
m_folderIdCounter = 1;
- m_folderList.clear();
- m_audioThumbsQueue.clear();
- m_modifiedClips.clear();
+#if KDE_IS_VERSION(4,5,0)
+ pixmapCache->clear();
+#endif
+}
+
+void ClipManager::clearCache()
+{
+#if KDE_IS_VERSION(4,5,0)
+ pixmapCache->clear();
+#endif
+}
+
+void ClipManager::requestThumbs(const QString id, QList <int> frames)
+{
+ m_thumbsMutex.lock();
+ foreach (int frame, frames) {
+ m_requestedThumbs.insertMulti(id, frame);
+ }
+ m_thumbsMutex.unlock();
+ if (!m_thumbsThread.isRunning() && !m_abortThumb) {
+ m_thumbsThread = QtConcurrent::run(this, &ClipManager::slotGetThumbs);
+ }
+}
+
+void ClipManager::stopThumbs(const QString &id)
+{
+ if (m_requestedThumbs.isEmpty() || m_closing) return;
+ m_abortThumb = true;
+ m_thumbsThread.waitForFinished();
+ m_thumbsMutex.lock();
+ m_requestedThumbs.remove(id);
+ m_thumbsMutex.unlock();
+ m_abortThumb = false;
+ if (!m_thumbsThread.isRunning()) {
+ m_thumbsThread = QtConcurrent::run(this, &ClipManager::slotGetThumbs);
+ }
+}
+
+void ClipManager::slotGetThumbs()
+{
+ QMap<QString, int>::iterator i = m_requestedThumbs.begin();
+ while (i != m_requestedThumbs.end() && !m_abortThumb) {
+ QString producerId = i.key();
+ m_thumbsMutex.lock();
+ QList<int> values = m_requestedThumbs.values(producerId);
+ i = m_requestedThumbs.erase(i);
+ m_thumbsMutex.unlock();
+ qSort(values);
+ DocClipBase *clip = getClipById(producerId);
+ if (!clip) continue;
+ while (!values.isEmpty() && clip->thumbProducer() && !m_abortThumb) {
+ clip->thumbProducer()->getThumb(values.takeFirst());
+ }
+ }
}
void ClipManager::checkAudioThumbs()
{
QList <DocClipBase *> list;
QString clipResource;
+ QString proxyResource;
for (int i = 0; i < m_clipList.count(); i++) {
clipResource = m_clipList.at(i)->getProperty("resource");
+ proxyResource = m_clipList.at(i)->getProperty("proxy");
if (clipResource.isEmpty()) clipResource = m_clipList.at(i)->getProperty("colour");
- if (clipResource == resource) {
+ if (clipResource == resource || proxyResource == resource) {
list.append(m_clipList.at(i));
}
}
return list;
}
-void ClipManager::updatePreviewSettings()
-{
- for (int i = 0; i < m_clipList.count(); i++) {
- if (m_clipList.at(i)->clipType() == AV || m_clipList.at(i)->clipType() == VIDEO) {
- if (m_clipList.at(i)->producerProperty("meta.media.0.codec.name") && strcmp(m_clipList.at(i)->producerProperty("meta.media.0.codec.name"), "h264") == 0) {
- if (KdenliveSettings::dropbframes()) {
- m_clipList[i]->setProducerProperty("skip_loop_filter", "all");
- m_clipList[i]->setProducerProperty("skip_frame", "bidir");
- } else {
- m_clipList[i]->setProducerProperty("skip_loop_filter", "");
- m_clipList[i]->setProducerProperty("skip_frame", "");
- }
- }
- }
- }
-}
void ClipManager::clearUnusedProducers()
{
}
}
-void ClipManager::resetProducersList(const QList <Mlt::Producer *> prods)
+void ClipManager::resetProducersList(const QList <Mlt::Producer *> prods, bool displayRatioChanged, bool fpsChanged)
{
for (int i = 0; i < m_clipList.count(); i++) {
- if (m_clipList.at(i)->numReferences() > 0) {
- m_clipList.at(i)->clearProducers();
+ if (m_clipList.at(i)->numReferences() > 0 || displayRatioChanged || fpsChanged) {
+ m_clipList.at(i)->deleteProducers();
}
}
QString id;
for (int i = 0; i < prods.count(); i++) {
id = prods.at(i)->get("id");
- kDebug() << "// // // REPLACE CLIP: " << id;
if (id.contains('_')) id = id.section('_', 0, 0);
DocClipBase *clip = getClipById(id);
if (clip) {
- clip->setProducer(prods.at(i));
+ clip->setProducer(prods.at(i), false, true);
}
}
- emit checkAllClips();
+ emit checkAllClips(displayRatioChanged, fpsChanged);
}
-void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId)
+void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId)
{
QUndoCommand *addClips = new QUndoCommand();
- foreach(const KUrl &file, urls) {
+ foreach(const KUrl & file, urls) {
if (KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
if (!getClipByResource(file.path()).empty()) {
if (KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br />already exists in project, what do you want to do?", file.path()), i18n("Clip already exists")) == KMessageBox::Cancel)
if (type->name().startsWith("image/")) {
prod.setAttribute("type", (int) IMAGE);
prod.setAttribute("in", 0);
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+ prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()));
+ if (KdenliveSettings::autoimagetransparency()) prod.setAttribute("transparency", 1);
// Read EXIF metadata for JPEG
if (type->is("image/jpeg")) {
KFileMetaInfo metaInfo(file.path(), QString("image/jpeg"), KFileMetaInfo::TechnicalInfo);
const QHash<QString, KFileMetaInfoItem> metaInfoItems = metaInfo.items();
- foreach(const KFileMetaInfoItem& metaInfoItem, metaInfoItems) {
+ foreach(const KFileMetaInfoItem & metaInfoItem, metaInfoItems) {
prod.setAttribute("meta.attr." + metaInfoItem.name().section("#", 1), metaInfoItem.value().toString());
}
}
if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) {
txtfile.close();
prod.setAttribute("type", (int) TEXT);
- prod.setAttribute("xmldata", txtdoc.toString());
+ // extract embeded images
+ QDomNodeList items = txtdoc.elementsByTagName("content");
+ for (int i = 0; i < items.count() ; i++) {
+ QDomElement content = items.item(i).toElement();
+ if (content.hasAttribute("base64")) {
+ QString titlesFolder = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
+ QString path = TitleDocument::extractBase64Image(titlesFolder, content.attribute("base64"));
+ if (!path.isEmpty()) {
+ content.setAttribute("url", path);
+ content.removeAttribute("base64");
+ }
+ }
+ }
+ QString titleData = txtdoc.toString();
+ prod.setAttribute("xmldata", titleData);
prod.setAttribute("transparency", 1);
prod.setAttribute("in", 0);
int out = txtdoc.documentElement().attribute("out").toInt();
if (out > 0)
prod.setAttribute("out", out);
else
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+ prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()));
} else
txtfile.close();
}
}
}
-void ClipManager::slotAddClipFile(const KUrl url, const QString group, const QString &groupId)
+void ClipManager::slotAddClipFile(const KUrl &url, const QString &group, const QString &groupId)
{
slotAddClipList(KUrl::List(url), group, groupId);
}
-void ClipManager::slotAddXmlClipFile(const QString name, const QDomElement xml, const QString group, const QString &groupId)
+void ClipManager::slotAddXmlClipFile(const QString &name, const QDomElement &xml, const QString &group, const QString &groupId)
{
QDomDocument doc;
doc.appendChild(doc.importNode(xml, true));
m_doc->commandStack()->push(command);
}
-void ClipManager::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId)
+void ClipManager::slotAddColorClipFile(const QString &name, const QString &color, QString duration, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(duration) - 1);
+ prod.setAttribute("out", m_doc->getFramePos(duration));
prod.setAttribute("name", name);
if (!group.isEmpty()) {
prod.setAttribute("groupname", group);
m_doc->commandStack()->push(command);
}
-void ClipManager::slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, QString group, const QString &groupId)
+void ClipManager::slotAddSlideshowClipFile(const QString &name, const QString &path, int count, const QString &duration,
+ const bool loop, const bool crop, const bool fade,
+ const QString &luma_duration, const QString &luma_file, const int softness,
+ const QString &animation, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(duration) * count - 1);
+ prod.setAttribute("out", m_doc->getFramePos(duration) * count);
prod.setAttribute("ttl", m_doc->getFramePos(duration));
prod.setAttribute("luma_duration", m_doc->getFramePos(luma_duration));
prod.setAttribute("name", name);
prod.setAttribute("loop", loop);
+ prod.setAttribute("crop", crop);
prod.setAttribute("fade", fade);
prod.setAttribute("softness", QString::number(softness));
prod.setAttribute("luma_file", luma_file);
+ prod.setAttribute("animation", animation);
if (!group.isEmpty()) {
prod.setAttribute("groupname", group);
prod.setAttribute("groupid", groupId);
-void ClipManager::slotAddTextClipFile(const QString titleName, int out, const QString xml, const QString group, const QString &groupId)
+void ClipManager::slotAddTextClipFile(const QString &titleName, int out, const QString &xml, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
m_doc->commandStack()->push(command);
}
-void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl path, const QString group, const QString &groupId)
+void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl &path, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
out = titledoc.documentElement().attribute("out").toInt();
} else txtfile.close();
- if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration()) - 1;
+ if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration());
prod.setAttribute("out", out);
AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
projects / kdenlive / blobdiff