#include "commands/addfoldercommand.h"
#include "projecttree/proxyclipjob.h"
#include "projecttree/cutclipjob.h"
+#include "projecttree/meltjob.h"
#include "kdenlivesettings.h"
#include "slideshowclip.h"
#include "ui_colorclip_ui.h"
#include <KActionCollection>
#include <KUrlRequester>
-#ifdef NEPOMUK
+#ifdef USE_NEPOMUK
#include <nepomuk/global.h>
#include <nepomuk/resourcemanager.h>
+#include <Nepomuk/Resource>
//#include <nepomuk/tag.h>
#endif
m_commandStack(NULL),
m_openAction(NULL),
m_reloadAction(NULL),
- m_stabilizeAction(NULL),
+ m_extractAudioAction(NULL),
m_transcodeAction(NULL),
+ m_stabilizeAction(NULL),
m_doc(NULL),
m_refreshed(false),
m_allClipsProcessed(false),
m_infoLabel = new SmallInfoLabel(this);
connect(this, SIGNAL(jobCount(int)), m_infoLabel, SLOT(slotSetJobCount(int)));
m_jobsMenu = new QMenu(this);
+ connect(m_jobsMenu, SIGNAL(aboutToShow()), this, SLOT(slotPrepareJobsMenu()));
QAction *cancelJobs = new QAction(i18n("Cancel All Jobs"), this);
cancelJobs->setCheckable(false);
connect(cancelJobs, SIGNAL(triggered()), this, SLOT(slotCancelJobs()));
+ connect(this, SIGNAL(checkJobProcess()), this, SLOT(slotCheckJobProcess()));
+ m_discardCurrentClipJobs = new QAction(i18n("Cancel Current Clip Jobs"), this);
+ m_discardCurrentClipJobs->setCheckable(false);
+ connect(m_discardCurrentClipJobs, SIGNAL(triggered()), this, SLOT(slotDiscardClipJobs()));
m_jobsMenu->addAction(cancelJobs);
+ m_jobsMenu->addAction(m_discardCurrentClipJobs);
m_infoLabel->setMenu(m_jobsMenu);
box->addWidget(m_infoLabel);
connect(m_listView, SIGNAL(showProperties(DocClipBase *)), this, SIGNAL(showClipProperties(DocClipBase *)));
connect(this, SIGNAL(cancelRunningJob(const QString, stringMap )), this, SLOT(slotCancelRunningJob(const QString, stringMap)));
- connect(this, SIGNAL(processLog(ProjectItem *, int , int)), this, SLOT(slotProcessLog(ProjectItem *, int , int)));
+ connect(this, SIGNAL(processLog(const QString, int , int, const QString)), this, SLOT(slotProcessLog(const QString, int , int, const QString)));
+
+ connect(this, SIGNAL(updateJobStatus(const QString &, int, int, const QString &, const QString &, const QString)), this, SLOT(slotUpdateJobStatus(const QString &, int, int, const QString &, const QString &, const QString)));
+
+ connect(this, SIGNAL(gotProxy(const QString)), this, SLOT(slotGotProxyForId(const QString)));
- connect(this, SIGNAL(jobCrashed(ProjectItem *, const QString &, const QString &, const QString)), this, SLOT(slotJobCrashed(ProjectItem *, const QString &, const QString &, const QString)));
-
m_listViewDelegate = new ItemDelegate(m_listView);
m_listView->setItemDelegate(m_listViewDelegate);
-#ifdef NEPOMUK
+#ifdef USE_NEPOMUK
if (KdenliveSettings::activate_nepomuk()) {
Nepomuk::ResourceManager::instance()->init();
if (!Nepomuk::ResourceManager::instance()->initialized()) {
ProjectList::~ProjectList()
{
m_abortAllJobs = true;
+ for (int i = 0; i < m_jobList.count(); i++) {
+ m_jobList.at(i)->setStatus(JOBABORTED);
+ }
m_closing = true;
m_thumbnailQueue.clear();
+ m_jobThreads.waitForFinished();
+ m_jobThreads.clearFutures();
if (!m_jobList.isEmpty()) qDeleteAll(m_jobList);
m_jobList.clear();
delete m_menu;
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("extractAudioMenu") && menus.value("extractAudioMenu") ){
+ QMenu* extractAudioMenu = menus.value("extractAudioMenu");
+ m_menu->addMenu(extractAudioMenu);
+ m_extractAudioAction = extractAudioMenu;
}
+ 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);
continue;
}
item = static_cast <ProjectItem *>(selected.at(i));
- if (item && !hasPendingProxy(item)) {
+ if (item && !hasPendingJob(item, PROXYJOB)) {
DocClipBase *clip = item->referencedClip();
if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) {
kDebug()<<"//// TRYING TO RELOAD: "<<item->clipId()<<", but it is busy";
m_deleteButton->defaultAction()->setEnabled(true);
m_openAction->setEnabled(false);
m_reloadAction->setEnabled(false);
+ m_extractAudioAction->setEnabled(false);
m_transcodeAction->setEnabled(false);
m_stabilizeAction->setEnabled(false);
} else {
if (clip == NULL) kDebug() << "-----------ERROR";
SubProjectItem *sub = static_cast <SubProjectItem*>(item);
emit clipSelected(clip->referencedClip(), sub->zone());
+ m_extractAudioAction->setEnabled(false);
m_transcodeAction->setEnabled(false);
m_stabilizeAction->setEnabled(false);
m_reloadAction->setEnabled(false);
m_editButton->defaultAction()->setEnabled(true);
m_deleteButton->defaultAction()->setEnabled(true);
m_reloadAction->setEnabled(true);
+ m_extractAudioAction->setEnabled(true);
m_transcodeAction->setEnabled(true);
m_stabilizeAction->setEnabled(true);
if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
m_deleteButton->defaultAction()->setEnabled(false);
m_openAction->setEnabled(false);
m_reloadAction->setEnabled(false);
+ m_extractAudioAction->setEnabled(true);
m_transcodeAction->setEnabled(false);
m_stabilizeAction->setEnabled(false);
}
{
if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) {
m_transcodeAction->setEnabled(false);
+ m_extractAudioAction->setEnabled(false);
return;
}
m_transcodeAction->setEnabled(true);
+ m_extractAudioAction->setEnabled(true);
QList<QAction *> transcodeActions = m_transcodeAction->actions();
QStringList data;
QString condition;
clip->setProperties(properties);
if (properties.contains("proxy")) {
if (properties.value("proxy") == "-" || properties.value("proxy").isEmpty())
- clip->setJobStatus(NOJOB);
+ // this should only apply to proxy jobs
+ clip->setConditionalJobStatus(NOJOB, PROXYJOB);
}
if (properties.contains("name")) {
monitorItemEditing(false);
monitorItemEditing(false);
clip->setText(1, properties.value("description"));
monitorItemEditing(true);
-#ifdef NEPOMUK
+#ifdef USE_NEPOMUK
if (KdenliveSettings::activate_nepomuk() && (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST)) {
// Use Nepomuk system to store clip description
Nepomuk::Resource f(clip->clipUrl().path());
m_editButton->defaultAction()->setEnabled(enable);
m_deleteButton->defaultAction()->setEnabled(enable);
m_reloadAction->setEnabled(enable);
+ m_extractAudioAction->setEnabled(enable);
m_transcodeAction->setEnabled(enable);
m_stabilizeAction->setEnabled(enable);
if (enable) {
ProjectItem *clip = NULL;
if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
clip = static_cast <ProjectItem*>(item->parent());
+ m_extractAudioAction->setEnabled(false);
m_transcodeAction->setEnabled(false);
m_stabilizeAction->setEnabled(false);
adjustProxyActions(clip);
// Display uses in timeline
emit findInTimeline(clip->clipId());
} else {
+ m_extractAudioAction->setEnabled(false);
m_transcodeAction->setEnabled(false);
m_stabilizeAction->setEnabled(false);
}
return;
}
deleteJobsForClip(clipId);
- if (item->isProxyRunning()) m_abortProxy.append(item->referencedClip()->getProperty("proxy"));
m_listView->blockSignals(true);
QTreeWidgetItem *newSelectedItem = m_listView->itemAbove(item);
if (!newSelectedItem)
}*/
KUrl url = clip->fileURL();
-#ifdef NEPOMUK
- if (!url.isEmpty() && KdenliveSettings::activate_nepomuk()) {
+#ifdef USE_NEPOMUK
+ if (!url.isEmpty() && KdenliveSettings::activate_nepomuk() && clip->getProperty("description").isEmpty()) {
// if file has Nepomuk comment, use it
Nepomuk::Resource f(url.path());
QString annotation = f.description();
- if (!annotation.isEmpty()) item->setText(1, annotation);
+ if (!annotation.isEmpty()) {
+ item->setText(1, annotation);
+ clip->setProperty("description", annotation);
+ }
item->setText(2, QString::number(f.rating()));
}
#endif
QTreeWidgetItemIterator it(m_listView);
ProjectItem *item;
- while (*it && !m_abortAllJobs) {
+ while (*it && !m_closing) {
if ((*it)->type() == PROJECTCLIPTYPE) {
item = static_cast <ProjectItem *>(*it);
if (item->referencedClip()->getProperty("proxy") == proxyPath)
}
}
+void ProjectList::slotGotProxyForId(const QString id)
+{
+ if (m_closing) return;
+ ProjectItem *item = getItemById(id);
+ slotGotProxy(item);
+}
+
void ProjectList::slotGotProxy(ProjectItem *item)
{
if (item == NULL) return;
{
m_listView->blockSignals(true);
m_abortAllJobs = true;
+ for (int i = 0; i < m_jobList.count(); i++) {
+ m_jobList.at(i)->setStatus(JOBABORTED);
+ }
m_closing = true;
- m_proxyThreads.waitForFinished();
- m_proxyThreads.clearFutures();
+ m_jobThreads.waitForFinished();
+ m_jobThreads.clearFutures();
m_thumbnailQueue.clear();
if (!m_jobList.isEmpty()) qDeleteAll(m_jobList);
m_jobList.clear();
bool replace = false;
if (brokenClips.contains(item->clipId())) {
// if this is a proxy clip, disable proxy
- item->setJobStatus(NOJOB);
+ item->setConditionalJobStatus(NOJOB, PROXYJOB);
+ discardJobs(item->clipId(), PROXYJOB);
clip->setProperty("proxy", "-");
replace = true;
}
- if (clip->isPlaceHolder() == false && !hasPendingProxy(item)) {
+ if (clip->isPlaceHolder() == false && !hasPendingJob(item, PROXYJOB)) {
QDomElement xml = clip->toXML();
if (fpsChanged) {
xml.removeAttribute("out");
void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
{
ProjectItem *item = getItemById(id);
- m_processingClips.removeAll(id);
m_thumbnailQueue.removeAll(id);
if (item) {
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
kDebug() << "Proxy duration is wrong, try changing transcoding parameters.";
emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2);
}
- slotJobCrashed(item, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings");
+ slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings");
QString path = item->referencedClip()->getProperty("proxy");
KUrl proxyFolder(m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/");
item->referencedClip()->reloadThumbProducer();
}
}
- m_processingClips.removeAll(id);
m_thumbnailQueue.removeAll(id);
}
{
m_listView->blockSignals(true);
m_abortAllJobs = true;
+ for (int i = 0; i < m_jobList.count(); i++) {
+ m_jobList.at(i)->setStatus(JOBABORTED);
+ }
m_closing = true;
- m_proxyThreads.waitForFinished();
- m_proxyThreads.clearFutures();
+ m_jobThreads.waitForFinished();
+ m_jobThreads.clearFutures();
m_thumbnailQueue.clear();
m_listView->clear();
- m_processingClips.clear();
m_listView->setSortingEnabled(false);
emit clipSelected(NULL);
{
QString toReload;
ProjectItem *item = getItemById(clipId);
-
int queue = m_render->processingItems();
if (item && producer) {
monitorItemEditing(false);
// Proxy stuff
QString size = properties.value("frame_size");
- if (!useProxy() && clip->getProperty("proxy").isEmpty()) setJobStatus(item, NOJOB);
- if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") setJobStatus(item, NOJOB);
- else if (useProxy() && !item->hasProxy() && !hasPendingProxy(item)) {
+ if (!useProxy() && clip->getProperty("proxy").isEmpty()) {
+ item->setConditionalJobStatus(NOJOB, PROXYJOB);
+ discardJobs(clipId, PROXYJOB);
+ }
+ if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") {
+ item->setConditionalJobStatus(NOJOB, PROXYJOB);
+ discardJobs(clipId, PROXYJOB);
+ }
+ else if (useProxy() && !item->hasProxy() && !hasPendingJob(item, PROXYJOB)) {
// proxy video and image clips
int maxSize;
CLIPTYPE t = item->clipType();
QString size = item->referencedClip()->getProperty("frame_size");
int width = size.section('x', 0, 0).toInt();
int height = size.section('x', -1).toInt();
+ // Fix some avchd clips tht report a wrong size (1920x1088)
+ if (height == 1088) height = 1080;
double fps = item->referencedClip()->getProperty("fps").toDouble();
double par = item->referencedClip()->getProperty("aspect_ratio").toDouble();
if (item->clipType() == IMAGE || item->clipType() == AV || item->clipType() == VIDEO) {
m_editButton->defaultAction()->setEnabled(true);
m_deleteButton->defaultAction()->setEnabled(true);
m_reloadAction->setEnabled(true);
+ m_extractAudioAction->setEnabled(true);
m_transcodeAction->setEnabled(true);
m_stabilizeAction->setEnabled(true);
if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
return result;
}
+QStringList ProjectList::getConditionalIds(const QString &condition) const
+{
+ QStringList result;
+ ProjectItem *item;
+ QList<QTreeWidgetItem *> list = m_listView->selectedItems();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->type() == PROJECTFOLDERTYPE)
+ continue;
+ if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
+ // subitem
+ item = static_cast <ProjectItem*>(list.at(i)->parent());
+ } else {
+ item = static_cast <ProjectItem*>(list.at(i));
+ }
+ if (item == NULL || item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT)
+ continue;
+ DocClipBase *clip = item->referencedClip();
+ if (!condition.isEmpty()) {
+ if (condition.startsWith("vcodec") && !clip->hasVideoCodec(condition.section('=', 1, 1)))
+ continue;
+ else if (condition.startsWith("acodec") && !clip->hasAudioCodec(condition.section('=', 1, 1)))
+ continue;
+ }
+ result.append(item->clipId());
+ }
+ return result;
+}
+
void ProjectList::regenerateTemplate(const QString &id)
{
ProjectItem *clip = getItemById(id);
void ProjectList::slotCreateProxy(const QString id)
{
ProjectItem *item = getItemById(id);
- if (!item || hasPendingProxy(item) || item->referencedClip()->isPlaceHolder()) return;
+ if (!item || hasPendingJob(item, PROXYJOB) || item->referencedClip()->isPlaceHolder()) return;
QString path = item->referencedClip()->getProperty("proxy");
if (path.isEmpty()) {
- jobCrashed(item, i18n("Failed to create proxy, empty path."));
+ slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy, empty path."));
return;
}
- if (m_abortProxy.contains(path)) m_abortProxy.removeAll(path);
- if (m_processingProxy.contains(path)) {
- // Proxy is already being generated
+ ProxyJob *job = new ProxyJob(item->clipType(), id, 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()));
+ if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+ delete job;
return;
}
+
if (QFileInfo(path).size() > 0) {
// Proxy already created
- setJobStatus(item, JOBDONE);
+ setJobStatus(item, PROXYJOB, JOBDONE);
slotGotProxy(path);
return;
}
- m_processingProxy.append(path);
- ProxyJob *job = new ProxyJob(item->clipType(), id, 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);
- if (!item->isJobRunning()) setJobStatus(item, JOBWAITING, 0, job->jobType, job->statusMessage(JOBWAITING));
-
- startJobProcess();
+ setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+ slotCheckJobProcess();
}
void ProjectList::slotCutClipJob(const QString &id, QPoint zone)
QDialog *d = new QDialog(this);
Ui::CutJobDialog_UI ui;
ui.setupUi(d);
+ ui.extra_params->setVisible(false);
ui.add_clip->setChecked(KdenliveSettings::add_clip_cut());
ui.file_url->fileDialog()->setOperationMode(KFileDialog::Saving);
+ ui.extra_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
ui.file_url->setUrl(KUrl(dest));
+ ui.button_more->setIcon(KIcon("configure"));
+ ui.extra_params->setPlainText("-acodec copy -vcodec copy");
QString mess = i18n("Extracting %1 out of %2", timeOut, Timecode::getStringTimecode(max, clipFps, true));
ui.info_label->setText(mess);
if (d->exec() != QDialog::Accepted) {
KdenliveSettings::setAdd_clip_cut(ui.add_clip->isChecked());
delete d;
- m_processingProxy.append(dest);
QStringList jobParams;
jobParams << dest << item->clipUrl().path() << timeIn << timeOut << QString::number(duration) << QString::number(KdenliveSettings::add_clip_cut());
if (!extraParams.isEmpty()) jobParams << extraParams;
CutClipJob *job = new CutClipJob(item->clipType(), id, jobParams);
+ if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+ delete job;
+ return;
+ }
m_jobList.append(job);
- if (!item->isJobRunning()) setJobStatus(item, JOBWAITING, 0, job->jobType, job->statusMessage(JOBWAITING));
+ setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+
+ slotCheckJobProcess();
+}
+
+void ProjectList::slotTranscodeClipJob(QStringList ids, QString params, QString desc)
+{
+ QStringList existingFiles;
+ foreach(const QString &id, ids) {
+ ProjectItem *item = getItemById(id);
+ if (!item) continue;
+ QString newFile = params.section(' ', -1).replace("%1", item->clipUrl().path());
+ if (QFile::exists(newFile)) existingFiles << newFile;
+ }
+ if (!existingFiles.isEmpty()) {
+ if (KMessageBox::warningContinueCancelList(this, i18n("The transcoding job will overwrite the following files:"), existingFiles) == KMessageBox::Cancel) return;
+ }
+
+ QDialog *d = new QDialog(this);
+ Ui::CutJobDialog_UI ui;
+ ui.setupUi(d);
+ d->setWindowTitle(i18n("Transcoding"));
+ ui.destination_label->setVisible(false);
+ ui.extra_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
+ ui.file_url->setVisible(false);
+ ui.extra_params->setVisible(false);
+ ui.button_more->setIcon(KIcon("configure"));
+ ui.add_clip->setChecked(KdenliveSettings::add_clip_cut());
+ ui.extra_params->setPlainText(params.simplified());
+ QString mess = desc;
+ mess.append(" " + i18np("(%1 clip)", "(%1 clips)", ids.count()));
+ ui.info_label->setText(mess);
+ d->adjustSize();
+ if (d->exec() != QDialog::Accepted) {
+ delete d;
+ return;
+ }
+ params = ui.extra_params->toPlainText().simplified();
+ KdenliveSettings::setAdd_clip_cut(ui.add_clip->isChecked());
+ delete d;
+
+ foreach(const QString &id, ids) {
+ ProjectItem *item = getItemById(id);
+ if (!item || !item->referencedClip()) continue;
+ QString src = item->clipUrl().path();
+ QString dest = params.section(' ', -1).replace("%1", src);
+ QStringList jobParams;
+ jobParams << dest << src << QString() << QString();
+ double clipFps = item->referencedClip()->getProperty("fps").toDouble();
+ if (clipFps == 0) clipFps = m_fps;
+ int max = item->clipMaxDuration();
+ QString duration = QString::number(max);
+ jobParams << duration;
+ jobParams << QString::number(KdenliveSettings::add_clip_cut());
+ jobParams << params.section(' ', 0, -2);
+ CutClipJob *job = new CutClipJob(item->clipType(), id, jobParams);
+ if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+ delete job;
+ continue;
+ }
+ m_jobList.append(job);
+ setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+ }
+ slotCheckJobProcess();
- startJobProcess();
}
-void ProjectList::startJobProcess()
-{
- int ct = 0;
- if (!m_proxyThreads.futures().isEmpty()) {
+
+void ProjectList::slotCheckJobProcess()
+{
+ if (!m_jobThreads.futures().isEmpty()) {
// Remove inactive threads
- QList <QFuture<void> > futures = m_proxyThreads.futures();
- m_proxyThreads.clearFutures();
+ QList <QFuture<void> > futures = m_jobThreads.futures();
+ m_jobThreads.clearFutures();
for (int i = 0; i < futures.count(); i++)
if (!futures.at(i).isFinished()) {
- m_proxyThreads.addFuture(futures.at(i));
- ct++;
+ m_jobThreads.addFuture(futures.at(i));
}
}
- emit jobCount(ct + m_jobList.count());
+ if (m_jobList.isEmpty()) return;
+ int count = 0;
+ m_jobMutex.lock();
+ for (int i = 0; i < m_jobList.count(); i++) {
+ if (m_jobList.at(i)->jobStatus == JOBWORKING || m_jobList.at(i)->jobStatus == JOBWAITING)
+ count ++;
+ else {
+ // remove finished jobs
+ AbstractClipJob *job = m_jobList.takeAt(i);
+ delete job;
+ i--;
+ }
+ }
+
+ emit jobCount(count);
+ m_jobMutex.unlock();
- if (m_proxyThreads.futures().isEmpty() || m_proxyThreads.futures().count() < KdenliveSettings::proxythreads()) m_proxyThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotProcessJobs));
+ if (m_jobThreads.futures().isEmpty() || m_jobThreads.futures().count() < KdenliveSettings::proxythreads()) m_jobThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotProcessJobs));
}
void ProjectList::slotAbortProxy(const QString id, const QString path)
{
- QTreeWidgetItemIterator it(m_listView);
ProjectItem *item = getItemById(id);
if (!item) return;
- if (!path.isEmpty() && m_processingProxy.contains(path)) {
- m_abortProxy << path;
- }
- else {
- // Should only be done if we were already using a proxy producer
- if (!item->isProxyRunning()) slotGotProxy(item);
- }
+ if (!item->isProxyRunning()) slotGotProxy(item);
+ item->setConditionalJobStatus(NOJOB, PROXYJOB);
+ discardJobs(id, PROXYJOB);
}
void ProjectList::slotProcessJobs()
{
while (!m_jobList.isEmpty() && !m_abortAllJobs) {
emit projectModified();
- AbstractClipJob *job = m_jobList.takeFirst();
- // Get jobs count
- int ct = 0;
- QList <QFuture<void> > 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<ProxyJob *> (job);
- kDebug()<<"// STARTING JOB: "<<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;
+ AbstractClipJob *job = NULL;
+ int count = 0;
+ m_jobMutex.lock();
+ for (int i = 0; i < m_jobList.count(); i++) {
+ if (m_jobList.at(i)->jobStatus == JOBWAITING) {
+ if (job == NULL) {
+ m_jobList.at(i)->jobStatus = JOBWORKING;
+ job = m_jobList.at(i);
+ }
+ count++;
}
+ else if (m_jobList.at(i)->jobStatus == JOBWORKING)
+ count ++;
}
-
- // Get the list of clips that will need to get progress info
+ // Set jobs count
+ emit jobCount(count);
+ m_jobMutex.unlock();
+
+ if (job == NULL) {
+ break;
+ }
+ QString destination = job->destination();
+
+ // Check if the clip is still here
ProjectItem *processingItem = getItemById(job->clipId());
if (processingItem == NULL) {
- delete job;
+ job->setStatus(JOBDONE);
continue;
}
-
- /*while (*it && !m_abortAllJobs) {
- if ((*it)->type() == PROJECTCLIPTYPE) {
- ProjectItem *item = static_cast <ProjectItem *>(*it);
- if (item->referencedClip()->getProperty("proxy") == job->destination()) {
- processingItems.append(item);
- }
- }
- ++it;
- }*/
+ // Set clip status to started
+ emit processLog(job->clipId(), 0, job->jobType, job->statusMessage());
// Make sure destination path is writable
- QFile file(job->destination());
- if (!file.open(QIODevice::WriteOnly)) {
- emit jobCrashed(processingItem, i18n("Cannot write to path: %1", job->destination()));
- m_processingProxy.removeAll(job->destination());
- delete job;
- continue;
- }
- file.close();
- QFile::remove(job->destination());
-
- setJobStatus(processingItem, CREATINGJOB, 0, job->jobType, job->statusMessage(CREATINGJOB));
-
- bool success;
- QProcess *jobProcess = job->startJob(&success);
-
- int result = -1;
- if (jobProcess == NULL) {
- // job is finished
- if (success) {
- setJobStatus(processingItem, JOBDONE);
- if (job->jobType == PROXYJOB) slotGotProxy(job->destination());
- //TODO: set folder for transcoded clips
- else if (job->jobType == CUTJOB) emit addClip(job->destination(), QString(), QString());
- }
- else {
- QFile::remove(job->destination());
- emit jobCrashed(processingItem, job->errorMessage());
- }
- 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(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++)
- setJobStatus(processingItems.at(i), NOJOB);*/
- }
- else continue;
- result = -2;
+ if (!destination.isEmpty()) {
+ QFile file(destination);
+ if (!file.open(QIODevice::WriteOnly)) {
+ emit updateJobStatus(job->clipId(), job->jobType, JOBCRASHED, i18n("Cannot write to path: %1", destination));
+ job->setStatus(JOBCRASHED);
+ continue;
}
- else {
- int progress = job->processLogInfo();
- if (progress > 0) emit processLog(processingItem, progress, job->jobType);
+ file.close();
+ QFile::remove(destination);
+ }
+ connect(job, SIGNAL(jobProgress(QString, int, int)), this, SIGNAL(processLog(QString, int, int)));
+ connect(job, SIGNAL(cancelRunningJob(const QString, stringMap)), this, SIGNAL(cancelRunningJob(const QString, stringMap)));
+ connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)));
+
+ if (job->jobType == MLTJOB) {
+ MeltJob *jb = static_cast<MeltJob *> (job);
+ jb->setProducer(processingItem->referencedClip()->getProducer());
+ }
+ job->startJob();
+ if (job->jobStatus == JOBDONE) {
+ emit updateJobStatus(job->clipId(), job->jobType, JOBDONE);
+ //TODO: replace with more generic clip replacement framework
+ if (job->jobType == PROXYJOB) emit gotProxy(job->clipId());
+ if (job->addClipToProject) {
+ emit addClip(destination, QString(), QString());
}
- jobProcess->waitForFinished(500);
- }
- jobProcess->waitForFinished();
- m_processingProxy.removeAll(job->destination());
- if (result == -1) result = jobProcess->exitStatus();
-
- if (result != -2 && QFileInfo(job->destination()).size() == 0) {
- job->processLogInfo();
- emit jobCrashed(processingItem, i18n("Failed to create file"), QString(), job->errorMessage());
- result = -2;
+ } else if (job->jobStatus == JOBCRASHED || job->jobStatus == JOBABORTED) {
+ emit updateJobStatus(job->clipId(), job->jobType, job->jobStatus, job->errorMessage());
}
-
- if (result == QProcess::NormalExit) {
- // proxy successfully created
- setJobStatus(processingItem, JOBDONE);
- if (job->jobType == PROXYJOB) slotGotProxy(job->destination());
- //TODO: set folder for transcoded clips
- else if (job->jobType == CUTJOB) {
- CutClipJob *cutJob = static_cast<CutClipJob *>(job);
- if (cutJob->addClipToProject) emit addClip(job->destination(), QString(), QString());
- }
- }
- else if (result == QProcess::CrashExit) {
- // Proxy process crashed
- QFile::remove(job->destination());
- emit jobCrashed(processingItem, i18n("Job crashed"), QString(), job->errorMessage());
- }
- delete job;
- continue;
}
- // Thread finished, update count
- int ct = -1; // -1 because we don't want to count this terminating thread
- QList <QFuture<void> > futures = m_proxyThreads.futures();
- for (int i = 0; i < futures.count(); i++)
- if (futures.at(i).isRunning()) {
- ct++;
- }
- emit jobCount(ct + m_jobList.count());
+ // Thread finished, cleanup & update count
+ QTimer::singleShot(200, this, SIGNAL(checkJobProcess()));
}
}
CLIPTYPE t = item->clipType();
if ((t == VIDEO || t == AV || t == UNKNOWN) && item->referencedClip() != NULL) {
- if (generateProxy() && useProxy() && !hasPendingProxy(item)) {
+ if (generateProxy() && useProxy() && !hasPendingJob(item, PROXYJOB)) {
DocClipBase *clip = item->referencedClip();
if (clip->getProperty("frame_size").section('x', 0, 0).toInt() > m_doc->getDocumentProperty("proxyminsize").toInt()) {
if (clip->getProperty("proxy").isEmpty()) {
else delete command;
}
-void ProjectList::slotProcessLog(ProjectItem *item, int progress, int type)
+void ProjectList::slotProcessLog(const QString id, int progress, int type, const QString message)
{
- setJobStatus(item, CREATINGJOB, progress, (JOBTYPE) type);
+ ProjectItem *item = getItemById(id);
+ setJobStatus(item, (JOBTYPE) type, JOBWORKING, progress, message);
}
void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
QFile::remove(proxyPath);
}
-void ProjectList::setJobStatus(ProjectItem *item, CLIPJOBSTATUS status, int progress, JOBTYPE jobType, const QString &statusMessage)
+void ProjectList::setJobStatus(ProjectItem *item, JOBTYPE jobType, CLIPJOBSTATUS status, int progress, const QString &statusMessage)
{
- if (item == NULL || m_abortAllJobs) return;
+ if (item == NULL || (m_abortAllJobs && m_closing)) return;
monitorItemEditing(false);
- item->setJobStatus(status, progress, jobType, statusMessage);
+ item->setJobStatus(jobType, status, progress, statusMessage);
if (status == JOBCRASHED) {
DocClipBase *clip = item->referencedClip();
if (!clip) {
if (item->hasProxy()) {
QPainter p(&pix);
QColor c = QPalette().base().color();
- c.setAlpha(160);
+ c.setAlpha(200);
QBrush br(c);
p.setBrush(br);
p.setPen(Qt::NoPen);
- QRect r(1, 1, 10, 10);
- p.drawRect(r);
+ QRect r(1, 1, 15, 15);
+ p.drawRoundedRect(r, 2, 2);
p.setPen(QPalette().text().color());
+ QFont font = p.font();
+ font.setBold(true);
+ p.setFont(font);
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();
+ for (int i = 0; i < m_jobList.count(); i++) {
+ m_jobList.at(i)->setStatus(JOBABORTED);
+ }
+ m_jobThreads.waitForFinished();
+ m_jobThreads.clearFutures();
QUndoCommand *command = new QUndoCommand();
command->setText(i18np("Cancel job", "Cancel jobs", m_jobList.count()));
+ m_jobMutex.lock();
for (int i = 0; i < m_jobList.count(); i++) {
ProjectItem *item = getItemById(m_jobList.at(i)->clipId());
if (!item || !item->referencedClip()) continue;
QMap <QString, QString> oldProps = item->referencedClip()->currentProperties(newProps);
new EditClipCommand(this, m_jobList.at(i)->clipId(), oldProps, newProps, true, command);
}
+ m_jobMutex.unlock();
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;
+ if (newProps.isEmpty() || m_closing) return;
ProjectItem *item = getItemById(id);
if (!item || !item->referencedClip()) return;
QMap <QString, QString> oldProps = item->referencedClip()->currentProperties(newProps);
m_commandStack->push(command);
}
-bool ProjectList::hasPendingProxy(ProjectItem *item)
+bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type)
{
if (!item || !item->referencedClip() || m_abortAllJobs) return false;
+ AbstractClipJob *job;
+ QMutexLocker lock(&m_jobMutex);
for (int i = 0; i < m_jobList.count(); i++) {
if (m_abortAllJobs) break;
- if (m_jobList.at(i)->clipId() == item->clipId() && m_jobList.at(i)->jobType == PROXYJOB) return true;
+ job = m_jobList.at(i);
+ if (job->clipId() == item->clipId() && job->jobType == type && (job->jobStatus == JOBWAITING || job->jobStatus == JOBWORKING)) return true;
}
- if (item->isProxyRunning()) return true;
+
return false;
}
void ProjectList::deleteJobsForClip(const QString &clipId)
{
- QList <AbstractClipJob *> jobsToDelete;
+ QMutexLocker lock(&m_jobMutex);
for (int i = 0; i < m_jobList.count(); i++) {
- if (m_abortAllJobs) break;
if (m_jobList.at(i)->clipId() == clipId) {
- AbstractClipJob *job = m_jobList.takeAt(i);
- delete job;
- i--;
+ m_jobList.at(i)->setStatus(JOBABORTED);
}
}
}
-void ProjectList::slotJobCrashed(ProjectItem *item, const QString &label, const QString &actionName, const QString details)
+void ProjectList::slotUpdateJobStatus(const QString &id, int type, int status, const QString &label, const QString &actionName, const QString details)
+{
+ ProjectItem *item = getItemById(id);
+ if (!item) return;
+ slotUpdateJobStatus(item, type, status, label, actionName, details);
+
+}
+
+void ProjectList::slotUpdateJobStatus(ProjectItem *item, int type, int status, const QString &label, const QString &actionName, const QString details)
{
+ item->setJobStatus((JOBTYPE) type, (CLIPJOBSTATUS) status);
+ if (status != JOBCRASHED) return;
#if KDE_IS_VERSION(4,7,0)
m_infoMessage->animatedHide();
- item->setJobStatus(NOJOB);
m_errorLog.clear();
m_infoMessage->setText(label);
m_infoMessage->setWordWrap(label.length() > 35);
}
if (!actionName.isEmpty()) {
- QAction *action;
+ QAction *action = NULL;
QList< KActionCollection * > collections = KActionCollection::allCollections();
for (int i = 0; i < collections.count(); i++) {
KActionCollection *coll = collections.at(i);
m_infoMessage->addAction(m_logAction);
}
m_infoMessage->animatedShow();
-#else
- item->setJobStatus(JOBCRASHED);
#endif
}
void ProjectList::slotShowJobLog()
{
+#if KDE_IS_VERSION(4,7,0)
KDialog d(this);
d.setButtons(KDialog::Close);
QTextEdit t(&d);
t.setReadOnly(true);
d.setMainWidget(&t);
d.exec();
+#endif
+}
+
+QStringList ProjectList::getPendingJobs(const QString &id)
+{
+ QStringList result;
+ QMutexLocker lock(&m_jobMutex);
+ for (int i = 0; i < m_jobList.count(); i++) {
+ if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobStatus == JOBWAITING || m_jobList.at(i)->jobStatus == JOBWORKING)) {
+ // discard this job
+ result << m_jobList.at(i)->description;
+ }
+ }
+ return result;
+}
+
+void ProjectList::discardJobs(const QString &id, JOBTYPE type) {
+ QMutexLocker lock(&m_jobMutex);
+ for (int i = 0; i < m_jobList.count(); i++) {
+ if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobType == type || type == NOJOBTYPE)) {
+ // discard this job
+ m_jobList.at(i)->setStatus(JOBABORTED);
+ }
+ }
+}
+
+void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QString&properties)
+{
+ ProjectItem *item = getItemById(id);
+ if (!item) return;
+ QStringList jobParams;
+ jobParams << QString::number(info.cropStart.frames(m_fps)) << QString::number((info.cropStart + info.cropDuration).frames(m_fps));
+ jobParams << filterName << filterParams << consumer << consumerParams << properties << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track) << finalFilterName;
+ MeltJob *job = new MeltJob(item->clipType(), id, jobParams);
+ if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
+ delete job;
+ return;
+ }
+ m_jobList.append(job);
+ setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+ slotCheckJobProcess();
+}
+
+void ProjectList::slotPrepareJobsMenu()
+{
+ ProjectItem *item;
+ if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE)
+ return;
+ if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE)
+ item = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
+ else
+ item = static_cast <ProjectItem*>(m_listView->currentItem());
+ if (item && (item->flags() & Qt::ItemIsDragEnabled)) {
+ QString id = item->clipId();
+ m_discardCurrentClipJobs->setData(id);
+ QStringList jobs = getPendingJobs(id);
+ m_discardCurrentClipJobs->setEnabled(!jobs.isEmpty());
+ } else {
+ m_discardCurrentClipJobs->setData(QString());
+ m_discardCurrentClipJobs->setEnabled(false);
+ }
+}
+
+void ProjectList::slotDiscardClipJobs()
+{
+ QString id = m_discardCurrentClipJobs->data().toString();
+ if (id.isEmpty()) return;
+ discardJobs(id);
}
#include "projectlist.moc"