X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=72a7acbb02efca47c40fc75d49a5c10b130e9602;hb=a830589d50452bf5ba05da1273c57bcfa33985e9;hp=3ca48c99b7d2b5af156a5b6dd3e3d6b9860af396;hpb=37ae2ecef6f5c1c2e6643e83aa34213da0f5176b;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 3ca48c99..72a7acbb 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -66,6 +66,44 @@ #include #include #include +#include + +InvalidDialog::InvalidDialog(const QString &caption, const QString &message, bool infoOnly, QWidget *parent) : KDialog(parent) +{ + setCaption(caption); + if (infoOnly) setButtons(KDialog::Ok); + else setButtons(KDialog::Yes | KDialog::No); + QWidget *w = new QWidget(this); + QVBoxLayout *l = new QVBoxLayout; + l->addWidget(new QLabel(message)); + m_clipList = new QListWidget; + l->addWidget(m_clipList); + w->setLayout(l); + setMainWidget(w); +} + +InvalidDialog::~InvalidDialog() +{ + delete m_clipList; +} + + +void InvalidDialog::addClip(const QString &id, const QString &path) +{ + QListWidgetItem *item = new QListWidgetItem(path); + item->setData(Qt::UserRole, id); + m_clipList->addItem(item); +} + +QStringList InvalidDialog::getIds() const +{ + QStringList ids; + for (int i = 0; i < m_clipList->count(); i++) { + ids << m_clipList->item(i)->data(Qt::UserRole).toString(); + } + return ids; +} + ProjectList::ProjectList(QWidget *parent) : QWidget(parent), @@ -77,8 +115,9 @@ ProjectList::ProjectList(QWidget *parent) : m_transcodeAction(NULL), m_doc(NULL), m_refreshed(false), - m_infoQueue(), - m_thumbnailQueue() + m_thumbnailQueue(), + m_abortAllProxies(false), + m_invalidClipDialog(NULL) { QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); @@ -90,6 +129,10 @@ ProjectList::ProjectList(QWidget *parent) : QHBoxLayout *box = new QHBoxLayout; KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine; + m_refreshMonitorTimer.setSingleShot(true); + m_refreshMonitorTimer.setInterval(100); + connect(&m_refreshMonitorTimer, SIGNAL(timeout()), this, SLOT(slotRefreshMonitor())); + box->addWidget(searchView); //int s = style()->pixelMetric(QStyle::PM_SmallIconSize); //m_toolbar->setIconSize(QSize(s, s)); @@ -114,14 +157,10 @@ ProjectList::ProjectList(QWidget *parent) : setLayout(layout); searchView->setTreeWidget(m_listView); - m_proxyAction = new QAction(i18n("Proxy clip"), this); - m_proxyAction->setCheckable(true); - m_proxyAction->setChecked(false); - connect(m_proxyAction, SIGNAL(toggled(bool)), this, SLOT(slotProxyCurrentItem(bool))); connect(this, SIGNAL(processNextThumbnail()), this, SLOT(slotProcessNextThumbnail())); connect(m_listView, SIGNAL(projectModified()), this, SIGNAL(projectModified())); connect(m_listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected())); - connect(m_listView, SIGNAL(focusMonitor()), this, SLOT(slotClipSelected())); + connect(m_listView, SIGNAL(focusMonitor()), this, SIGNAL(raiseClipMonitor())); connect(m_listView, SIGNAL(pauseMonitor()), this, SLOT(slotPauseMonitor())); connect(m_listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *))); connect(m_listView, SIGNAL(addClip()), this, SLOT(slotAddClip())); @@ -145,6 +184,8 @@ ProjectList::ProjectList(QWidget *parent) : ProjectList::~ProjectList() { + m_abortAllProxies = true; + m_thumbnailQueue.clear(); delete m_menu; m_listView->blockSignals(true); m_listView->clear(); @@ -176,6 +217,10 @@ void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) m_reloadAction = actions.at(i); actions.removeAt(i); i--; + } else if (actions.at(i)->data().toString() == "proxy_clip") { + m_proxyAction = actions.at(i); + actions.removeAt(i); + i--; } } @@ -453,27 +498,33 @@ void ProjectList::slotReloadClip(const QString &id) continue; } item = static_cast (selected.at(i)); - if (item) { + if (item && !item->isProxyRunning()) { + DocClipBase *clip = item->referencedClip(); + if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) { + kDebug()<<"//// TRYING TO RELOAD: "<clipId()<<", but it is busy"; + continue; + } CLIPTYPE t = item->clipType(); if (t == TEXT) { - if (!item->referencedClip()->getProperty("xmltemplate").isEmpty()) + if (clip && !clip->getProperty("xmltemplate").isEmpty()) regenerateTemplate(item); - } else if (t != COLOR && t != SLIDESHOW && item->referencedClip() && item->referencedClip()->checkHash() == false) { + } else if (t != COLOR && t != SLIDESHOW && clip && clip->checkHash() == false) { item->referencedClip()->setPlaceHolder(true); item->setProperty("file_hash", QString()); } else if (t == IMAGE) { - item->referencedClip()->producer()->set("force_reload", 1); + clip->getProducer()->set("force_reload", 1); } QDomElement e = item->toXml(); // Make sure we get the correct producer length if it was adjusted in timeline if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) { - int length = QString(item->referencedClip()->producerProperty("length")).toInt(); + int length = QString(clip->producerProperty("length")).toInt(); if (length > 0 && !e.hasAttribute("length")) { e.setAttribute("length", length); } - } - emit getFileProperties(e, item->clipId(), m_listView->iconSize().height(), true, false); + } + resetThumbsProducer(clip); + m_render->getFileProperties(e, item->clipId(), m_listView->iconSize().height(), true); } } } @@ -500,12 +551,33 @@ void ProjectList::slotMissingClip(const QString &id) ProjectItem *item = getItemById(id); if (item) { item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled); + int height = m_listView->iconSize().height(); + int width = (int)(height * m_render->dar()); + QPixmap pixmap = qVariantValue(item->data(0, Qt::DecorationRole)); + if (pixmap.isNull()) { + pixmap = QPixmap(width, height); + pixmap.fill(Qt::transparent); + } + KIcon icon("dialog-close"); + QPainter p(&pixmap); + p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6)); + p.end(); + item->setData(0, Qt::DecorationRole, pixmap); if (item->referencedClip()) { item->referencedClip()->setPlaceHolder(true); - if (m_render == NULL) kDebug() << "********* ERROR, NULL RENDR"; - item->referencedClip()->setProducer(m_render->invalidProducer(id), true); + if (m_render == NULL) { + kDebug() << "********* ERROR, NULL RENDR"; + return; + } + Mlt::Producer *newProd = m_render->invalidProducer(id); + if (item->referencedClip()->getProducer()) { + Mlt::Properties props(newProd->get_properties()); + Mlt::Properties src_props(item->referencedClip()->getProducer()->get_properties()); + props.inherit(src_props); + } + item->referencedClip()->setProducer(newProd, true); item->slotSetToolTip(); - emit clipNeedsReload(id, true); + emit clipNeedsReload(id); } } update(); @@ -553,29 +625,31 @@ void ProjectList::setRenderer(Render *projectRender) void ProjectList::slotClipSelected() { - if (!m_listView->isEnabled()) return; - if (m_listView->currentItem()) { - if (m_listView->currentItem()->type() == PROJECTFOLDERTYPE) { + m_refreshMonitorTimer.stop(); + QTreeWidgetItem *item = m_listView->currentItem(); + ProjectItem *clip = NULL; + if (item) { + if (item->type() == PROJECTFOLDERTYPE) { emit clipSelected(NULL); - m_editButton->defaultAction()->setEnabled(m_listView->currentItem()->childCount() > 0); + m_editButton->defaultAction()->setEnabled(item->childCount() > 0); m_deleteButton->defaultAction()->setEnabled(true); m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); - m_proxyAction->setEnabled(false); } else { - ProjectItem *clip; - if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { + if (item->type() == PROJECTSUBCLIPTYPE) { // this is a sub item, use base clip m_deleteButton->defaultAction()->setEnabled(true); - clip = static_cast (m_listView->currentItem()->parent()); + clip = static_cast (item->parent()); if (clip == NULL) kDebug() << "-----------ERROR"; - SubProjectItem *sub = static_cast (m_listView->currentItem()); + SubProjectItem *sub = static_cast (item); emit clipSelected(clip->referencedClip(), sub->zone()); m_transcodeAction->setEnabled(false); + m_reloadAction->setEnabled(false); + adjustProxyActions(clip); return; } - clip = static_cast (m_listView->currentItem()); + clip = static_cast (item); if (clip && clip->referencedClip()) emit clipSelected(clip->referencedClip()); m_editButton->defaultAction()->setEnabled(true); @@ -604,11 +678,12 @@ void ProjectList::slotClipSelected() m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); } + adjustProxyActions(clip); } void ProjectList::adjustProxyActions(ProjectItem *clip) const { - if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) { + if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) { m_proxyAction->setEnabled(false); return; } @@ -770,6 +845,7 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { clip = static_cast (item->parent()); m_transcodeAction->setEnabled(false); + adjustProxyActions(clip); } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) { clip = static_cast (item); // Display relevant transcoding actions only @@ -856,7 +932,6 @@ void ProjectList::updateButtons() const m_openAction->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); - m_proxyAction->setEnabled(useProxy()); return; } else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) { @@ -885,11 +960,14 @@ void ProjectList::slotDeleteClip(const QString &clipId) kDebug() << "/// Cannot find clip to delete"; return; } + if (item->isProxyRunning()) m_abortProxy.append(item->referencedClip()->getProperty("proxy")); m_listView->blockSignals(true); QTreeWidgetItem *newSelectedItem = m_listView->itemAbove(item); if (!newSelectedItem) newSelectedItem = m_listView->itemBelow(item); delete item; + // Pause playing to prevent crash while deleting clip + slotPauseMonitor(); m_doc->clipManager()->deleteClip(clipId); m_listView->blockSignals(false); if (newSelectedItem) { @@ -972,7 +1050,7 @@ void ProjectList::deleteProjectFolder(QMap map) void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) { - m_listView->setEnabled(false); + //m_listView->setEnabled(false); const QString parent = clip->getProperty("groupid"); ProjectItem *item = NULL; monitorItemEditing(false); @@ -994,29 +1072,28 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) item = new ProjectItem(m_listView, clip); } if (item->data(0, DurationRole).isNull()) item->setData(0, DurationRole, i18n("Loading")); - connect(clip, SIGNAL(createProxy(const QString)), this, SLOT(slotCreateProxy(const QString))); - connect(clip, SIGNAL(abortProxy(const QString)), this, SLOT(slotAbortProxy(const QString))); + QString proxy = clip->getProperty("proxy"); + if (!proxy.isEmpty() && proxy != "-") slotCreateProxy(clip->getId()); + connect(clip, SIGNAL(createProxy(const QString &)), this, SLOT(slotCreateProxy(const QString &))); + connect(clip, SIGNAL(abortProxy(const QString &, const QString &)), this, SLOT(slotAbortProxy(const QString, const QString))); if (getProperties) { + int height = m_listView->iconSize().height(); + int width = (int)(height * m_render->dar()); + QPixmap pix = KIcon("video-x-generic").pixmap(QSize(width, height)); + item->setData(0, Qt::DecorationRole, pix); + //item->setFlags(Qt::ItemIsSelectable); m_listView->processLayout(); QDomElement e = clip->toXML().cloneNode().toElement(); e.removeAttribute("file_hash"); - m_infoQueue.insert(clip->getId(), e); + resetThumbsProducer(clip); + m_render->getFileProperties(e, clip->getId(), m_listView->iconSize().height(), true); } else if (item->hasProxy() && !item->isProxyRunning()) { - slotCreateProxy(clip->getId(), false); + slotCreateProxy(clip->getId()); } clip->askForAudioThumbs(); KUrl url = clip->fileURL(); - if (getProperties == false && !clip->getClipHash().isEmpty()) { - QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + ".png"; - if (QFile::exists(cachedPixmap)) { - QPixmap pix(cachedPixmap); - if (pix.isNull()) - KIO::NetAccess::del(KUrl(cachedPixmap), this); - item->setData(0, Qt::DecorationRole, pix); - } - } #ifdef NEPOMUK if (!url.isEmpty() && KdenliveSettings::activate_nepomuk()) { // if file has Nepomuk comment, use it @@ -1043,75 +1120,54 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) } } monitorItemEditing(true); - if (m_listView->isEnabled()) { - updateButtons(); + updateButtons(); +} + +void ProjectList::slotGotProxy(const QString &proxyPath) +{ + if (proxyPath.isEmpty() || !m_refreshed || m_abortAllProxies) return; + QTreeWidgetItemIterator it(m_listView); + ProjectItem *item; + + while (*it) { + if ((*it)->type() == PROJECTCLIPTYPE) { + item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == proxyPath) + slotGotProxy(item); + } + ++it; } - - if (getProperties && m_processingClips.isEmpty()) - m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } -void ProjectList::slotGotProxy(const QString &id) +void ProjectList::slotGotProxy(ProjectItem *item) { - ProjectItem *item = getItemById(id); - if (item) { - // Proxy clip successfully created - QDomElement e = item->referencedClip()->toXML().cloneNode().toElement(); - //e.removeAttribute("file_hash"); + if (item == NULL || !m_refreshed) return; + DocClipBase *clip = item->referencedClip(); + // Proxy clip successfully created + QDomElement e = clip->toXML().cloneNode().toElement(); - // Make sure we get the correct producer length if it was adjusted in timeline - CLIPTYPE t = item->clipType(); - if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) { - int length = QString(item->referencedClip()->producerProperty("length")).toInt(); - if (length > 0 && !e.hasAttribute("length")) { - e.setAttribute("length", length); - } + // Make sure we get the correct producer length if it was adjusted in timeline + CLIPTYPE t = item->clipType(); + if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) { + int length = QString(clip->producerProperty("length")).toInt(); + if (length > 0 && !e.hasAttribute("length")) { + e.setAttribute("length", length); } - e.setAttribute("replace", 1); - m_infoQueue.insert(id, e); - if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } + resetThumbsProducer(clip); + m_render->getFileProperties(e, clip->getId(), m_listView->iconSize().height(), true); } void ProjectList::slotResetProjectList() { + m_abortAllProxies = true; + m_proxyThreads.waitForFinished(); + m_proxyThreads.clearFutures(); + m_thumbnailQueue.clear(); m_listView->clear(); emit clipSelected(NULL); - m_thumbnailQueue.clear(); - m_infoQueue.clear(); m_refreshed = false; -} - -void ProjectList::requestClipInfo(const QDomElement xml, const QString id) -{ - m_infoQueue.insert(id, xml); - //if (m_infoQueue.count() == 1 || ) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue())); -} - -void ProjectList::slotProcessNextClipInQueue() -{ - if (m_infoQueue.isEmpty()) { - emit processNextThumbnail(); - return; - } - - QMap::const_iterator j = m_infoQueue.constBegin(); - if (j != m_infoQueue.constEnd()) { - QDomElement dom = j.value(); - const QString id = j.key(); - m_infoQueue.remove(id); - m_processingClips.append(id); - bool replace; - if (dom.hasAttribute("replace")) { - // Proxy action was enabled / disabled and we want to replace current producer - dom.removeAttribute("replace"); - replace = true; - } - else replace = false; - bool selectClip = !replace; - if (m_infoQueue.count() > 1) selectClip = false; - emit getFileProperties(dom, id, m_listView->iconSize().height(), replace, selectClip); - } + m_abortAllProxies = false; } void ProjectList::slotUpdateClip(const QString &id) @@ -1122,20 +1178,45 @@ void ProjectList::slotUpdateClip(const QString &id) monitorItemEditing(true); } -void ProjectList::updateAllClips() +void ProjectList::getCachedThumbnail(ProjectItem *item) +{ + if (!item) return; + DocClipBase *clip = item->referencedClip(); + if (!clip) return; + QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + ".png"; + if (QFile::exists(cachedPixmap)) { + QPixmap pix(cachedPixmap); + if (pix.isNull()) { + KIO::NetAccess::del(KUrl(cachedPixmap), this); + requestClipThumbnail(item->clipId()); + } + else item->setData(0, Qt::DecorationRole, pix); + } + else requestClipThumbnail(item->clipId()); +} + +void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) { m_listView->setSortingEnabled(false); - kDebug() << "// UPDATE ALL CLPY"; QTreeWidgetItemIterator it(m_listView); DocClipBase *clip; ProjectItem *item; monitorItemEditing(false); + int height = m_listView->iconSize().height(); + int width = (int)(height * m_render->dar()); + QPixmap missingPixmap = QPixmap(width, height); + missingPixmap.fill(Qt::transparent); + KIcon icon("dialog-close"); + QPainter p(&missingPixmap); + p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6)); + p.end(); + kDebug()<<"//////////////7 UPDATE ALL CLPS"; while (*it) { if ((*it)->type() == PROJECTSUBCLIPTYPE) { // subitem SubProjectItem *sub = static_cast (*it); - if (sub->data(0, Qt::DecorationRole).isNull()) { + if (displayRatioChanged || sub->data(0, Qt::DecorationRole).isNull()) { item = static_cast ((*it)->parent()); requestClipThumbnail(item->clipId() + '#' + QString::number(sub->zone().x())); } @@ -1148,30 +1229,62 @@ void ProjectList::updateAllClips() } else { item = static_cast (*it); clip = item->referencedClip(); - if (item->referencedClip()->producer() == NULL) { - if (clip->isPlaceHolder() == false) - requestClipInfo(clip->toXML(), clip->getId()); - else if (!clip->isPlaceHolder()) + if (item->referencedClip()->getProducer() == NULL) { + if (clip->isPlaceHolder() == false) { + QDomElement xml = clip->toXML(); + if (fpsChanged) { + xml.removeAttribute("out"); + xml.removeAttribute("file_hash"); + xml.removeAttribute("proxy_out"); + } + bool replace = xml.attribute("replace") == "1"; + if (replace) resetThumbsProducer(clip); + m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); + } + else { item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled); - } else { - if (item->data(0, Qt::DecorationRole).isNull()) + if (item->data(0, Qt::DecorationRole).isNull()) { + item->setData(0, Qt::DecorationRole, missingPixmap); + } + else { + QPixmap pixmap = qVariantValue(item->data(0, Qt::DecorationRole)); + QPainter p(&pixmap); + p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6)); + p.end(); + item->setData(0, Qt::DecorationRole, pixmap); + } + } + } else { + if (displayRatioChanged) requestClipThumbnail(clip->getId()); + else if (item->data(0, Qt::DecorationRole).isNull()) { + getCachedThumbnail(item); + } if (item->data(0, DurationRole).toString().isEmpty()) { - item->changeDuration(item->referencedClip()->producer()->get_playtime()); + item->changeDuration(item->referencedClip()->getProducer()->get_playtime()); + } + if (clip->isPlaceHolder()) { + QPixmap pixmap = qVariantValue(item->data(0, Qt::DecorationRole)); + if (pixmap.isNull()) { + pixmap = QPixmap(width, height); + pixmap.fill(Qt::transparent); + } + QPainter p(&pixmap); + p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6)); + p.end(); + item->setData(0, Qt::DecorationRole, pixmap); } } item->setData(0, UsageRole, QString::number(item->numReferences())); } - //qApp->processEvents(); ++it; } - if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); - if (m_listView->isEnabled()) - monitorItemEditing(true); m_listView->setSortingEnabled(true); - if (m_infoQueue.isEmpty()) - slotProcessNextThumbnail(); + if (m_render->processingItems() == 0) { + monitorItemEditing(true); + slotProcessNextThumbnail(); + } } // static @@ -1280,18 +1393,34 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace) { ProjectItem *item = getItemById(id); m_processingClips.removeAll(id); - if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); + m_thumbnailQueue.removeAll(id); if (item) { + item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled); const QString path = item->referencedClip()->fileURL().path(); if (item->referencedClip()->isPlaceHolder()) replace = false; if (!path.isEmpty()) { + if (m_invalidClipDialog) { + m_invalidClipDialog->addClip(id, path); + return; + } + else { + if (replace) + m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"), i18n("Clip %1
is invalid, will be removed from project.", QString()), replace, kapp->activeWindow()); + else { + m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"), i18n("Clip %1
is missing or invalid. Remove it from project?", QString()), replace, kapp->activeWindow()); + } + m_invalidClipDialog->addClip(id, path); + int result = m_invalidClipDialog->exec(); + if (result == KDialog::Yes) replace = true; + } + } + if (m_invalidClipDialog) { if (replace) - KMessageBox::sorry(kapp->activeWindow(), i18n("Clip %1
is invalid, will be removed from project.", path)); - else if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("Clip %1
is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes) - replace = true; + emit deleteProjectClips(m_invalidClipDialog->getIds(), QMap ()); + delete m_invalidClipDialog; + m_invalidClipDialog = NULL; } - if (replace) - emit deleteProjectClips(QStringList() << id, QMap ()); + } } @@ -1299,8 +1428,11 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) { ProjectItem *item = getItemById(id); if (item) { - //TODO: use durationError to display correct message to user after 0.8 release - if (durationError) kDebug() << "Proxy duration is wrong, try changing transcoding parameters."; + item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled); + if (durationError) { + kDebug() << "Proxy duration is wrong, try changing transcoding parameters."; + emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2); + } item->setProxyStatus(PROXYCRASHED); QString path = item->referencedClip()->getProperty("proxy"); KUrl proxyFolder(m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"); @@ -1311,7 +1443,7 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) } } m_processingClips.removeAll(id); - if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); + m_thumbnailQueue.removeAll(id); } void ProjectList::slotAddColorClip() @@ -1420,18 +1552,21 @@ QStringList ProjectList::getGroup() const void ProjectList::setDocument(KdenliveDoc *doc) { m_listView->blockSignals(true); + m_abortAllProxies = true; + m_proxyThreads.waitForFinished(); + m_proxyThreads.clearFutures(); + m_thumbnailQueue.clear(); m_listView->clear(); m_processingClips.clear(); + m_listView->setSortingEnabled(false); emit clipSelected(NULL); - m_thumbnailQueue.clear(); - m_infoQueue.clear(); m_refreshed = false; m_fps = doc->fps(); m_timecode = doc->timecode(); m_commandStack = doc->commandStack(); m_doc = doc; - m_proxyList.clear(); + m_abortAllProxies = false; QMap flist = doc->clipManager()->documentFolderList(); QStringList openedFolders = doc->getExpandedFolders(); @@ -1443,6 +1578,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) } QList list = doc->clipManager()->documentClipList(); + if (list.isEmpty()) m_refreshed = true; for (int i = 0; i < list.count(); i++) slotAddClip(list.at(i), false); @@ -1451,7 +1587,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) connect(m_doc->clipManager(), SIGNAL(modifiedClip(const QString &)), this, SLOT(slotModifiedClip(const QString &))); connect(m_doc->clipManager(), SIGNAL(missingClip(const QString &)), this, SLOT(slotMissingClip(const QString &))); connect(m_doc->clipManager(), SIGNAL(availableClip(const QString &)), this, SLOT(slotAvailableClip(const QString &))); - connect(m_doc->clipManager(), SIGNAL(checkAllClips()), this, SLOT(updateAllClips())); + connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool)), this, SLOT(updateAllClips(bool, bool))); } QList ProjectList::documentClipList() const @@ -1483,53 +1619,44 @@ QDomElement ProjectList::producersList() void ProjectList::slotCheckForEmptyQueue() { - if (!m_refreshed && m_processingClips.isEmpty() && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) { - m_refreshed = true; - emit loadingIsOver(); - emit displayMessage(QString(), -1); - m_listView->blockSignals(false); - m_listView->setEnabled(true); + if (m_render->processingItems() == 0 && m_thumbnailQueue.isEmpty()) { + if (!m_refreshed) { + emit loadingIsOver(); + emit displayMessage(QString(), -1); + m_refreshed = true; + } updateButtons(); } else if (!m_refreshed) { QTimer::singleShot(300, this, SLOT(slotCheckForEmptyQueue())); } } -void ProjectList::reloadClipThumbnails() -{ - m_thumbnailQueue.clear(); - QTreeWidgetItemIterator it(m_listView); - while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { - // subitem - ++it; - continue; - } - m_thumbnailQueue << ((ProjectItem *)(*it))->clipId(); - ++it; - } - QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail())); -} void ProjectList::requestClipThumbnail(const QString id) { if (!m_thumbnailQueue.contains(id)) m_thumbnailQueue.append(id); + slotProcessNextThumbnail(); +} + +void ProjectList::resetThumbsProducer(DocClipBase *clip) +{ + if (!clip) return; + clip->clearThumbProducer(); + QString id = clip->getId(); + m_thumbnailQueue.removeAll(id); } void ProjectList::slotProcessNextThumbnail() { - if (m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) { - slotCheckForEmptyQueue(); + if (m_render->processingItems() > 0) { return; } - if (!m_infoQueue.isEmpty()) { - //QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail())); + if (m_thumbnailQueue.isEmpty()) { + slotCheckForEmptyQueue(); return; } - if (m_thumbnailQueue.count() > 1) { - int max = m_doc->clipManager()->clipsCount(); - emit displayMessage(i18n("Loading thumbnails"), (int)(100 *(max - m_thumbnailQueue.count()) / max)); - } + int max = m_doc->clipManager()->clipsCount(); + emit displayMessage(i18n("Loading thumbnails"), (int)(100 *(max - m_thumbnailQueue.count()) / max)); slotRefreshClipThumbnail(m_thumbnailQueue.takeFirst(), false); } @@ -1538,8 +1665,9 @@ void ProjectList::slotRefreshClipThumbnail(const QString &clipId, bool update) QTreeWidgetItem *item = getAnyItemById(clipId); if (item) slotRefreshClipThumbnail(item, update); - else + else { slotProcessNextThumbnail(); + } } void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) @@ -1566,13 +1694,15 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) } QPixmap pix; int height = m_listView->iconSize().height(); - int width = (int)(height * m_render->dar()); + int swidth = (int)(height * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5); + int dwidth = (int)(height * m_render->dar() + 0.5); if (clip->clipType() == AUDIO) - pix = KIcon("audio-x-generic").pixmap(QSize(width, height)); + pix = KIcon("audio-x-generic").pixmap(QSize(dwidth, height)); else if (clip->clipType() == IMAGE) - pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->producer(), 0, width, height)); - else - pix = item->referencedClip()->thumbProducer()->extractImage(frame, width, height); + pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height)); + else { + pix = item->referencedClip()->extractImage(frame, dwidth, height); + } if (!pix.isNull()) { monitorItemEditing(false); @@ -1586,96 +1716,110 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) } if (update) emit projectModified(); - slotProcessNextThumbnail(); } } -void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace, bool selectClip) +void ProjectList::slotRefreshMonitor() +{ + if (m_listView->selectedItems().count() == 1 && m_render && m_render->processingItems() == 0) { + if (m_listView->currentItem() && m_listView->currentItem()->type() != PROJECTFOLDERTYPE) { + ProjectItem *item = static_cast (m_listView->currentItem()); + DocClipBase *clip = item->referencedClip(); + if (clip && clip->isClean() && !m_render->isProcessing(item->clipId())) emit clipSelected(clip); + } + } +} + +void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace, bool refreshThumbnail) { QString toReload; ProjectItem *item = getItemById(clipId); - if (!m_refreshed) { - // we are still finishing to load the document - selectClip = false; + + int queue = m_render->processingItems(); + if (queue == 0) { + m_listView->setEnabled(true); } - m_processingClips.removeAll(clipId); - if (m_infoQueue.isEmpty() && m_processingClips.isEmpty()) m_listView->setEnabled(true); if (item && producer) { - //m_listView->blockSignals(true); monitorItemEditing(false); - item->setProperties(properties, metadata); - if (item->referencedClip()->isPlaceHolder() && producer->is_valid()) { - item->referencedClip()->setValid(); + DocClipBase *clip = item->referencedClip(); + if (producer->is_valid()) { + if (clip->isPlaceHolder()) { + clip->setValid(); + toReload = clipId; + } item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled); - toReload = clipId; } - + item->setProperties(properties, metadata); + clip->setProducer(producer, replace); + clip->askForAudioThumbs(); + if (refreshThumbnail) getCachedThumbnail(item); // Proxy stuff QString size = properties.value("frame_size"); - DocClipBase *clip = item->referencedClip(); - if (!useProxy() && item->referencedClip()->getProperty("proxy").isEmpty()) setProxyStatus(item, NOPROXY); - if (useProxy() && generateProxy() && item->referencedClip()->getProperty("proxy") == "-") setProxyStatus(item, NOPROXY); - else if (useProxy() && !item->isProxyRunning() && (item->clipType() == AV || item->clipType() == VIDEO) && generateProxy() && size.section('x', 0, 0).toInt() > m_doc->getDocumentProperty("proxyminsize").toInt()) { - if (clip->getProperty("proxy").isEmpty()) { - QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"; - QMap newProps; - newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + "." + m_doc->getDocumentProperty("proxyextension")); - // insert required duration for proxy - newProps.insert("proxy_out", item->referencedClip()->producerProperty("out")); - QMap oldProps = clip->properties(); - oldProps.insert("proxy", QString()); - EditClipCommand *command = new EditClipCommand(this, clipId, oldProps, newProps, true); - m_doc->commandStack()->push(command); + if (!useProxy() && clip->getProperty("proxy").isEmpty()) setProxyStatus(item, NOPROXY); + if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") setProxyStatus(item, NOPROXY); + else if (useProxy() && !item->hasProxy() && !item->isProxyRunning()) { + // proxy video and image clips + int maxSize; + CLIPTYPE t = item->clipType(); + if (t == IMAGE) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt(); + else maxSize = m_doc->getDocumentProperty("proxyminsize").toInt(); + if ((((t == AV || t == VIDEO || t == PLAYLIST) && generateProxy()) || (t == IMAGE && generateImageProxy())) && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize)) { + if (clip->getProperty("proxy").isEmpty()) { + KUrl proxyPath = m_doc->projectFolder(); + proxyPath.addPath("proxy/"); + proxyPath.addPath(clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension"))); + QMap newProps; + // insert required duration for proxy + if (t != IMAGE) newProps.insert("proxy_out", clip->producerProperty("out")); + newProps.insert("proxy", proxyPath.path()); + QMap oldProps = clip->properties(); + oldProps.insert("proxy", QString()); + EditClipCommand *command = new EditClipCommand(this, clipId, oldProps, newProps, true); + m_doc->commandStack()->push(command); + } } } - - clip->setProducer(producer, replace); - clip->askForAudioThumbs(); - if (!replace && item->data(0, Qt::DecorationRole).isNull()) + + if (!replace && item->data(0, Qt::DecorationRole).isNull() && !refreshThumbnail) { requestClipThumbnail(clipId); + } if (!toReload.isEmpty()) item->slotSetToolTip(); - - if (m_listView->isEnabled() && replace) { - // update clip in clip monitor - emit clipSelected(NULL); - emit clipSelected(clip); - //TODO: Make sure the line below has no side effect - toReload = clipId; - } - /*else { - // Check if duration changed. - emit receivedClipDuration(clipId); - delete producer; - }*/ - if (m_listView->isEnabled()) - monitorItemEditing(true); - /*if (item->icon(0).isNull()) { - requestClipThumbnail(clipId); - }*/ } else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS..."; - if (selectClip && m_infoQueue.isEmpty()) { - if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty()) { - m_listView->setCurrentItem(item); - bool updatedProfile = false; - if (item->parent()) { - if (item->parent()->type() == PROJECTFOLDERTYPE) - static_cast (item->parent())->switchIcon(); - } else if (KdenliveSettings::checkfirstprojectclip() && m_listView->topLevelItemCount() == 1) { - // this is the first clip loaded in project, check if we want to adjust project settings to the clip - updatedProfile = adjustProjectProfileToItem(item); - } - if (updatedProfile == false) emit clipSelected(item->referencedClip()); - } else { - int max = m_doc->clipManager()->clipsCount(); - emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max)); + if (queue == 0) { + monitorItemEditing(true); + if (item && m_thumbnailQueue.isEmpty()) { + m_listView->setCurrentItem(item); + bool updatedProfile = false; + if (item->parent()) { + if (item->parent()->type() == PROJECTFOLDERTYPE) + static_cast (item->parent())->switchIcon(); + } else if (KdenliveSettings::checkfirstprojectclip() && m_listView->topLevelItemCount() == 1) { + // this is the first clip loaded in project, check if we want to adjust project settings to the clip + updatedProfile = adjustProjectProfileToItem(item); + } + if (updatedProfile == false) { + //emit clipSelected(item->referencedClip()); + } + } else { + int max = m_doc->clipManager()->clipsCount(); + emit displayMessage(i18n("Loading clips"), (int)(100 *(max - queue) / max)); + } + processNextThumbnail(); } + if (replace && item) { + toReload = clipId; + // update clip in clip monitor + /*if (queue == 0 && item->isSelected() && m_listView->selectedItems().count() == 1) + m_refreshMonitorTimer.start();*/ + } + if (!item) { + // no item for producer, delete it + delete producer; } if (!toReload.isEmpty()) - emit clipNeedsReload(toReload, true); - - if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); + emit clipNeedsReload(toReload); } bool ProjectList::adjustProjectProfileToItem(ProjectItem *item) @@ -1757,16 +1901,27 @@ bool ProjectList::generateImageProxy() const return m_doc->getDocumentProperty("generateimageproxy").toInt(); } -void ProjectList::slotReplyGetImage(const QString &clipId, const QPixmap &pix) +void ProjectList::slotReplyGetImage(const QString &clipId, const QImage &img) +{ + QPixmap pix = QPixmap::fromImage(img); + setThumbnail(clipId, pix); +} + +void ProjectList::slotReplyGetImage(const QString &clipId, const QString &name, int width, int height) +{ + QPixmap pix = KIcon(name).pixmap(QSize(width, height)); + setThumbnail(clipId, pix); +} + +void ProjectList::setThumbnail(const QString &clipId, const QPixmap &pix) { ProjectItem *item = getItemById(clipId); if (item && !pix.isNull()) { monitorItemEditing(false); item->setData(0, Qt::DecorationRole, pix); monitorItemEditing(true); + //update(); m_doc->cachePixmap(item->getClipHash(), pix); - if (m_listView->isEnabled()) - m_listView->blockSignals(false); } } @@ -1848,7 +2003,6 @@ void ProjectList::slotSelectClip(const QString &ix) m_deleteButton->defaultAction()->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); - m_proxyAction->setEnabled(useProxy()); if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -1914,7 +2068,7 @@ void ProjectList::regenerateTemplate(const QString &id) void ProjectList::regenerateTemplate(ProjectItem *clip) { //TODO: remove this unused method, only force_reload is necessary - clip->referencedClip()->producer()->set("force_reload", 1); + clip->referencedClip()->getProducer()->set("force_reload", 1); } QDomDocument ProjectList::generateTemplateXml(QString path, const QString &replaceString) @@ -1964,7 +2118,7 @@ void ProjectList::addClipCut(const QString &id, int in, int out, const QString d m_listView->scrollToItem(sub); m_listView->editItem(sub, 1); } - QPixmap p = clip->referencedClip()->thumbProducer()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2); + QPixmap p = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2); sub->setData(0, Qt::DecorationRole, p); m_doc->cachePixmap(clip->getClipHash() + '#' + QString::number(in), p); monitorItemEditing(true); @@ -2033,9 +2187,7 @@ void ProjectList::doUpdateClipCut(const QString &id, const QPoint oldzone, const void ProjectList::slotForceProcessing(const QString &id) { - while (m_infoQueue.contains(id)) { - slotProcessNextClipInQueue(); - } + m_render->forceProcessing(id); } void ProjectList::slotAddOrUpdateSequence(const QString frameName) @@ -2091,68 +2243,141 @@ QMap ProjectList::getProxies() return list; } -void ProjectList::slotCreateProxy(const QString id, bool createProducer) +void ProjectList::slotCreateProxy(const QString id) { ProjectItem *item = getItemById(id); - if (!item || item->isProxyRunning()) return; - - // If proxy producer already exists, skip creation - if (!createProducer) { - setProxyStatus(id, PROXYDONE); + if (!item || item->isProxyRunning() || item->referencedClip()->isPlaceHolder()) return; + QString path = item->referencedClip()->getProperty("proxy"); + if (path.isEmpty()) { + setProxyStatus(path, PROXYCRASHED); return; } - setProxyStatus(id, PROXYWAITING); - if (m_abortProxyId.contains(id)) m_abortProxyId.removeAll(id); - emit projectModified(); - QtConcurrent::run(this, &ProjectList::slotGenerateProxy, id); + setProxyStatus(path, PROXYWAITING); + if (m_abortProxy.contains(path)) m_abortProxy.removeAll(path); + if (m_processingProxy.contains(path)) { + // Proxy is already being generated + return; + } + if (QFile::exists(path)) { + // Proxy already created + setProxyStatus(path, PROXYDONE); + slotGotProxy(path); + return; + } + m_processingProxy.append(path); + + PROXYINFO info; + info.dest = path; + info.src = item->clipUrl().path(); + info.type = item->clipType(); + info.exif = QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt(); + m_proxyList.append(info); + m_proxyThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotGenerateProxy)); } -void ProjectList::slotAbortProxy(const QString id) +void ProjectList::slotAbortProxy(const QString id, const QString path) { - if (m_proxyList.contains(id)) m_proxyList.removeAll(id); + QTreeWidgetItemIterator it(m_listView); ProjectItem *item = getItemById(id); - if (item) { - emit projectModified(); - if (item->isProxyReady()) slotGotProxy(id); - else if (item->isProxyRunning()) m_abortProxyId << id; - setProxyStatus(id, NOPROXY); + setProxyStatus(item, NOPROXY); + slotGotProxy(item); + if (!path.isEmpty() && m_processingProxy.contains(path)) { + m_abortProxy << path; + setProxyStatus(path, NOPROXY); } } -void ProjectList::slotGenerateProxy(const QString id) +void ProjectList::slotGenerateProxy() { - setProxyStatus(id, CREATINGPROXY); - ProjectItem *item = getItemById(id); - if (item == NULL) return; - QString path = item->referencedClip()->getProperty("proxy"); - if (path.isEmpty()) { - setProxyStatus(id, PROXYCRASHED); + if (m_proxyList.isEmpty() || m_abortAllProxies) return; + emit projectModified(); + PROXYINFO info = m_proxyList.takeFirst(); + if (m_abortProxy.contains(info.dest)) { + m_abortProxy.removeAll(info.dest); return; } - QString url = item->clipUrl().path(); - - if (QFile::exists(path)) { - setProxyStatus(id, PROXYDONE); - slotGotProxy(id); + // Make sure proxy path is writable + QFile file(info.dest); + if (!file.open(QIODevice::WriteOnly)) { + setProxyStatus(info.dest, PROXYCRASHED); + m_processingProxy.removeAll(info.dest); return; } - else { - // Make sure proxy path is writable - QFile file(path); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - setProxyStatus(id, PROXYCRASHED); - return; + file.close(); + QFile::remove(info.dest); + + setProxyStatus(info.dest, CREATINGPROXY); + + // Special case: playlist clips (.mlt or .kdenlive project files) + if (info.type == PLAYLIST) { + // change FFmpeg params to MLT format + QStringList parameters; + parameters << info.src; + parameters << "-consumer" << "avformat:" + info.dest; + QStringList params = m_doc->getDocumentProperty("proxyparams").simplified().split('-', QString::SkipEmptyParts); + + foreach(QString s, params) { + s = s.simplified(); + if (s.count(' ') == 0) { + s.append("=1"); + } + else s.replace(' ', '='); + parameters << s; } - file.close(); - QFile::remove(path); + + parameters.append(QString("real_time=-%1").arg(KdenliveSettings::mltthreads())); + + //TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy + double display_ratio = KdenliveDoc::getDisplayRatio(info.src); + parameters << "aspect=" + QString::number(display_ratio); + + //kDebug()<<"TRANSCOD: "<clipType() == IMAGE) { + + if (info.type == IMAGE) { // Image proxy - QImage i(url); + QImage i(info.src); if (i.isNull()) { // Cannot load image - setProxyStatus(id, PROXYCRASHED); + setProxyStatus(info.dest, PROXYCRASHED); return; } QImage proxy; @@ -2160,13 +2385,12 @@ void ProjectList::slotGenerateProxy(const QString id) //TODO: Make it be configurable? if (i.width() > i.height()) proxy = i.scaledToWidth(m_render->frameRenderWidth()); else proxy = i.scaledToHeight(m_render->renderHeight()); - int exif_orientation = QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt(); - if (exif_orientation > 1) { + if (info.exif > 1) { // Rotate image according to exif data QImage processed; QMatrix matrix; - switch ( exif_orientation ) { + switch ( info.exif ) { case 2: matrix.scale( -1, 1 ); break; @@ -2192,51 +2416,85 @@ void ProjectList::slotGenerateProxy(const QString id) break; } processed = proxy.transformed( matrix ); - processed.save(path); + processed.save(info.dest); } - else proxy.save(path); - setProxyStatus(id, PROXYDONE); - slotGotProxy(id); + else proxy.save(info.dest); + setProxyStatus(info.dest, PROXYDONE); + slotGotProxy(info.dest); + m_abortProxy.removeAll(info.dest); + m_processingProxy.removeAll(info.dest); return; } QStringList parameters; - parameters << "-i" << url; + parameters << "-i" << info.src; QString params = m_doc->getDocumentProperty("proxyparams").simplified(); foreach(QString s, params.split(' ')) parameters << s; // Make sure we don't block when proxy file already exists parameters << "-y"; - parameters << path; + parameters << info.dest; + kDebug()<<"// STARTING PROXY GEN: "< m_doc->getDocumentProperty("proxyminsize").toInt()) { if (clip->getProperty("proxy").isEmpty()) { // We need to insert empty proxy in old properties so that undo will work - QMap oldProps = clip->properties(); + QMap oldProps;// = clip->properties(); oldProps.insert("proxy", QString()); QMap newProps; newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + "." + m_doc->getDocumentProperty("proxyextension")); @@ -2309,7 +2567,6 @@ void ProjectList::updateProxyConfig() } if (command->childCount() > 0) m_doc->commandStack()->push(command); else delete command; - if (!m_infoQueue.isEmpty() && !m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } void ProjectList::slotProxyCurrentItem(bool doProxy) @@ -2335,17 +2592,25 @@ void ProjectList::slotProxyCurrentItem(bool doProxy) if (!list.contains(sub)) list.append(sub); } } - if (listItem->type() == PROJECTCLIPTYPE) { + else if (listItem->type() == PROJECTSUBCLIPTYPE) { + QTreeWidgetItem *sub = listItem->parent(); + if (!list.contains(sub)) list.append(sub); + } + else if (listItem->type() == PROJECTCLIPTYPE) { ProjectItem *item = static_cast (listItem); CLIPTYPE t = item->clipType(); - if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE) && item->referencedClip()) { - oldProps = item->referencedClip()->properties(); + if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) { + if ((doProxy && item->hasProxy()) || (!doProxy && !item->hasProxy())) continue; + DocClipBase *clip = item->referencedClip(); + if (!clip->isClean() || m_render->isProcessing(item->clipId())) continue; + resetThumbsProducer(clip); + oldProps = clip->properties(); if (doProxy) { newProps.clear(); - QString path = proxydir + item->referencedClip()->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); - newProps.insert("proxy", path); + QString path = proxydir + clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); // insert required duration for proxy - newProps.insert("proxy_out", item->referencedClip()->producerProperty("out")); + newProps.insert("proxy_out", clip->producerProperty("out")); + newProps.insert("proxy", path); // We need to insert empty proxy so that undo will work oldProps.insert("proxy", QString()); } @@ -2357,20 +2622,56 @@ void ProjectList::slotProxyCurrentItem(bool doProxy) m_doc->commandStack()->push(command); } else delete command; - //if (!m_infoQueue.isEmpty() && !m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } -void ProjectList::setProxyStatus(const QString id, PROXYSTATUS status) + +void ProjectList::slotDeleteProxy(const QString proxyPath) { - ProjectItem *item = getItemById(id); - setProxyStatus(item, status); + if (proxyPath.isEmpty()) return; + QUndoCommand *proxyCommand = new QUndoCommand(); + proxyCommand->setText(i18n("Remove Proxy")); + QTreeWidgetItemIterator it(m_listView); + ProjectItem *item; + while (*it) { + if ((*it)->type() == PROJECTCLIPTYPE) { + item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == proxyPath) { + QMap props; + props.insert("proxy", QString()); + new EditClipCommand(this, item->clipId(), item->referencedClip()->properties(), props, true, proxyCommand); + + } + } + ++it; + } + if (proxyCommand->childCount() == 0) + delete proxyCommand; + else + m_commandStack->push(proxyCommand); + QFile::remove(proxyPath); +} + +void ProjectList::setProxyStatus(const QString proxyPath, PROXYSTATUS status, int progress) +{ + if (proxyPath.isEmpty() || m_abortAllProxies) return; + QTreeWidgetItemIterator it(m_listView); + ProjectItem *item; + while (*it) { + if ((*it)->type() == PROJECTCLIPTYPE) { + item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == proxyPath) { + setProxyStatus(item, status, progress); + } + } + ++it; + } } -void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status) +void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status, int progress) { if (item == NULL) return; monitorItemEditing(false); - item->setProxyStatus(status); + item->setProxyStatus(status, progress); monitorItemEditing(true); }