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)
+ pixmapCache = new KImageCache("kdenlive-thumbs", 1000000);
+#endif
}
ClipManager::~ClipManager()
m_generatingAudioId.clear();
qDeleteAll(m_clipList);
m_clipList.clear();
+#if KDE_IS_VERSION(4,5,0)
+ delete pixmapCache;
+#endif
}
void ClipManager::clear()
m_clipList.clear();
m_clipIdCounter = 1;
m_folderIdCounter = 1;
+#if KDE_IS_VERSION(4,5,0)
+ pixmapCache->clear();
+#endif
}
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));
}
}
}
}
-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(true);
}
}
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)
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);
if (out > 0)
prod.setAttribute("out", out);
else
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1);
+ prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()));
} else
txtfile.close();
}
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);
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);
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);