X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.cpp;h=d234abb20704bf1e72111198511302a1326ba686;hb=c60577adb3b7427f8a39acb35d6e7577b6c67130;hp=4f96ba185bcfac2aa78599c662bab0457e1b1a7f;hpb=8bcc799b522e6e5ae0299973b4d296bef831a17f;p=kdenlive diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index 4f96ba18..d234abb2 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -25,57 +25,70 @@ #include "kdenlivedoc.h" #include "abstractclipitem.h" #include "abstractgroupitem.h" +#include "titledocument.h" #include #include +#include #include +#include #include #include +#include + ClipManager::ClipManager(KdenliveDoc *doc) : - QObject(), - m_audioThumbsQueue(), - m_doc(doc), - m_audioThumbsEnabled(false), - m_generatingAudioId() + QObject(), + m_audioThumbsQueue(), + m_doc(doc), + m_generatingAudioId() { m_clipIdCounter = 1; m_folderIdCounter = 1; + m_modifiedTimer.setInterval(1500); connect(&m_fileWatcher, SIGNAL(dirty(const QString &)), this, SLOT(slotClipModified(const QString &))); + 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())); } ClipManager::~ClipManager() { - kDebug() << "\n\n 2222222222222222222222222 CLOSE CM 22222222222"; + m_audioThumbsQueue.clear(); + m_generatingAudioId.clear(); qDeleteAll(m_clipList); + m_clipList.clear(); } void ClipManager::clear() { + 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(); } void ClipManager::checkAudioThumbs() { - if (m_audioThumbsEnabled == KdenliveSettings::audiothumbnails()) return; - m_audioThumbsEnabled = KdenliveSettings::audiothumbnails(); - for (int i = 0; i < m_clipList.count(); i++) { - if (m_audioThumbsEnabled) m_audioThumbsQueue.append(m_clipList.at(i)->getId()); - else m_clipList.at(i)->slotClearAudioCache(); - } - if (m_audioThumbsEnabled) { - if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration(); - } else { + if (!KdenliveSettings::audiothumbnails()) { + if (!m_generatingAudioId.isEmpty()) { + DocClipBase *clip = getClipById(m_generatingAudioId); + if (clip) clip->slotClearAudioCache(); + } m_audioThumbsQueue.clear(); m_generatingAudioId.clear(); + return; + } + + for (int i = 0; i < m_clipList.count(); i++) { + m_audioThumbsQueue.append(m_clipList.at(i)->getId()); } + if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration(); } void ClipManager::askForAudioThumb(const QString &id) @@ -138,8 +151,9 @@ QMap ClipManager::documentFolderList() const void ClipManager::addClip(DocClipBase *clip) { m_clipList.append(clip); - if (clip->clipType() == IMAGE || clip->clipType() == AUDIO || (clip->clipType() == TEXT && !clip->fileURL().isEmpty())) { + if (clip->clipType() != COLOR && clip->clipType() != SLIDESHOW && !clip->fileURL().isEmpty()) { // listen for file change + //kDebug() << "// LISTEN FOR: " << clip->fileURL().path(); m_fileWatcher.addFile(clip->fileURL().path()); } const QString id = clip->getId(); @@ -166,11 +180,14 @@ void ClipManager::deleteClip(const QString &clipId) { for (int i = 0; i < m_clipList.count(); i++) { if (m_clipList.at(i)->getId() == clipId) { - if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO || (m_clipList.at(i)->clipType() == TEXT && !m_clipList.at(i)->fileURL().isEmpty())) { + if (m_clipList.at(i)->clipType() != COLOR && m_clipList.at(i)->clipType() != SLIDESHOW && !m_clipList.at(i)->fileURL().isEmpty()) { + //if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO || (m_clipList.at(i)->clipType() == TEXT && !m_clipList.at(i)->fileURL().isEmpty())) { // listen for file change m_fileWatcher.removeFile(m_clipList.at(i)->fileURL().path()); } - delete m_clipList.takeAt(i); + DocClipBase *clip = m_clipList.takeAt(i); + delete clip; + clip = NULL; break; } } @@ -208,22 +225,6 @@ const QList ClipManager::getClipByResource(QString resource) 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() { @@ -232,48 +233,60 @@ void ClipManager::clearUnusedProducers() } } -void ClipManager::resetProducersList(const QList prods) +void ClipManager::resetProducersList(const QList prods, bool displayRatioChanged) { for (int i = 0; i < m_clipList.count(); i++) { if (m_clipList.at(i)->numReferences() > 0) { - m_clipList.at(i)->clearProducers(); + 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)); } } - emit checkAllClips(); + emit checkAllClips(displayRatioChanged); } void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId) { QUndoCommand *addClips = new QUndoCommand(); - addClips->setText(i18n("Add clips")); - 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 %1
already exists in project, what do you want to do?", file.path()), i18n("Clip already exists")) == KMessageBox::Cancel) + continue; + } + kDebug() << "Adding clip: " << file.path(); QDomDocument doc; QDomElement prod = doc.createElement("producer"); doc.appendChild(prod); + prod.setAttribute("resource", file.path()); + uint id = m_clipIdCounter++; + prod.setAttribute("id", QString::number(id)); if (!group.isEmpty()) { prod.setAttribute("groupname", group); prod.setAttribute("groupid", groupId); } - prod.setAttribute("resource", file.path()); - uint id = m_clipIdCounter++; - prod.setAttribute("id", QString::number(id)); KMimeType::Ptr type = KMimeType::findByUrl(file); 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 metaInfoItems = metaInfo.items(); + foreach(const KFileMetaInfoItem & metaInfoItem, metaInfoItems) { + prod.setAttribute("meta.attr." + metaInfoItem.name().section("#", 1), metaInfoItem.value().toString()); + } + } } else if (type->is("application/x-kdenlivetitle")) { // opening a title file QDomDocument txtdoc("titledocument"); @@ -281,61 +294,62 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, co if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) { txtfile.close(); prod.setAttribute("type", (int) TEXT); - prod.setAttribute("resource", file.path()); - 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); - } else txtfile.close(); + if (out > 0) + prod.setAttribute("out", out); + else + prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration())); + } else + txtfile.close(); } new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true, addClips); } } - m_doc->commandStack()->push(addClips); + if (addClips->childCount() > 0) { + addClips->setText(i18np("Add clip", "Add clips", addClips->childCount())); + m_doc->commandStack()->push(addClips); + } } void ClipManager::slotAddClipFile(const KUrl url, const QString group, const QString &groupId) { - kDebug() << "///// CLIP MANAGER, ADDING CLIP: " << url; + slotAddClipList(KUrl::List(url), group, groupId); +} + +void ClipManager::slotAddXmlClipFile(const QString name, const QDomElement xml, const QString group, const QString &groupId) +{ QDomDocument doc; - QDomElement prod = doc.createElement("producer"); - doc.appendChild(prod); - prod.setAttribute("resource", url.path()); + doc.appendChild(doc.importNode(xml, true)); + QDomElement prod = doc.documentElement(); + prod.setAttribute("type", (int) PLAYLIST); uint id = m_clipIdCounter++; prod.setAttribute("id", QString::number(id)); + prod.setAttribute("name", name); if (!group.isEmpty()) { prod.setAttribute("groupname", group); prod.setAttribute("groupid", groupId); } - KMimeType::Ptr type = KMimeType::findByUrl(url); - if (type->name().startsWith("image/")) { - prod.setAttribute("type", (int) IMAGE); - prod.setAttribute("in", "0"); - prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1); - } else if (type->name() == "application/x-kdenlivetitle") { - // opening a title file - QDomDocument txtdoc("titledocument"); - QFile txtfile(url.path()); - if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) { - txtfile.close(); - prod.setAttribute("type", (int) TEXT); - prod.setAttribute("resource", QString()); - prod.setAttribute("xmldata", txtdoc.toString()); - GenTime outPos(txtdoc.documentElement().attribute("out").toDouble() / 1000.0); - prod.setAttribute("transparency", 1); - prod.setAttribute("in", 0); - int out = (int) outPos.frames(m_doc->fps()); - if (out > 0) prod.setAttribute("out", out); - else prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1); - } else txtfile.close(); - } AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true); m_doc->commandStack()->push(command); } - void ClipManager::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId) { QDomDocument doc; @@ -347,7 +361,7 @@ void ClipManager::slotAddColorClipFile(const QString name, const QString color, 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); @@ -357,7 +371,10 @@ void ClipManager::slotAddColorClipFile(const QString name, const QString color, 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, QString group, const QString &groupId) { QDomDocument doc; QDomElement prod = doc.createElement("producer"); @@ -367,14 +384,16 @@ void ClipManager::slotAddSlideshowClipFile(const QString name, const QString pat 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); @@ -432,7 +451,7 @@ void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl path, co 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); @@ -514,11 +533,53 @@ QDomElement ClipManager::groupsXml() const void ClipManager::slotClipModified(const QString &path) { - //kDebug()<<"// CLIP: "< list = getClipByResource(path); + for (int i = 0; i < list.count(); i++) { + DocClipBase *clip = list.at(i); + if (clip != NULL) { + QString id = clip->getId(); + if (!m_modifiedClips.contains(id)) + emit modifiedClip(id); + m_modifiedClips[id] = QTime::currentTime(); + } + } + if (!m_modifiedTimer.isActive()) m_modifiedTimer.start(); +} + +void ClipManager::slotProcessModifiedClips() +{ + if (!m_modifiedClips.isEmpty()) { + QMapIterator i(m_modifiedClips); + while (i.hasNext()) { + i.next(); + if (QTime::currentTime().msecsTo(i.value()) <= -1500) { + emit reloadClip(i.key()); + m_modifiedClips.remove(i.key()); + break; + } + } + } + if (m_modifiedClips.isEmpty()) m_modifiedTimer.stop(); +} + +void ClipManager::slotClipMissing(const QString &path) +{ + // kDebug() << "// CLIP: " << path << " WAS MISSING"; + const QList list = getClipByResource(path); + for (int i = 0; i < list.count(); i++) { + DocClipBase *clip = list.at(i); + if (clip != NULL) emit missingClip(clip->getId()); + } +} + +void ClipManager::slotClipAvailable(const QString &path) +{ + // kDebug() << "// CLIP: " << path << " WAS ADDED"; const QList list = getClipByResource(path); for (int i = 0; i < list.count(); i++) { DocClipBase *clip = list.at(i); - if (clip != NULL) emit reloadClip(clip->getId()); + if (clip != NULL) emit availableClip(clip->getId()); } }