X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.cpp;h=d440b288c3eea7af452759857099b6dd41736ebd;hb=08a49ce40071207043020d0d8f3c804703ee7af8;hp=3b6f6b4f17225f0e81b4268d66e97ca1b5a19ac0;hpb=c24cb03154eece4a1213da57b6aa160100614f28;p=kdenlive diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index 3b6f6b4f..d440b288 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -29,27 +29,36 @@ #include #include +#include #include +#include #include #include +#include + ClipManager::ClipManager(KdenliveDoc *doc) : QObject(), m_audioThumbsQueue(), m_doc(doc), - m_audioThumbsEnabled(false), 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"; qDeleteAll(m_clipList); + m_clipList.clear(); + m_audioThumbsQueue.clear(); + m_generatingAudioId.clear(); } void ClipManager::clear() @@ -60,22 +69,25 @@ void ClipManager::clear() m_folderIdCounter = 1; m_folderList.clear(); m_audioThumbsQueue.clear(); + m_modifiedClips.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 +150,9 @@ QMap ClipManager::documentFolderList() const void ClipManager::addClip(DocClipBase *clip) { m_clipList.append(clip); - if (clip->clipType() == IMAGE || clip->clipType() == AUDIO) { + 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(); @@ -148,24 +161,32 @@ void ClipManager::addClip(DocClipBase *clip) if (!gid.isEmpty() && gid.toInt() >= m_folderIdCounter) m_folderIdCounter = gid.toInt() + 1; } -void ClipManager::slotDeleteClip(const QString &clipId) +void ClipManager::slotDeleteClips(QStringList ids) { - DocClipBase *clip = getClipById(clipId); - if (clip) { - AddClipCommand *command = new AddClipCommand(m_doc, clip->toXML(), clipId, false); - m_doc->commandStack()->push(command); + QUndoCommand *delClips = new QUndoCommand(); + delClips->setText(i18np("Delete clip", "Delete clips", ids.size())); + + for (int i = 0; i < ids.size(); i++) { + DocClipBase *clip = getClipById(ids.at(i)); + if (clip) { + new AddClipCommand(m_doc, clip->toXML(), ids.at(i), false, delClips); + } } + m_doc->commandStack()->push(delClips); } 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) { + 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; } } @@ -189,17 +210,18 @@ DocClipBase *ClipManager::getClipById(QString clipId) return NULL; } -DocClipBase *ClipManager::getClipByResource(QString resource) +const QList ClipManager::getClipByResource(QString resource) { + QList list; QString clipResource; for (int i = 0; i < m_clipList.count(); i++) { clipResource = m_clipList.at(i)->getProperty("resource"); if (clipResource.isEmpty()) clipResource = m_clipList.at(i)->getProperty("colour"); if (clipResource == resource) { - return m_clipList.at(i); + list.append(m_clipList.at(i)); } } - return NULL; + return list; } void ClipManager::updatePreviewSettings() @@ -226,21 +248,21 @@ void ClipManager::clearUnusedProducers() } } -void ClipManager::resetProducersList(QList prods) +void ClipManager::resetProducersList(const QList prods) { for (int i = 0; i < m_clipList.count(); i++) { if (m_clipList.at(i)->numReferences() > 0) { - m_clipList.at(i)->deleteProducers(); + m_clipList.at(i)->clearProducers(); } } 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)); - kDebug() << "// // // REPLACE CLIP: " << id; } } emit checkAllClips(); @@ -249,80 +271,83 @@ void ClipManager::resetProducersList(QList prods) 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) { 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); - } else if (type->name() == "application/x-kdenlivetitle") { + // 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"); QFile txtfile(file.path()); 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()); prod.setAttribute("transparency", 1); prod.setAttribute("in", 0); int out = txtdoc.documentElement().attribute("out").toInt(); - if (out > 0) prod.setAttribute("out", out); - } else txtfile.close(); + if (out > 0) + prod.setAttribute("out", out); + else + prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1); + } 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 txtfile.close(); - } AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true); m_doc->commandStack()->push(command); } @@ -398,14 +423,13 @@ void ClipManager::slotAddTextClipFile(const QString titleName, int out, const QS m_doc->commandStack()->push(command); } -void ClipManager::slotAddTextTemplateClip(QString titleName, const QString imagePath, 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"); doc.appendChild(prod); - prod.setAttribute("resource", imagePath); prod.setAttribute("name", titleName); - prod.setAttribute("xmltemplate", path.path()); + prod.setAttribute("resource", path.path()); uint id = m_clipIdCounter++; prod.setAttribute("id", QString::number(id)); if (!group.isEmpty()) { @@ -415,7 +439,18 @@ void ClipManager::slotAddTextTemplateClip(QString titleName, const QString image prod.setAttribute("type", (int) TEXT); prod.setAttribute("transparency", "1"); prod.setAttribute("in", "0"); - prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1); + + int out = 0; + QDomDocument titledoc; + QFile txtfile(path.path()); + if (txtfile.open(QIODevice::ReadOnly) && titledoc.setContent(&txtfile)) { + txtfile.close(); + out = titledoc.documentElement().attribute("out").toInt(); + } else txtfile.close(); + + if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration()) - 1; + prod.setAttribute("out", out); + AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true); m_doc->commandStack()->push(command); } @@ -495,8 +530,59 @@ QDomElement ClipManager::groupsXml() const void ClipManager::slotClipModified(const QString &path) { - //kDebug()<<"// CLIP: "<getId()); -} \ No newline at end of file + //kDebug() << "// CLIP: " << path << " WAS MODIFIED"; + const QList 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 availableClip(clip->getId()); + } +} + +int ClipManager::clipsCount() const +{ + return m_clipList.count(); +} + +