X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=2e4bfac0db01a90537f1ea98d5a10672f6894b06;hb=fd65780a125fea8029fe416e515f5000b63476f5;hp=e5b240b3ac8b80aa6a2cf9bd607901c2ae73999e;hpb=a5ea40d00e353607a2bfcb1f7910f8a9fae6e346;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index e5b240b3..2e4bfac0 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -19,7 +19,8 @@ #include "projectlist.h" #include "projectitem.h" -#include "addfoldercommand.h" +#include "commands/addfoldercommand.h" +#include "projecttree/proxyclipjob.h" #include "kdenlivesettings.h" #include "slideshowclip.h" #include "ui_colorclip_ui.h" @@ -33,10 +34,10 @@ #include "projectlistview.h" #include "timecodedisplay.h" #include "profilesdialog.h" -#include "editclipcommand.h" -#include "editclipcutcommand.h" -#include "editfoldercommand.h" -#include "addclipcutcommand.h" +#include "commands/editclipcommand.h" +#include "commands/editclipcutcommand.h" +#include "commands/editfoldercommand.h" +#include "commands/addclipcutcommand.h" #include "ui_templateclip_ui.h" @@ -50,6 +51,7 @@ #include #include #include +#include #ifdef NEPOMUK #include @@ -66,6 +68,127 @@ #include #include #include +#include + +SmallInfoLabel::SmallInfoLabel(QWidget *parent) : QPushButton(parent) +{ + setFixedWidth(0); + setFlat(true); + + /*QString style = "QToolButton {background-color: %1;border-style: outset;border-width: 2px; + border-radius: 5px;border-color: beige;}";*/ + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor bg = scheme.background(KColorScheme::LinkBackground).color(); + QColor fg = scheme.foreground(KColorScheme::LinkText).color(); + QString style = QString("QPushButton {padding:2px;background-color: rgb(%1, %2, %3);border-radius: 4px;border: none;color: rgb(%4, %5, %6)}").arg(bg.red()).arg(bg.green()).arg(bg.blue()).arg(fg.red()).arg(fg.green()).arg(fg.blue()); + + bg = scheme.background(KColorScheme::ActiveBackground).color(); + fg = scheme.foreground(KColorScheme::ActiveText).color(); + style.append(QString("\nQPushButton:hover {padding:2px;background-color: rgb(%1, %2, %3);border-radius: 4px;border: none;color: rgb(%4, %5, %6)}").arg(bg.red()).arg(bg.green()).arg(bg.blue()).arg(fg.red()).arg(fg.green()).arg(fg.blue())); + + setStyleSheet(style); + m_timeLine = new QTimeLine(500, this); + QObject::connect(m_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(slotTimeLineChanged(qreal))); + QObject::connect(m_timeLine, SIGNAL(finished()), this, SLOT(slotTimeLineFinished())); + hide(); +} + +void SmallInfoLabel::slotTimeLineChanged(qreal value) +{ + setFixedWidth(qMin(value * 2, qreal(1.0)) * sizeHint().width()); + update(); +} + +void SmallInfoLabel::slotTimeLineFinished() +{ + if (m_timeLine->direction() == QTimeLine::Forward) { + // Show + show(); + } else { + // Hide + hide(); + setText(QString()); + } +} + +void SmallInfoLabel::slotSetJobCount(int jobCount) +{ + if (jobCount > 0) { + // prepare animation + setText(i18np("%1 job", "%1 jobs", jobCount)); + setToolTip(i18np("%1 pending job", "%1 pending jobs", jobCount)); + + if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) { + show(); + return; + } + + if (isVisible()) { + setFixedWidth(sizeHint().width()); + update(); + return; + } + + setFixedWidth(0); + show(); + int wantedWidth = sizeHint().width(); + setGeometry(-wantedWidth, 0, wantedWidth, height()); + m_timeLine->setDirection(QTimeLine::Forward); + if (m_timeLine->state() == QTimeLine::NotRunning) { + m_timeLine->start(); + } + } + else { + if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) { + hide(); + return; + } + // hide + m_timeLine->setDirection(QTimeLine::Backward); + if (m_timeLine->state() == QTimeLine::NotRunning) { + m_timeLine->start(); + } + } + +} + + +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), @@ -74,12 +197,17 @@ ProjectList::ProjectList(QWidget *parent) : m_commandStack(NULL), m_openAction(NULL), m_reloadAction(NULL), + m_stabilizeAction(NULL), m_transcodeAction(NULL), m_doc(NULL), m_refreshed(false), - m_infoQueue(), - m_thumbnailQueue() + m_allClipsProcessed(false), + m_thumbnailQueue(), + m_abortAllJobs(false), + m_closing(false), + m_invalidClipDialog(NULL) { + qRegisterMetaType ("stringMap"); QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); @@ -88,23 +216,39 @@ ProjectList::ProjectList(QWidget *parent) : QFrame *frame = new QFrame; frame->setFrameStyle(QFrame::NoFrame); QHBoxLayout *box = new QHBoxLayout; + box->setContentsMargins(0, 0, 0, 0); + KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine; - box->addWidget(searchView); - //int s = style()->pixelMetric(QStyle::PM_SmallIconSize); - //m_toolbar->setIconSize(QSize(s, s)); + + // small info button for pending jobs + m_infoLabel = new SmallInfoLabel(this); + connect(this, SIGNAL(jobCount(int)), m_infoLabel, SLOT(slotSetJobCount(int))); + m_jobsMenu = new QMenu(this); + QAction *cancelJobs = new QAction(i18n("Cancel All Jobs"), this); + cancelJobs->setCheckable(false); + connect(cancelJobs, SIGNAL(triggered()), this, SLOT(slotCancelJobs())); + m_jobsMenu->addAction(cancelJobs); + m_infoLabel->setMenu(m_jobsMenu); + box->addWidget(m_infoLabel); + + int size = style()->pixelMetric(QStyle::PM_SmallIconSize); + QSize iconSize(size, size); m_addButton = new QToolButton; m_addButton->setPopupMode(QToolButton::MenuButtonPopup); m_addButton->setAutoRaise(true); + m_addButton->setIconSize(iconSize); box->addWidget(m_addButton); m_editButton = new QToolButton; m_editButton->setAutoRaise(true); + m_editButton->setIconSize(iconSize); box->addWidget(m_editButton); m_deleteButton = new QToolButton; m_deleteButton->setAutoRaise(true); + m_deleteButton->setIconSize(iconSize); box->addWidget(m_deleteButton); frame->setLayout(box); layout->addWidget(frame); @@ -117,7 +261,7 @@ ProjectList::ProjectList(QWidget *parent) : 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())); @@ -125,6 +269,8 @@ ProjectList::ProjectList(QWidget *parent) : connect(m_listView, SIGNAL(addClipCut(const QString &, int, int)), this, SLOT(slotAddClipCut(const QString &, int, int))); connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int))); connect(m_listView, SIGNAL(showProperties(DocClipBase *)), this, SIGNAL(showClipProperties(DocClipBase *))); + + connect(this, SIGNAL(cancelRunningJob(const QString, stringMap )), this, SLOT(slotCancelRunningJob(const QString, stringMap))); m_listViewDelegate = new ItemDelegate(m_listView); m_listView->setItemDelegate(m_listViewDelegate); @@ -141,6 +287,11 @@ ProjectList::ProjectList(QWidget *parent) : ProjectList::~ProjectList() { + m_abortAllJobs = true; + m_closing = true; + m_thumbnailQueue.clear(); + if (!m_jobList.isEmpty()) qDeleteAll(m_jobList); + m_jobList.clear(); delete m_menu; m_listView->blockSignals(true); m_listView->clear(); @@ -187,31 +338,52 @@ void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) m_menu->addActions(addMenu->actions()); } -void ProjectList::setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu, QMenu *inTimelineMenu) +void ProjectList::setupGeneratorMenu(const QHash& menus) { - if (!addMenu) + if (!menus.contains("addMenu") && ! menus.value("addMenu") ) return; QMenu *menu = m_addButton->menu(); - menu->addMenu(addMenu); - m_addButton->setMenu(menu); - - m_menu->addMenu(addMenu); - if (addMenu->isEmpty()) - addMenu->setEnabled(false); - m_menu->addMenu(transcodeMenu); - if (transcodeMenu->isEmpty()) - transcodeMenu->setEnabled(false); - m_transcodeAction = transcodeMenu; + if (menus.contains("addMenu") && menus.value("addMenu")){ + QMenu* addMenu=menus.value("addMenu"); + menu->addMenu(addMenu); + m_addButton->setMenu(menu); + + m_menu->addMenu(addMenu); + if (addMenu->isEmpty()) + addMenu->setEnabled(false); + } + if (menus.contains("transcodeMenu") && menus.value("transcodeMenu") ){ + QMenu* transcodeMenu=menus.value("transcodeMenu"); + m_menu->addMenu(transcodeMenu); + if (transcodeMenu->isEmpty()) + transcodeMenu->setEnabled(false); + m_transcodeAction = transcodeMenu; + } + if (menus.contains("stabilizeMenu") && menus.value("stabilizeMenu") ){ + QMenu* stabilizeMenu=menus.value("stabilizeMenu"); + m_menu->addMenu(stabilizeMenu); + if (stabilizeMenu->isEmpty()) + stabilizeMenu->setEnabled(false); + m_stabilizeAction=stabilizeMenu; + + } m_menu->addAction(m_reloadAction); m_menu->addAction(m_proxyAction); - m_menu->addMenu(inTimelineMenu); - inTimelineMenu->setEnabled(false); + if (menus.contains("inTimelineMenu") && menus.value("inTimelineMenu")){ + QMenu* inTimelineMenu=menus.value("inTimelineMenu"); + m_menu->addMenu(inTimelineMenu); + inTimelineMenu->setEnabled(false); + } m_menu->addAction(m_editButton->defaultAction()); m_menu->addAction(m_openAction); m_menu->addAction(m_deleteButton->defaultAction()); m_menu->insertSeparator(m_deleteButton->defaultAction()); } +void ProjectList::clearSelection() +{ + m_listView->clearSelection(); +} QByteArray ProjectList::headerInfo() const { @@ -453,27 +625,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); } } } @@ -519,14 +697,14 @@ void ProjectList::slotMissingClip(const QString &id) return; } Mlt::Producer *newProd = m_render->invalidProducer(id); - if (item->referencedClip()->producer()) { + if (item->referencedClip()->getProducer()) { Mlt::Properties props(newProd->get_properties()); - Mlt::Properties src_props(item->referencedClip()->producer()->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(); @@ -574,35 +752,39 @@ void ProjectList::setRenderer(Render *projectRender) void ProjectList::slotClipSelected() { - if (!m_listView->isEnabled()) return; - if (m_listView->currentItem()) { - if (m_listView->currentItem()->type() == PROJECTFOLDERTYPE) { + 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); + m_stabilizeAction->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_stabilizeAction->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); m_deleteButton->defaultAction()->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); + m_stabilizeAction->setEnabled(true); if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -614,6 +796,7 @@ void ProjectList::slotClipSelected() } // Display relevant transcoding actions only adjustTranscodeActions(clip); + adjustStabilizeActions(clip); // Display uses in timeline emit findInTimeline(clip->clipId()); } @@ -624,7 +807,9 @@ void ProjectList::slotClipSelected() m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); } + adjustProxyActions(clip); } void ProjectList::adjustProxyActions(ProjectItem *clip) const @@ -639,6 +824,17 @@ void ProjectList::adjustProxyActions(ProjectItem *clip) const m_proxyAction->blockSignals(false); } +void ProjectList::adjustStabilizeActions(ProjectItem *clip) const +{ + + if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) { + m_stabilizeAction->setEnabled(false); + return; + } + m_stabilizeAction->setEnabled(true); + +} + void ProjectList::adjustTranscodeActions(ProjectItem *clip) const { if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) { @@ -693,6 +889,10 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap setProperties(properties); + if (properties.contains("proxy")) { + if (properties.value("proxy") == "-" || properties.value("proxy").isEmpty()) + clip->setProxyStatus(NOJOB); + } if (properties.contains("name")) { monitorItemEditing(false); clip->setText(0, properties.value("name")); @@ -786,20 +986,25 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) m_deleteButton->defaultAction()->setEnabled(enable); m_reloadAction->setEnabled(enable); m_transcodeAction->setEnabled(enable); + m_stabilizeAction->setEnabled(enable); if (enable) { ProjectItem *clip = NULL; if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { clip = static_cast (item->parent()); m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); + adjustProxyActions(clip); } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) { clip = static_cast (item); // Display relevant transcoding actions only adjustTranscodeActions(clip); + adjustStabilizeActions(clip); adjustProxyActions(clip); // Display uses in timeline emit findInTimeline(clip->clipId()); } else { m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); } if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); @@ -877,7 +1082,7 @@ void ProjectList::updateButtons() const m_openAction->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); - m_proxyAction->setEnabled(useProxy()); + m_stabilizeAction->setEnabled(true); return; } else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) { @@ -888,6 +1093,7 @@ void ProjectList::updateButtons() const m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); m_proxyAction->setEnabled(false); } @@ -906,11 +1112,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) { @@ -993,7 +1202,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); @@ -1015,29 +1224,26 @@ 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, const QString)), this, SLOT(slotAbortProxy(const QString, const QString))); + 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()) { + // WARNING: code below triggers unnecessary reload of all proxy clips on document loading... is it useful in some cases? + /*else if (item->hasProxy() && !item->isProxyRunning()) { 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 @@ -1047,6 +1253,13 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) item->setText(2, QString::number(f.rating())); } #endif + + // Add info to date column + QFileInfo fileInfo(url.path()); + if (fileInfo.exists()) { + item->setText(3, fileInfo.lastModified().toString(QString("yyyy/MM/dd hh:mm:ss"))); + } + // Add cut zones QList cuts = clip->cutZones(); if (!cuts.isEmpty()) { @@ -1064,21 +1277,16 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) } } monitorItemEditing(true); - if (m_listView->isEnabled()) { - updateButtons(); - } - - if (getProperties && m_processingClips.isEmpty()) - m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); + updateButtons(); } void ProjectList::slotGotProxy(const QString &proxyPath) { - if (proxyPath.isEmpty()) return; + if (proxyPath.isEmpty() || m_abortAllJobs) return; QTreeWidgetItemIterator it(m_listView); ProjectItem *item; - while (*it) { + while (*it && !m_abortAllJobs) { if ((*it)->type() == PROJECTCLIPTYPE) { item = static_cast (*it); if (item->referencedClip()->getProperty("proxy") == proxyPath) @@ -1092,6 +1300,12 @@ void ProjectList::slotGotProxy(ProjectItem *item) { if (item == NULL) return; DocClipBase *clip = item->referencedClip(); + if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) { + // Clip is being reprocessed, abort + kDebug()<<"//// TRYING TO PROXY: "<clipId()<<", but it is busy"; + return; + } + // Proxy clip successfully created QDomElement e = clip->toXML().cloneNode().toElement(); @@ -1103,64 +1317,84 @@ void ProjectList::slotGotProxy(ProjectItem *item) e.setAttribute("length", length); } } - e.setAttribute("replace", 1); - m_infoQueue.insert(clip->getId(), 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_listView->blockSignals(true); + m_abortAllJobs = true; + m_closing = true; + m_proxyThreads.waitForFinished(); + m_proxyThreads.clearFutures(); + m_thumbnailQueue.clear(); + if (!m_jobList.isEmpty()) qDeleteAll(m_jobList); + m_jobList.clear(); m_listView->clear(); + m_listView->setEnabled(true); emit clipSelected(NULL); - m_thumbnailQueue.clear(); - m_infoQueue.clear(); m_refreshed = false; + m_allClipsProcessed = false; + m_abortAllJobs = false; + m_closing = false; + m_listView->blockSignals(false); } -void ProjectList::requestClipInfo(const QDomElement xml, const QString id) +void ProjectList::slotUpdateClip(const QString &id) { - m_infoQueue.insert(id, xml); - //if (m_infoQueue.count() == 1 || ) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue())); + ProjectItem *item = getItemById(id); + monitorItemEditing(false); + if (item) item->setData(0, UsageRole, QString::number(item->numReferences())); + monitorItemEditing(true); } -void ProjectList::slotProcessNextClipInQueue() +void ProjectList::getCachedThumbnail(ProjectItem *item) { - if (m_infoQueue.isEmpty()) { - emit processNextThumbnail(); - return; - } - - QMap::const_iterator j = m_infoQueue.constBegin(); - if (j != m_infoQueue.constEnd()) { - QDomElement dom = j.value().cloneNode().toElement(); - 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; + 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 { + processThumbOverlays(item, pix); + item->setData(0, Qt::DecorationRole, pix); } - else replace = false; - bool selectClip = !replace; - if (m_infoQueue.count() > 1) selectClip = false; - emit getFileProperties(dom, id, m_listView->iconSize().height(), replace, selectClip); + } + else { + requestClipThumbnail(item->clipId()); } } -void ProjectList::slotUpdateClip(const QString &id) +void ProjectList::getCachedThumbnail(SubProjectItem *item) { - ProjectItem *item = getItemById(id); - monitorItemEditing(false); - if (item) item->setData(0, UsageRole, QString::number(item->numReferences())); - monitorItemEditing(true); + if (!item) return; + ProjectItem *parentItem = static_cast (item->parent()); + if (!parentItem) return; + DocClipBase *clip = parentItem->referencedClip(); + if (!clip) return; + int pos = item->zone().x(); + QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + "#" + QString::number(pos) + ".png"; + if (QFile::exists(cachedPixmap)) { + QPixmap pix(cachedPixmap); + if (pix.isNull()) { + KIO::NetAccess::del(KUrl(cachedPixmap), this); + requestClipThumbnail(parentItem->clipId() + '#' + QString::number(pos)); + } + else item->setData(0, Qt::DecorationRole, pix); + } + else requestClipThumbnail(parentItem->clipId() + '#' + QString::number(pos)); } -void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) +void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips) { + if (!m_allClipsProcessed) m_listView->setEnabled(false); m_listView->setSortingEnabled(false); - QTreeWidgetItemIterator it(m_listView); DocClipBase *clip; ProjectItem *item; @@ -1173,15 +1407,23 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) QPainter p(&missingPixmap); p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6)); p.end(); - + + int max = m_doc->clipManager()->clipsCount(); + max = qMax(1, max); + int ct = 0; + while (*it) { + emit displayMessage(i18n("Loading thumbnails"), (int)(100 *(max - ct++) / max)); if ((*it)->type() == PROJECTSUBCLIPTYPE) { // subitem SubProjectItem *sub = static_cast (*it); - if (displayRatioChanged || sub->data(0, Qt::DecorationRole).isNull()) { + if (displayRatioChanged) { item = static_cast ((*it)->parent()); requestClipThumbnail(item->clipId() + '#' + QString::number(sub->zone().x())); } + else if (sub->data(0, Qt::DecorationRole).isNull()) { + getCachedThumbnail(sub); + } ++it; continue; } else if ((*it)->type() == PROJECTFOLDERTYPE) { @@ -1191,17 +1433,28 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) } else { item = static_cast (*it); clip = item->referencedClip(); - if (item->referencedClip()->producer() == NULL) { - if (clip->isPlaceHolder() == false) { + if (item->referencedClip()->getProducer() == NULL) { + bool replace = false; + if (brokenClips.contains(item->clipId())) { + // if this is a proxy clip, disable proxy + item->setProxyStatus(NOJOB); + clip->setProperty("proxy", "-"); + replace = true; + } + if (clip->isPlaceHolder() == false && !item->isProxyRunning()) { QDomElement xml = clip->toXML(); if (fpsChanged) { xml.removeAttribute("out"); xml.removeAttribute("file_hash"); xml.removeAttribute("proxy_out"); } - requestClipInfo(xml, clip->getId()); + if (!replace) replace = xml.attribute("replace") == "1"; + if (replace) { + resetThumbsProducer(clip); + } + m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); } - else { + else if (clip->isPlaceHolder()) { item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled); if (item->data(0, Qt::DecorationRole).isNull()) { item->setData(0, Qt::DecorationRole, missingPixmap); @@ -1214,11 +1467,15 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) item->setData(0, Qt::DecorationRole, pixmap); } } - } else { - if (displayRatioChanged || item->data(0, Qt::DecorationRole).isNull()) + } 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)); @@ -1237,11 +1494,10 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) ++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()) { + m_allClipsProcessed = true; + if (m_render->processingItems() == 0) { + monitorItemEditing(true); slotProcessNextThumbnail(); } } @@ -1353,18 +1609,33 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace) ProjectItem *item = getItemById(id); m_processingClips.removeAll(id); m_thumbnailQueue.removeAll(id); - if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); 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 ()); + } } @@ -1372,11 +1643,13 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) { ProjectItem *item = getItemById(id); if (item) { + kDebug()<<"// Proxy for clip "<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); + item->setProxyStatus(JOBCRASHED); QString path = item->referencedClip()->getProperty("proxy"); KUrl proxyFolder(m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"); @@ -1384,10 +1657,17 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) if (proxyFolder.isParentOf(KUrl(path))) { QFile::remove(path); } + if (item->referencedClip()->getProducer() == NULL) { + // Clip has no valid producer, request it + slotProxyCurrentItem(false, item); + } + else { + // refresh thumbs producer + item->referencedClip()->reloadThumbProducer(); + } } m_processingClips.removeAll(id); m_thumbnailQueue.removeAll(id); - if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } void ProjectList::slotAddColorClip() @@ -1403,7 +1683,6 @@ void ProjectList::slotAddColorClip() TimecodeDisplay *t = new TimecodeDisplay(m_timecode); t->setValue(KdenliveSettings::color_duration()); - t->setTimeCodeFormat(false); dia_ui.clip_durationBox->addWidget(t); dia_ui.clip_color->setColor(KdenliveSettings::colorclipcolor()); @@ -1496,17 +1775,24 @@ QStringList ProjectList::getGroup() const void ProjectList::setDocument(KdenliveDoc *doc) { m_listView->blockSignals(true); + m_abortAllJobs = true; + m_closing = 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_allClipsProcessed = false; m_fps = doc->fps(); m_timecode = doc->timecode(); m_commandStack = doc->commandStack(); m_doc = doc; + m_abortAllJobs = false; + m_closing = false; QMap flist = doc->clipManager()->documentFolderList(); QStringList openedFolders = doc->getExpandedFolders(); @@ -1518,6 +1804,11 @@ void ProjectList::setDocument(KdenliveDoc *doc) } QList list = doc->clipManager()->documentClipList(); + if (list.isEmpty()) { + // blank document + m_refreshed = true; + m_allClipsProcessed = true; + } for (int i = 0; i < list.count(); i++) slotAddClip(list.at(i), false); @@ -1526,7 +1817,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(bool, bool)), this, SLOT(updateAllClips(bool, bool))); + connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool, QStringList)), this, SLOT(updateAllClips(bool, bool, QStringList))); } QList ProjectList::documentClipList() const @@ -1542,7 +1833,6 @@ QDomElement ProjectList::producersList() QDomDocument doc; QDomElement prods = doc.createElement("producerlist"); doc.appendChild(prods); - kDebug() << "//////////// PRO LIST BUILD PRDSLIST "; QTreeWidgetItemIterator it(m_listView); while (*it) { if ((*it)->type() != PROJECTCLIPTYPE) { @@ -1558,14 +1848,14 @@ QDomElement ProjectList::producersList() void ProjectList::slotCheckForEmptyQueue() { - if (m_processingClips.isEmpty() && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) { - if (!m_refreshed) { - emit loadingIsOver(); + if (m_render->processingItems() == 0 && m_thumbnailQueue.isEmpty()) { + if (!m_refreshed && m_allClipsProcessed) { + m_refreshed = true; + m_listView->setEnabled(true); + slotClipSelected(); + QTimer::singleShot(500, this, SIGNAL(loadingIsOver())); emit displayMessage(QString(), -1); } - m_refreshed = true; - m_listView->blockSignals(false); - m_listView->setEnabled(true); updateButtons(); } else if (!m_refreshed) { QTimer::singleShot(300, this, SLOT(slotCheckForEmptyQueue())); @@ -1576,22 +1866,28 @@ void ProjectList::slotCheckForEmptyQueue() 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); } @@ -1628,24 +1924,34 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) return; } QPixmap pix; + QImage img; 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()->extractImage(frame, width, height); + img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height); + else { + img = item->referencedClip()->extractImage(frame, dwidth, height); + } - if (!pix.isNull()) { + if (!pix.isNull() || !img.isNull()) { monitorItemEditing(false); + if (!img.isNull()) { + pix = QPixmap::fromImage(img); + processThumbOverlays(item, pix); + } it->setData(0, Qt::DecorationRole, pix); monitorItemEditing(true); - - if (!isSubItem) - m_doc->cachePixmap(item->getClipHash(), pix); - else - m_doc->cachePixmap(item->getClipHash() + '#' + QString::number(frame), pix); + + QString hash = item->getClipHash(); + if (!hash.isEmpty() && !img.isNull()) { + if (!isSubItem) + m_doc->cacheImage(hash, img); + else + m_doc->cacheImage(hash + '#' + QString::number(frame), img); + } } if (update) emit projectModified(); @@ -1653,33 +1959,31 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) } } -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::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace) { QString toReload; ProjectItem *item = getItemById(clipId); - if (!m_refreshed) { - // we are still finishing to load the document - selectClip = false; - } - m_processingClips.removeAll(clipId); - if (m_infoQueue.isEmpty() && m_processingClips.isEmpty()) m_listView->setEnabled(true); + + int queue = m_render->processingItems(); if (item && producer) { - //m_listView->blockSignals(true); monitorItemEditing(false); DocClipBase *clip = item->referencedClip(); - item->setProperties(properties, metadata); - if (clip->isPlaceHolder() && producer->is_valid()) { - clip->setValid(); + 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(); + // Proxy stuff QString size = properties.value("frame_size"); - if (!useProxy() && clip->getProperty("proxy").isEmpty()) setProxyStatus(item, NOPROXY); - if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") setProxyStatus(item, NOPROXY); - else if (useProxy() && !item->isProxyRunning()) { + if (!useProxy() && clip->getProperty("proxy").isEmpty()) setProxyStatus(item, NOJOB); + if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") setProxyStatus(item, NOJOB); + else if (useProxy() && !item->hasProxy() && !item->isProxyRunning()) { // proxy video and image clips int maxSize; CLIPTYPE t = item->clipType(); @@ -1702,42 +2006,42 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } } - if (!replace && item->data(0, Qt::DecorationRole).isNull()) - requestClipThumbnail(clipId); + if (!replace && m_allClipsProcessed && item->data(0, Qt::DecorationRole).isNull()) { + getCachedThumbnail(item); + } if (!toReload.isEmpty()) item->slotSetToolTip(); - - if (m_listView->isEnabled()) - monitorItemEditing(true); } 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); + if (queue == 0) { + monitorItemEditing(true); + if (item && m_thumbnailQueue.isEmpty()) { + if (!item->hasProxy() || m_render->activeClipId() == item->clipId()) + 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) { + } else if (KdenliveSettings::checkfirstprojectclip() && m_listView->topLevelItemCount() == 1 && m_refreshed && m_allClipsProcessed) { // 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()); + 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 (max > 0) emit displayMessage(i18n("Loading clips"), (int)(100 *(max - queue) / max)); } + if (m_allClipsProcessed) emit processNextThumbnail(); } - if (item && m_listView->isEnabled() && replace) { - // update clip in clip monitor - if (item->isSelected() && m_listView->selectedItems().count() == 1) - emit clipSelected(item->referencedClip()); - //TODO: Make sure the line below has no side effect - toReload = clipId; - } + if (!item) { + // no item for producer, delete it + delete producer; + return; + } + if (replace) toReload = clipId; 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) @@ -1819,16 +2123,29 @@ 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) { ProjectItem *item = getItemById(clipId); + if (item && !img.isNull()) { + QPixmap pix = QPixmap::fromImage(img); + processThumbOverlays(item, pix); + monitorItemEditing(false); + item->setData(0, Qt::DecorationRole, pix); + monitorItemEditing(true); + QString hash = item->getClipHash(); + if (!hash.isEmpty()) m_doc->cacheImage(hash, img); + } +} + +void ProjectList::slotReplyGetImage(const QString &clipId, const QString &name, int width, int height) +{ + // For clips that have a generic icon (like audio clips...) + ProjectItem *item = getItemById(clipId); + QPixmap pix = KIcon(name).pixmap(QSize(width, height)); if (item && !pix.isNull()) { monitorItemEditing(false); item->setData(0, Qt::DecorationRole, pix); monitorItemEditing(true); - m_doc->cachePixmap(item->getClipHash(), pix); - if (m_listView->isEnabled()) - m_listView->blockSignals(false); } } @@ -1910,7 +2227,7 @@ void ProjectList::slotSelectClip(const QString &ix) m_deleteButton->defaultAction()->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); - m_proxyAction->setEnabled(useProxy()); + m_stabilizeAction->setEnabled(true); if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -1976,7 +2293,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) @@ -2026,9 +2343,10 @@ 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()->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); + QImage img = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2); + sub->setData(0, Qt::DecorationRole, QPixmap::fromImage(img)); + QString hash = clip->getClipHash(); + if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(in), img); monitorItemEditing(true); } emit projectModified(); @@ -2095,9 +2413,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) @@ -2159,205 +2475,195 @@ void ProjectList::slotCreateProxy(const QString id) if (!item || item->isProxyRunning() || item->referencedClip()->isPlaceHolder()) return; QString path = item->referencedClip()->getProperty("proxy"); if (path.isEmpty()) { - setProxyStatus(path, PROXYCRASHED); + setProxyStatus(item, JOBCRASHED); return; } - setProxyStatus(path, PROXYWAITING); + setProxyStatus(item, JOBWAITING); if (m_abortProxy.contains(path)) m_abortProxy.removeAll(path); if (m_processingProxy.contains(path)) { // Proxy is already being generated return; } - if (QFile::exists(path)) { + if (QFileInfo(path).size() > 0) { // Proxy already created - setProxyStatus(path, PROXYDONE); + setProxyStatus(item, JOBDONE); slotGotProxy(path); return; } m_processingProxy.append(path); - QtConcurrent::run(this, &ProjectList::slotGenerateProxy, path, item->clipUrl().path(), item->clipType(), QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt()); + + /*PROXYINFO info; + info.dest = path; + info.src = item->clipUrl().path(); + info.type = item->clipType(); + info.exif = QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt();*/ + ProxyJob *job = new ProxyJob(PROXYJOB, item->clipType(), item->clipId(), QStringList() << path << item->clipUrl().path() << item->referencedClip()->producerProperty("_exif_orientation") << m_doc->getDocumentProperty("proxyparams").simplified() << QString::number(m_render->frameRenderWidth()) << QString::number(m_render->renderHeight())); + m_jobList.append(job); + int ct = 0; + if (!m_proxyThreads.futures().isEmpty()) { + // Remove inactive threads + QList > futures = m_proxyThreads.futures(); + m_proxyThreads.clearFutures(); + for (int i = 0; i < futures.count(); i++) + if (!futures.at(i).isFinished()) { + m_proxyThreads.addFuture(futures.at(i)); + ct++; + } + } + emit jobCount(ct + m_jobList.count()); + + if (m_proxyThreads.futures().isEmpty() || m_proxyThreads.futures().count() < KdenliveSettings::proxythreads()) m_proxyThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotGenerateProxy)); } void ProjectList::slotAbortProxy(const QString id, const QString path) { QTreeWidgetItemIterator it(m_listView); ProjectItem *item = getItemById(id); - setProxyStatus(item, NOPROXY); - slotGotProxy(item); + if (!item) return; if (!path.isEmpty() && m_processingProxy.contains(path)) { m_abortProxy << path; - setProxyStatus(path, NOPROXY); + } + else { + // Should only be done if we were already using a proxy producer + if (!item->isProxyRunning()) slotGotProxy(item); } } -void ProjectList::slotGenerateProxy(const QString destPath, const QString sourcePath, int clipType, int exif_orientation) +void ProjectList::slotGenerateProxy() { - emit projectModified(); - // Make sure proxy path is writable - QFile file(destPath); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - setProxyStatus(destPath, PROXYCRASHED); - return; - } - file.close(); - QFile::remove(destPath); - - setProxyStatus(destPath, CREATINGPROXY); - - // Special case: playlist clips (.mlt or .kdenlive project files) - if (clipType == PLAYLIST) { - // change FFmpeg params to MLT format - QStringList parameters; - parameters << sourcePath; - parameters << "-consumer" << "avformat:" + destPath; - QStringList params = m_doc->getDocumentProperty("proxyparams").simplified().split('-', QString::SkipEmptyParts); - - foreach(QString s, params) { - s = s.simplified(); - if (s.count(' ') == 0) { - s.append("=1"); + while (!m_jobList.isEmpty() && !m_abortAllJobs) { + emit projectModified(); + AbstractClipJob *job = m_jobList.takeFirst(); + // Get jobs count + int ct = 0; + QList > futures = m_proxyThreads.futures(); + for (int i = 0; i < futures.count(); i++) + if (futures.at(i).isRunning()) { + ct++; + } + emit jobCount(ct + m_jobList.count()); + + if (job->jobType == PROXYJOB) { + //ProxyJob *pjob = static_cast (job); + kDebug()<<"// STARTING JOB: "<destination(); + if (m_abortProxy.contains(job->destination())) { + m_abortProxy.removeAll(job->destination()); + m_processingProxy.removeAll(job->destination()); + emit cancelRunningJob(job->clipId(), job->cancelProperties()); + delete job; + continue; } - else s.replace(' ', '='); - parameters << s; } - 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(sourcePath); - parameters << "aspect=" + QString::number(display_ratio); - - //kDebug()<<"TRANSCOD: "< processingItems; + ProjectItem *item = getItemById(job->clipId()); + processingItems.append(item); + + /*while (*it && !m_abortAllJobs) { + if ((*it)->type() == PROJECTCLIPTYPE) { + ProjectItem *item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == job->destination()) { + processingItems.append(item); + } + } + ++it; + }*/ + + // Make sure proxy path is writable + QFile file(job->destination()); + if (!file.open(QIODevice::WriteOnly)) { + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), JOBCRASHED); + m_processingProxy.removeAll(job->destination()); + delete job; + continue; + } + file.close(); + QFile::remove(job->destination()); + + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), CREATINGJOB, 0); //, job->description); + bool success; + QProcess *jobProcess = job->startJob(&success); + int result = -1; - while (myProcess.state() != QProcess::NotRunning) { + if (jobProcess == NULL) { + // job is finished + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), success ? JOBDONE : JOBCRASHED); + if (success) { + slotGotProxy(job->destination()); + } + else { + QFile::remove(job->destination()); + } + m_abortProxy.removeAll(job->destination()); + m_processingProxy.removeAll(job->destination()); + delete job; + continue; + } + else while (jobProcess->state() != QProcess::NotRunning) { // building proxy file - if (m_abortProxy.contains(destPath)) { - myProcess.close(); - myProcess.waitForFinished(); - m_abortProxy.removeAll(destPath); - m_processingProxy.removeAll(destPath); - QFile::remove(destPath); - setProxyStatus(destPath, NOPROXY); + if (m_abortProxy.contains(job->destination()) || m_abortAllJobs) { + jobProcess->close(); + jobProcess->waitForFinished(); + QFile::remove(job->destination()); + m_abortProxy.removeAll(job->destination()); + m_processingProxy.removeAll(job->destination()); + if (!m_closing) { + emit cancelRunningJob(job->clipId(), job->cancelProperties()); + /*for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), NOJOB);*/ + } + else continue; result = -2; - } - myProcess.waitForFinished(500); + else { + int progress = job->processLogInfo(); + if (progress > -1) processLogInfo(processingItems, progress); + } + jobProcess->waitForFinished(500); } - myProcess.waitForFinished(); - m_processingProxy.removeAll(destPath); - if (result == -1) result = myProcess.exitStatus(); - if (result == 0) { + jobProcess->waitForFinished(); + m_processingProxy.removeAll(job->destination()); + if (result == -1) result = jobProcess->exitStatus(); + + if (result != -2 && QFileInfo(job->destination()).size() == 0) { + result = QProcess::CrashExit; + } + + if (result == QProcess::NormalExit) { // proxy successfully created - setProxyStatus(destPath, PROXYDONE); - slotGotProxy(destPath); + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), JOBDONE); + slotGotProxy(job->destination()); } - else if (result == 1) { + else if (result == QProcess::CrashExit) { // Proxy process crashed - QFile::remove(destPath); - setProxyStatus(destPath, PROXYCRASHED); - } - - } - - if (clipType == IMAGE) { - // Image proxy - QImage i(sourcePath); - if (i.isNull()) { - // Cannot load image - setProxyStatus(destPath, PROXYCRASHED); - return; + QFile::remove(job->destination()); + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), JOBCRASHED); } - QImage proxy; - // Images are scaled to profile size. - //TODO: Make it be configurable? - if (i.width() > i.height()) proxy = i.scaledToWidth(m_render->frameRenderWidth()); - else proxy = i.scaledToHeight(m_render->renderHeight()); - if (exif_orientation > 1) { - // Rotate image according to exif data - QImage processed; - QMatrix matrix; - - switch ( exif_orientation ) { - case 2: - matrix.scale( -1, 1 ); - break; - case 3: - matrix.rotate( 180 ); - break; - case 4: - matrix.scale( 1, -1 ); - break; - case 5: - matrix.rotate( 270 ); - matrix.scale( -1, 1 ); - break; - case 6: - matrix.rotate( 90 ); - break; - case 7: - matrix.rotate( 90 ); - matrix.scale( -1, 1 ); - break; - case 8: - matrix.rotate( 270 ); - break; - } - processed = proxy.transformed( matrix ); - processed.save(destPath); - } - else proxy.save(destPath); - setProxyStatus(destPath, PROXYDONE); - slotGotProxy(destPath); - m_abortProxy.removeAll(destPath); - m_processingProxy.removeAll(destPath); - return; + delete job; + continue; } - - QStringList parameters; - parameters << "-i" << sourcePath; - 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 << destPath; - kDebug()<<"// STARTING PROXY GEN: "< > futures = m_proxyThreads.futures(); + for (int i = 0; i < futures.count(); i++) + if (futures.at(i).isRunning()) { + ct++; } - myProcess.waitForFinished(500); - } - myProcess.waitForFinished(); - if (result == -1) result = myProcess.exitStatus(); - if (result == 0) { - // proxy successfully created - setProxyStatus(destPath, PROXYDONE); - slotGotProxy(destPath); - } - else if (result == 1) { - // Proxy process crashed - QFile::remove(destPath); - setProxyStatus(destPath, PROXYCRASHED); - } - m_abortProxy.removeAll(destPath); - m_processingProxy.removeAll(destPath); + emit jobCount(ct + m_jobList.count()); +} + + +void ProjectList::processLogInfo(QList items, int progress) +{ + for (int i = 0; i < items.count(); i++) + setProxyStatus(items.at(i), CREATINGJOB, progress); } void ProjectList::updateProxyConfig() @@ -2399,7 +2705,7 @@ void ProjectList::updateProxyConfig() newProps.insert("replace", "1"); // insert required duration for proxy newProps.insert("proxy_out", item->referencedClip()->producerProperty("out")); - new EditClipCommand(this, item->clipId(), item->referencedClip()->properties(), newProps, true, command); + new EditClipCommand(this, item->clipId(), item->referencedClip()->currentProperties(newProps), newProps, true, command); } } else if (t == IMAGE && item->referencedClip() != NULL) { @@ -2429,16 +2735,42 @@ 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) +void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) { - QList list = m_listView->selectedItems(); + QList list; + if (itemToProxy == NULL) list = m_listView->selectedItems(); + else list << itemToProxy; + + // expand list (folders, subclips) to get real clips QTreeWidgetItem *listItem; + QList clipList; + for (int i = 0; i < list.count(); i++) { + listItem = list.at(i); + if (listItem->type() == PROJECTFOLDERTYPE) { + for (int j = 0; j < listItem->childCount(); j++) { + QTreeWidgetItem *sub = listItem->child(j); + if (sub->type() == PROJECTCLIPTYPE) { + ProjectItem *item = static_cast (sub); + if (!clipList.contains(item)) clipList.append(item); + } + } + } + else if (listItem->type() == PROJECTSUBCLIPTYPE) { + QTreeWidgetItem *sub = listItem->parent(); + ProjectItem *item = static_cast (sub); + if (!clipList.contains(item)) clipList.append(item); + } + else if (listItem->type() == PROJECTCLIPTYPE) { + ProjectItem *item = static_cast (listItem); + if (!clipList.contains(item)) clipList.append(item); + } + } + QUndoCommand *command = new QUndoCommand(); - if (doProxy) command->setText(i18np("Add proxy clip", "Add proxy clips", list.count())); - else command->setText(i18np("Remove proxy clip", "Remove proxy clips", list.count())); + if (doProxy) command->setText(i18np("Add proxy clip", "Add proxy clips", clipList.count())); + else command->setText(i18np("Remove proxy clip", "Remove proxy clips", clipList.count())); // Make sure the proxy folder exists QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"; @@ -2447,37 +2779,42 @@ void ProjectList::slotProxyCurrentItem(bool doProxy) QMap newProps; QMap oldProps; if (!doProxy) newProps.insert("proxy", "-"); - for (int i = 0; i < list.count(); i++) { - listItem = list.at(i); - if (listItem->type() == PROJECTFOLDERTYPE) { - for (int j = 0; j < listItem->childCount(); j++) { - QTreeWidgetItem *sub = listItem->child(j); - if (!list.contains(sub)) list.append(sub); + for (int i = 0; i < clipList.count(); i++) { + ProjectItem *item = clipList.at(i); + CLIPTYPE t = item->clipType(); + if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) { + if ((doProxy && item->hasProxy()) || (!doProxy && !item->hasProxy() && item->referencedClip()->getProducer() != NULL)) continue; + DocClipBase *clip = item->referencedClip(); + if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) { + kDebug()<<"//// TRYING TO PROXY: "<clipId()<<", but it is busy"; + continue; } - } - if (listItem->type() == PROJECTCLIPTYPE) { - ProjectItem *item = static_cast (listItem); - CLIPTYPE t = item->clipType(); - if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) { - oldProps = item->referencedClip()->properties(); - if (doProxy) { - newProps.clear(); - QString path = proxydir + item->referencedClip()->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); - // insert required duration for proxy - newProps.insert("proxy_out", item->referencedClip()->producerProperty("out")); - newProps.insert("proxy", path); - // We need to insert empty proxy so that undo will work - oldProps.insert("proxy", QString()); - } - new EditClipCommand(this, item->clipId(), oldProps, newProps, true, command); + + //oldProps = clip->properties(); + if (doProxy) { + newProps.clear(); + QString path = proxydir + clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); + // insert required duration for proxy + 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()); + } + else if (item->referencedClip()->getProducer() == NULL) { + // Force clip reload + kDebug()<<"// CLIP HAD NULL PROD------------"; + newProps.insert("resource", item->referencedClip()->getProperty("resource")); } + // We need to insert empty proxy so that undo will work + oldProps = clip->currentProperties(newProps); + if (doProxy) oldProps.insert("proxy", "-"); + new EditClipCommand(this, item->clipId(), oldProps, newProps, true, command); } } 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); } @@ -2494,7 +2831,7 @@ void ProjectList::slotDeleteProxy(const QString proxyPath) if (item->referencedClip()->getProperty("proxy") == proxyPath) { QMap props; props.insert("proxy", QString()); - new EditClipCommand(this, item->clipId(), item->referencedClip()->properties(), props, true, proxyCommand); + new EditClipCommand(this, item->clipId(), item->referencedClip()->currentProperties(props), props, true, proxyCommand); } } @@ -2507,27 +2844,27 @@ void ProjectList::slotDeleteProxy(const QString proxyPath) QFile::remove(proxyPath); } -void ProjectList::setProxyStatus(const QString proxyPath, PROXYSTATUS status) +void ProjectList::setProxyStatus(ProjectItem *item, CLIPJOBSTATUS status, int progress) { - if (proxyPath.isEmpty()) 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); - } + if (item == NULL || m_abortAllJobs) return; + monitorItemEditing(false); + item->setProxyStatus(status, progress); + if (status == JOBCRASHED) { + DocClipBase *clip = item->referencedClip(); + if (!clip) { + kDebug()<<"// PROXY CRASHED"; + } + else if (clip->getProducer() == NULL && !clip->isPlaceHolder()) { + // disable proxy and fetch real clip + clip->setProperty("proxy", "-"); + QDomElement xml = clip->toXML(); + m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), true); + } + else { + // Disable proxy for this clip + clip->setProperty("proxy", "-"); } - ++it; } -} - -void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status) -{ - if (item == NULL) return; - monitorItemEditing(false); - item->setProxyStatus(status); monitorItemEditing(true); } @@ -2556,4 +2893,58 @@ QStringList ProjectList::expandedFolders() const return result; } +void ProjectList::processThumbOverlays(ProjectItem *item, QPixmap &pix) +{ + if (item->hasProxy()) { + QPainter p(&pix); + QColor c = QPalette().base().color(); + c.setAlpha(160); + QBrush br(c); + p.setBrush(br); + p.setPen(Qt::NoPen); + QRect r(1, 1, 10, 10); + p.drawRect(r); + p.setPen(QPalette().text().color()); + p.drawText(r, Qt::AlignCenter, i18nc("The first letter of Proxy, used as abbreviation", "P")); + } +} + +void ProjectList::slotCancelJobs() +{ + m_abortAllJobs = true; + m_proxyThreads.waitForFinished(); + m_proxyThreads.clearFutures(); + QUndoCommand *command = new QUndoCommand(); + command->setText(i18np("Cancel job", "Cancel jobs", m_jobList.count())); + for (int i = 0; i < m_jobList.count(); i++) { + ProjectItem *item = getItemById(m_jobList.at(i)->clipId()); + if (!item || !item->referencedClip()) continue; + QMap newProps = m_jobList.at(i)->cancelProperties(); + if (newProps.isEmpty()) continue; + QMap oldProps = item->referencedClip()->currentProperties(newProps); + new EditClipCommand(this, m_jobList.at(i)->clipId(), oldProps, newProps, true, command); + } + if (command->childCount() > 0) { + m_doc->commandStack()->push(command); + } + else delete command; + if (!m_jobList.isEmpty()) qDeleteAll(m_jobList); + m_processingProxy.clear(); + m_jobList.clear(); + m_abortAllJobs = false; + m_infoLabel->slotSetJobCount(0); +} + +void ProjectList::slotCancelRunningJob(const QString id, stringMap newProps) +{ + if (newProps.isEmpty()) return; + ProjectItem *item = getItemById(id); + if (!item || !item->referencedClip()) return; + QMap oldProps = item->referencedClip()->currentProperties(newProps); + if (newProps == oldProps) return; + QMapIterator i(oldProps); + EditClipCommand *command = new EditClipCommand(this, id, oldProps, newProps, true); + m_commandStack->push(command); +} + #include "projectlist.moc"