#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(const QString, int , int)), this, SLOT(slotProcessLog(const QString, 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(checkJobProcess()), this, SLOT(slotCheckJobProcess()));
connect(this, SIGNAL(gotProxy(const QString)), this, SLOT(slotGotProxyForId(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();
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;
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);
}
}*/
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
{
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_jobThreads.waitForFinished();
m_jobThreads.clearFutures();
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);
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_jobThreads.waitForFinished();
m_jobThreads.clearFutures();
m_thumbnailQueue.clear();
m_listView->clear();
- m_processingClips.clear();
m_listView->setSortingEnabled(false);
emit clipSelected(NULL);
item->setConditionalJobStatus(NOJOB, PROXYJOB);
discardJobs(clipId, PROXYJOB);
}
- else if (useProxy() && !item->hasProxy() && !hasPendingProxy(item)) {
+ 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()) {
slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy, empty path."));
return;
}
- 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, 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);
- setJobStatus(item, job->jobType, JOBWAITING);
+ setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
slotCheckJobProcess();
}
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);
- setJobStatus(item, job->jobType, 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();
+
}
+
void ProjectList::slotCheckJobProcess()
{
if (!m_jobThreads.futures().isEmpty()) {
}
QString destination = job->destination();
- // Get the list of clips that will need to get progress info
+ // Check if the clip is still here
ProjectItem *processingItem = getItemById(job->clipId());
if (processingItem == NULL) {
job->setStatus(JOBDONE);
continue;
}
+ // Set clip status to started
+ emit processLog(job->clipId(), 0, job->jobType, job->statusMessage());
// Make sure destination path is writable
- QFile file(destination);
- if (!file.open(QIODevice::WriteOnly)) {
- emit updateJobStatus(job->clipId(), job->jobType, JOBCRASHED, i18n("Cannot write to path: %1", destination));
- m_processingProxy.removeAll(destination);
- job->setStatus(JOBCRASHED);
- continue;
- }
- file.close();
- QFile::remove(destination);
-
- //setJobStatus(processingItem, JOBWORKING, 0, job->jobType, job->statusMessage());
-
- bool success;
- QProcess *jobProcess = job->startJob(&success);
- int result = -1;
- if (jobProcess == NULL) {
- // job is finished
- if (success) {
- emit updateJobStatus(job->clipId(), job->jobType, JOBDONE);
- if (job->jobType == PROXYJOB) emit gotProxy(job->clipId());
- //TODO: set folder for transcoded clips
- else if (job->jobType == CUTJOB) emit addClip(destination, QString(), QString());
- job->setStatus(JOBDONE);
- }
- else {
- QFile::remove(destination);
- emit updateJobStatus(job->clipId(), job->jobType, JOBCRASHED, job->errorMessage());
+ 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);
- }
- m_processingProxy.removeAll(destination);
- continue;
- }
- else while (jobProcess->state() != QProcess::NotRunning) {
- // building proxy file
- if (m_abortAllJobs || job->jobStatus == JOBABORTED) {
- job->jobStatus = JOBABORTED;
- jobProcess->close();
- jobProcess->waitForFinished();
- QFile::remove(destination);
- m_processingProxy.removeAll(destination);
- if (!m_closing) {
- emit cancelRunningJob(job->clipId(), job->cancelProperties());
- }
- result = -2;
continue;
}
- else {
- int progress = job->processLogInfo();
- if (progress > 0) emit processLog(job->clipId(), progress, job->jobType);
- }
- jobProcess->waitForFinished(500);
+ file.close();
+ QFile::remove(destination);
}
- jobProcess->waitForFinished();
- m_processingProxy.removeAll(destination);
- if (result == -1) result = jobProcess->exitStatus();
-
- if (result != -2 && QFileInfo(destination).size() == 0) {
- job->processLogInfo();
- emit updateJobStatus(job->clipId(), job->jobType, JOBCRASHED, i18n("Failed to create file"), QString(), job->errorMessage());
- job->setStatus(JOBCRASHED);
- result = -2;
- }
- if (result == QProcess::NormalExit) {
- // proxy successfully created
+ 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());
- //TODO: set folder for transcoded clips
- else if (job->jobType == CUTJOB) {
- CutClipJob *cutJob = static_cast<CutClipJob *>(job);
- if (cutJob->addClipToProject) emit addClip(destination, QString(), QString());
+ if (job->addClipToProject) {
+ emit addClip(destination, QString(), QString());
}
- job->setStatus(JOBDONE);
- }
- else if (result == QProcess::CrashExit) {
- // Proxy process crashed
- QFile::remove(destination);
- emit updateJobStatus(job->clipId(), job->jobType, JOBCRASHED, i18n("Job crashed"), QString(), job->errorMessage());
- job->setStatus(JOBCRASHED);
+ } else if (job->jobStatus == JOBCRASHED || job->jobStatus == JOBABORTED) {
+ emit updateJobStatus(job->clipId(), job->jobType, job->jobStatus, job->errorMessage());
}
- continue;
}
// 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(const QString id, int progress, int type)
+void ProjectList::slotProcessLog(const QString id, int progress, int type, const QString message)
{
ProjectItem *item = getItemById(id);
- setJobStatus(item, (JOBTYPE) type, JOBWORKING, progress);
+ setJobStatus(item, (JOBTYPE) type, JOBWORKING, progress, message);
}
void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
{
if (item == NULL || (m_abortAllJobs && m_closing)) return;
monitorItemEditing(false);
- item->setJobStatus(jobType, status, progress);
+ 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;
+ 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();
}
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;
for (int i = 0; i < m_jobList.count(); i++) {
if (m_abortAllJobs) break;
job = m_jobList.at(i);
- if (job->clipId() == item->clipId() && job->jobType == PROXYJOB && (job->jobStatus == JOBWAITING || job->jobStatus == JOBWORKING)) return true;
+ if (job->clipId() == item->clipId() && job->jobType == type && (job->jobStatus == JOBWAITING || job->jobStatus == JOBWORKING)) return true;
}
return false;
{
QMutexLocker lock(&m_jobMutex);
for (int i = 0; i < m_jobList.count(); i++) {
- if (m_abortAllJobs) break;
if (m_jobList.at(i)->clipId() == clipId) {
m_jobList.at(i)->setStatus(JOBABORTED);
}
#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) {
+ 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"
projects / kdenlive / blobdiff