X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fprojectlist.cpp;h=ed21467eb443dd248364d48adffd1d5ea9d3c020;hb=e4648e65755d8939c6f670488397a71671fb3285;hp=683500185314d9ebe8dd338421412fc38919c88e;hpb=8def756a0a2a6ddb22e48d917ff59d78606a9557;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 68350018..ed21467e 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -22,6 +22,7 @@ #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" @@ -57,9 +58,10 @@ #include #include -#ifdef NEPOMUK +#ifdef USE_NEPOMUK #include #include +#include //#include #endif @@ -203,8 +205,9 @@ ProjectList::ProjectList(QWidget *parent) : 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), @@ -231,10 +234,16 @@ ProjectList::ProjectList(QWidget *parent) : 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); @@ -290,16 +299,15 @@ ProjectList::ProjectList(QWidget *parent) : 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(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()) { @@ -313,6 +321,9 @@ ProjectList::ProjectList(QWidget *parent) : 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(); @@ -377,18 +388,21 @@ void ProjectList::setupGeneratorMenu(const QHash& menus) 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); @@ -655,7 +669,7 @@ void ProjectList::slotReloadClip(const QString &id) continue; } item = static_cast (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: "<clipId()<<", but it is busy"; @@ -778,6 +792,7 @@ void ProjectList::setRenderer(Render *projectRender) { m_render = projectRender; m_listView->setIconSize(QSize((ProjectItem::itemDefaultHeight() - 2) * m_render->dar(), ProjectItem::itemDefaultHeight() - 2)); + connect(m_render, SIGNAL(requestProxy(QString)), this, SLOT(slotCreateProxy(QString))); } void ProjectList::slotClipSelected() @@ -791,6 +806,7 @@ void ProjectList::slotClipSelected() 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 { @@ -801,6 +817,7 @@ void ProjectList::slotClipSelected() if (clip == NULL) kDebug() << "-----------ERROR"; SubProjectItem *sub = static_cast (item); emit clipSelected(clip->referencedClip(), sub->zone()); + m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); m_stabilizeAction->setEnabled(false); m_reloadAction->setEnabled(false); @@ -813,6 +830,7 @@ void ProjectList::slotClipSelected() 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()) { @@ -836,6 +854,7 @@ void ProjectList::slotClipSelected() 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); } @@ -869,9 +888,11 @@ void ProjectList::adjustTranscodeActions(ProjectItem *clip) const { 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 transcodeActions = m_transcodeAction->actions(); QStringList data; QString condition; @@ -935,7 +956,7 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap 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()); @@ -1016,12 +1037,14 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) 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 (item->parent()); + m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); m_stabilizeAction->setEnabled(false); adjustProxyActions(clip); @@ -1034,6 +1057,7 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) // Display uses in timeline emit findInTimeline(clip->clipId()); } else { + m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); m_stabilizeAction->setEnabled(false); } @@ -1169,9 +1193,9 @@ void ProjectList::editFolder(const QString folderName, const QString oldfolderNa m_doc->setModified(true); } -void ProjectList::slotAddFolder() +void ProjectList::slotAddFolder(const QString &name) { - AddFolderCommand *command = new AddFolderCommand(this, i18n("Folder"), QString::number(m_doc->clipManager()->getFreeFolderId()), true); + AddFolderCommand *command = new AddFolderCommand(this, name.isEmpty() ? i18n("Folder") : name, QString::number(m_doc->clipManager()->getFreeFolderId()), true); m_commandStack->push(command); } @@ -1275,12 +1299,15 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) }*/ 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 @@ -1363,6 +1390,9 @@ void ProjectList::slotResetProjectList() { 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(); @@ -1471,7 +1501,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr } else { item = static_cast (*it); clip = item->referencedClip(); - if (item->referencedClip()->getProducer() == NULL) { + if (clip->getProducer() == NULL) { bool replace = false; if (brokenClips.contains(item->clipId())) { // if this is a proxy clip, disable proxy @@ -1480,14 +1510,15 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr 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"); xml.removeAttribute("file_hash"); xml.removeAttribute("proxy_out"); } - if (!replace) replace = xml.attribute("replace") == "1"; + if (!replace) replace = xml.attribute("_replaceproxy") == "1"; + xml.removeAttribute("_replaceproxy"); if (replace) { resetThumbsProducer(clip); } @@ -1514,7 +1545,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr getCachedThumbnail(item); } if (item->data(0, DurationRole).toString().isEmpty()) { - item->changeDuration(item->referencedClip()->getProducer()->get_playtime()); + item->changeDuration(clip->getProducer()->get_playtime()); } if (clip->isPlaceHolder()) { QPixmap pixmap = qVariantValue(item->data(0, Qt::DecorationRole)); @@ -1527,6 +1558,10 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr p.end(); item->setData(0, Qt::DecorationRole, pixmap); } + else if (clip->getProperty("_replaceproxy") == "1") { + clip->setProperty("_replaceproxy", QString()); + slotCreateProxy(clip->getId()); + } } item->setData(0, UsageRole, QString::number(item->numReferences())); } @@ -1630,31 +1665,58 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group for (int i = 0; i < givenList.count(); i++) list << givenList.at(i); } + QList foldersList; foreach(const KUrl & file, list) { // Check there is no folder here KMimeType::Ptr type = KMimeType::findByUrl(file); if (type->is("inode/directory")) { - // user dropped a folder + // user dropped a folder, import its files list.removeAll(file); + QDir dir(file.path()); + QStringList result = dir.entryList(QDir::Files); + KUrl::List folderFiles; + folderFiles << file; + foreach(const QString & path, result) { + KUrl newFile = file; + newFile.addPath(path); + folderFiles.append(newFile); + } + if (folderFiles.count() > 1) foldersList.append(folderFiles); } } - if (list.isEmpty()) - return; - - if (givenList.isEmpty()) { + if (givenList.isEmpty() && !list.isEmpty()) { QStringList groupInfo = getGroup(); m_doc->slotAddClipList(list, groupInfo.at(0), groupInfo.at(1)); - } else { + } else if (!list.isEmpty()) { m_doc->slotAddClipList(list, groupName, groupId); } + + if (!foldersList.isEmpty()) { + // create folders + for (int i = 0; i < foldersList.count(); i++) { + KUrl::List urls = foldersList.at(i); + KUrl folderUrl = urls.takeFirst(); + QString folderName = folderUrl.fileName(); + FolderProjectItem *folder = NULL; + if (!folderName.isEmpty()) { + folder = getFolderItemByName(folderName); + if (folder == NULL) { + slotAddFolder(folderName); + folder = getFolderItemByName(folderName); + } + } + if (folder) + m_doc->slotAddClipList(urls, folder->groupName(), folder->clipId()); + else m_doc->slotAddClipList(urls); + } + } } 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); @@ -1713,7 +1775,6 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) item->referencedClip()->reloadThumbProducer(); } } - m_processingClips.removeAll(id); m_thumbnailQueue.removeAll(id); } @@ -1823,12 +1884,14 @@ void ProjectList::setDocument(KdenliveDoc *doc) { 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); @@ -2035,7 +2098,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce 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(); @@ -2110,6 +2173,8 @@ bool ProjectList::adjustProjectProfileToItem(ProjectItem *item) 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) { @@ -2254,6 +2319,19 @@ ProjectItem *ProjectList::getItemById(const QString &id) return NULL; } +FolderProjectItem *ProjectList::getFolderItemByName(const QString &name) +{ + FolderProjectItem *item = NULL; + QList hits = m_listView->findItems(name, Qt::MatchExactly, 0); + for (int i = 0; i < hits.count(); i++) { + if (hits.at(i)->type() == PROJECTFOLDERTYPE) { + item = static_cast(hits.at(i)); + break; + } + } + return item; +} + FolderProjectItem *ProjectList::getFolderItemById(const QString &id) { FolderProjectItem *item; @@ -2278,6 +2356,7 @@ void ProjectList::slotSelectClip(const QString &ix) 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()) { @@ -2335,6 +2414,34 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const return result; } +QStringList ProjectList::getConditionalIds(const QString &condition) const +{ + QStringList result; + ProjectItem *item; + QList 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 (list.at(i)->parent()); + } else { + item = static_cast (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); @@ -2524,28 +2631,28 @@ QMap ProjectList::getProxies() 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 - 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())); + 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(); } @@ -2572,9 +2679,13 @@ 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) { @@ -2605,17 +2716,83 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) 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() { @@ -2650,6 +2827,8 @@ void ProjectList::slotCheckJobProcess() void ProjectList::slotAbortProxy(const QString id, const QString path) { + Q_UNUSED(path) + ProjectItem *item = getItemById(id); if (!item) return; if (!item->isProxyRunning()) slotGotProxy(item); @@ -2683,95 +2862,46 @@ void ProjectList::slotProcessJobs() break; } QString destination = job->destination(); - - // Get the list of clips that will need to get progress info - ProjectItem *processingItem = getItemById(job->clipId()); - if (processingItem == NULL) { + // Check if the clip is still here + DocClipBase *currentClip = m_doc->clipManager()->getClipById(job->clipId()); + //ProjectItem *processingItem = getItemById(job->clipId()); + if (currentClip == 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 (job); + jb->setProducer(currentClip->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(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(), QString(), job->logDetails()); } - continue; } // Thread finished, cleanup & update count QTimer::singleShot(200, this, SIGNAL(checkJobProcess())); @@ -2797,7 +2927,7 @@ void ProjectList::updateProxyConfig() } 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()) { @@ -2814,7 +2944,6 @@ void ProjectList::updateProxyConfig() // remove proxy QMap newProps; newProps.insert("proxy", QString()); - newProps.insert("replace", "1"); // insert required duration for proxy newProps.insert("proxy_out", item->referencedClip()->producerProperty("out")); new EditClipCommand(this, item->clipId(), item->referencedClip()->currentProperties(newProps), newProps, true, command); @@ -2839,7 +2968,6 @@ void ProjectList::updateProxyConfig() // remove proxy QMap newProps; newProps.insert("proxy", QString()); - newProps.insert("replace", "1"); new EditClipCommand(this, item->clipId(), item->referencedClip()->properties(), newProps, true, command); } } @@ -2849,10 +2977,10 @@ void ProjectList::updateProxyConfig() 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) @@ -2966,7 +3094,7 @@ void ProjectList::setJobStatus(ProjectItem *item, JOBTYPE jobType, CLIPJOBSTATUS { 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) { @@ -3015,14 +3143,13 @@ 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()); + QColor c(220, 220, 10, 200); + QRect r(0, 0, 12, 12); + p.fillRect(r, c); + QFont font = p.font(); + font.setBold(true); + p.setFont(font); + p.setPen(Qt::black); p.drawText(r, Qt::AlignCenter, i18nc("The first letter of Proxy, used as abbreviation", "P")); } } @@ -3030,17 +3157,20 @@ void ProjectList::processThumbOverlays(ProjectItem *item, QPixmap &pix) 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(); 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; + DocClipBase *currentClip = m_doc->clipManager()->getClipById(m_jobList.at(i)->clipId()); + if (!currentClip) continue; QMap newProps = m_jobList.at(i)->cancelProperties(); if (newProps.isEmpty()) continue; - QMap oldProps = item->referencedClip()->currentProperties(newProps); + QMap oldProps = currentClip->currentProperties(newProps); new EditClipCommand(this, m_jobList.at(i)->clipId(), oldProps, newProps, true, command); } m_jobMutex.unlock(); @@ -3049,7 +3179,6 @@ void ProjectList::slotCancelJobs() } else delete command; if (!m_jobList.isEmpty()) qDeleteAll(m_jobList); - m_processingProxy.clear(); m_jobList.clear(); m_abortAllJobs = false; m_infoLabel->slotSetJobCount(0); @@ -3057,17 +3186,17 @@ void ProjectList::slotCancelJobs() 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.isEmpty() || m_closing) return; + DocClipBase *currentClip = m_doc->clipManager()->getClipById(id); + if (!currentClip) return; + QMap oldProps = currentClip->currentProperties(newProps); if (newProps == oldProps) return; QMapIterator i(oldProps); EditClipCommand *command = new EditClipCommand(this, id, oldProps, newProps, true); 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; @@ -3075,7 +3204,7 @@ bool ProjectList::hasPendingProxy(ProjectItem *item) 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; @@ -3085,14 +3214,13 @@ void ProjectList::deleteJobsForClip(const QString &clipId) { 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); } } } -void ProjectList::slotUpdateJobStatus(const QString &id, int type, int status, 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; @@ -3146,15 +3274,71 @@ void ProjectList::slotShowJobLog() #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 (m_listView->currentItem()->parent()); + else + item = static_cast (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"