X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=860b9b4383889b941964b48f3d576cc9265221dd;hb=a41bc84cad7d706f246fab2837bae42a328a0b93;hp=516e60ad975532984b3015270a13548eefc03227;hpb=7bc04c60cfe7b4d2af289c8d2a6f9a50fe950069;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 516e60ad..860b9b43 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" @@ -35,6 +36,7 @@ #include "projectlistview.h" #include "timecodedisplay.h" #include "profilesdialog.h" +#include "clipstabilize.h" #include "commands/editclipcommand.h" #include "commands/editclipcutcommand.h" #include "commands/editfoldercommand.h" @@ -42,6 +44,7 @@ #include "ui_templateclip_ui.h" #include "ui_cutjobdialog_ui.h" +#include "ui_scenecutdialog_ui.h" #include #include @@ -56,10 +59,13 @@ #include #include #include +#include +#include -#ifdef NEPOMUK +#ifdef USE_NEPOMUK #include #include +#include //#include #endif @@ -69,10 +75,22 @@ #include #include #include +#include #include #include #include #include +#include + + +MyMessageWidget::MyMessageWidget(QWidget *parent) : KMessageWidget(parent) {} +MyMessageWidget::MyMessageWidget(const QString &text, QWidget *parent) : KMessageWidget(text, parent) {} + + +bool MyMessageWidget::event(QEvent* ev) { + if (ev->type() == QEvent::Hide || ev->type() == QEvent::Close) emit messageClosing(); + return KMessageWidget::event(ev); +} SmallInfoLabel::SmallInfoLabel(QWidget *parent) : QPushButton(parent) { @@ -81,7 +99,15 @@ SmallInfoLabel::SmallInfoLabel(QWidget *parent) : QPushButton(parent) /*QString style = "QToolButton {background-color: %1;border-style: outset;border-width: 2px; border-radius: 5px;border-color: beige;}";*/ - KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + m_timeLine = new QTimeLine(500, this); + QObject::connect(m_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(slotTimeLineChanged(qreal))); + QObject::connect(m_timeLine, SIGNAL(finished()), this, SLOT(slotTimeLineFinished())); + hide(); +} + +const QString SmallInfoLabel::getStyleSheet(const QPalette &p) +{ + KColorScheme scheme(p.currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme())); QColor bg = scheme.background(KColorScheme::LinkBackground).color(); QColor fg = scheme.foreground(KColorScheme::LinkText).color(); QString style = QString("QPushButton {padding:2px;background-color: rgb(%1, %2, %3);border-radius: 4px;border: none;color: rgb(%4, %5, %6)}").arg(bg.red()).arg(bg.green()).arg(bg.blue()).arg(fg.red()).arg(fg.green()).arg(fg.blue()); @@ -90,11 +116,7 @@ SmallInfoLabel::SmallInfoLabel(QWidget *parent) : QPushButton(parent) fg = scheme.foreground(KColorScheme::ActiveText).color(); style.append(QString("\nQPushButton:hover {padding:2px;background-color: rgb(%1, %2, %3);border-radius: 4px;border: none;color: rgb(%4, %5, %6)}").arg(bg.red()).arg(bg.green()).arg(bg.blue()).arg(fg.red()).arg(fg.green()).arg(fg.blue())); - setStyleSheet(style); - m_timeLine = new QTimeLine(500, this); - QObject::connect(m_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(slotTimeLineChanged(qreal))); - QObject::connect(m_timeLine, SIGNAL(finished()), this, SLOT(slotTimeLineFinished())); - hide(); + return style; } void SmallInfoLabel::slotTimeLineChanged(qreal value) @@ -197,21 +219,24 @@ QStringList InvalidDialog::getIds() const ProjectList::ProjectList(QWidget *parent) : - QWidget(parent), - m_render(NULL), - m_fps(-1), - m_commandStack(NULL), - m_openAction(NULL), - m_reloadAction(NULL), - m_stabilizeAction(NULL), - m_transcodeAction(NULL), - m_doc(NULL), - m_refreshed(false), - m_allClipsProcessed(false), - m_thumbnailQueue(), - m_abortAllJobs(false), - m_closing(false), - m_invalidClipDialog(NULL) + QWidget(parent) + , m_render(NULL) + , m_fps(-1) + , m_menu(NULL) + , m_commandStack(NULL) + , m_openAction(NULL) + , m_reloadAction(NULL) + , m_extractAudioAction(NULL) + , m_transcodeAction(NULL) + , m_clipsActionsMenu(NULL) + , m_doc(NULL) + , m_refreshed(false) + , m_allClipsProcessed(false) + , m_thumbnailQueue() + , m_proxyAction(NULL) + , m_abortAllJobs(false) + , m_closing(false) + , m_invalidClipDialog(NULL) { qRegisterMetaType ("stringMap"); QVBoxLayout *layout = new QVBoxLayout; @@ -229,12 +254,19 @@ ProjectList::ProjectList(QWidget *parent) : // small info button for pending jobs m_infoLabel = new SmallInfoLabel(this); + m_infoLabel->setStyleSheet(SmallInfoLabel::getStyleSheet(palette())); 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); @@ -259,13 +291,14 @@ ProjectList::ProjectList(QWidget *parent) : frame->setLayout(box); layout->addWidget(frame); - m_listView = new ProjectListView; + m_listView = new ProjectListView(this); layout->addWidget(m_listView); -#if KDE_IS_VERSION(4,7,0) - m_infoMessage = new KMessageWidget; +#if KDE_IS_VERSION(4,7,0) + m_infoMessage = new MyMessageWidget; layout->addWidget(m_infoMessage); m_infoMessage->setCloseButtonVisible(true); + connect(m_infoMessage, SIGNAL(messageClosing()), this, SLOT(slotResetInfoMessage())); //m_infoMessage->setWordWrap(true); m_infoMessage->hide(); m_logAction = new QAction(i18n("Show Log"), this); @@ -279,9 +312,10 @@ ProjectList::ProjectList(QWidget *parent) : connect(this, SIGNAL(processNextThumbnail()), this, SLOT(slotProcessNextThumbnail())); connect(m_listView, SIGNAL(projectModified()), this, SIGNAL(projectModified())); connect(m_listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected())); - connect(m_listView, SIGNAL(focusMonitor()), this, SIGNAL(raiseClipMonitor())); - connect(m_listView, SIGNAL(pauseMonitor()), this, SLOT(slotPauseMonitor())); + connect(m_listView, SIGNAL(focusMonitor(bool)), this, SIGNAL(raiseClipMonitor(bool))); + connect(m_listView, SIGNAL(pauseMonitor()), this, SIGNAL(pauseMonitor())); connect(m_listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *))); + connect(m_listView, SIGNAL(addClip()), this, SIGNAL(pauseMonitor())); connect(m_listView, SIGNAL(addClip()), this, SLOT(slotAddClip())); connect(m_listView, SIGNAL(addClip(const QList , const QString &, const QString &)), this, SLOT(slotAddClip(const QList , const QString &, const QString &))); connect(this, SIGNAL(addClip(const QString, const QString &, const QString &)), this, SLOT(slotAddClip(const QString, const QString &, const QString &))); @@ -292,14 +326,13 @@ ProjectList::ProjectList(QWidget *parent) : connect(this, SIGNAL(cancelRunningJob(const QString, stringMap )), this, SLOT(slotCancelRunningJob(const QString, stringMap))); 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,13 +346,16 @@ 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(); m_jobThreads.clearFutures(); if (!m_jobList.isEmpty()) qDeleteAll(m_jobList); m_jobList.clear(); - delete m_menu; + if (m_menu) delete m_menu; m_listView->blockSignals(true); m_listView->clear(); delete m_listViewDelegate; @@ -370,6 +406,10 @@ void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) void ProjectList::setupGeneratorMenu(const QHash& menus) { + if (!m_menu) { + kDebug()<<"Warning, menu was not created, something is wrong"; + return; + } if (!menus.contains("addMenu") && ! menus.value("addMenu") ) return; QMenu *menu = m_addButton->menu(); @@ -377,28 +417,31 @@ 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("stabilizeMenu") && menus.value("stabilizeMenu") ){ - QMenu* stabilizeMenu=menus.value("stabilizeMenu"); + 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("clipActionsMenu") && menus.value("clipActionsMenu") ){ + QMenu* stabilizeMenu=menus.value("clipActionsMenu"); m_menu->addMenu(stabilizeMenu); if (stabilizeMenu->isEmpty()) stabilizeMenu->setEnabled(false); - m_stabilizeAction=stabilizeMenu; + m_clipsActionsMenu = stabilizeMenu; } - m_menu->addAction(m_reloadAction); - m_menu->addAction(m_proxyAction); + if (m_reloadAction) m_menu->addAction(m_reloadAction); + if (m_proxyAction) m_menu->addAction(m_proxyAction); if (menus.contains("inTimelineMenu") && menus.value("inTimelineMenu")){ QMenu* inTimelineMenu=menus.value("inTimelineMenu"); m_menu->addMenu(inTimelineMenu); @@ -497,7 +540,7 @@ void ProjectList::editClipSelection(QList list) if (clip->getProperty("transparency").isEmpty() || clip->getProperty("transparency").toInt() == 0) { if (transparency == "-") { // first non transparent image - transparency = "0"; + transparency = '0'; } else if (transparency == "1") { // we have transparent and non transparent clips @@ -507,7 +550,7 @@ void ProjectList::editClipSelection(QList list) else { if (transparency == "-") { // first transparent image - transparency = "1"; + transparency = '1'; } else if (transparency == "0") { // we have transparent and non transparent clips @@ -549,7 +592,10 @@ void ProjectList::editClipSelection(QList list) p.next(); kDebug() << "Result: " << p.key() << " = " << p.value(); }*/ - emit showClipProperties(clipList, commonproperties); + if (clipList.isEmpty()) { + emit displayMessage(i18n("No available clip selected"), -2, ErrorMessage); + } + else emit showClipProperties(clipList, commonproperties); } void ProjectList::slotOpenClip() @@ -655,7 +701,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"; @@ -669,16 +715,17 @@ void ProjectList::slotReloadClip(const QString &id) item->referencedClip()->setPlaceHolder(true); item->setProperty("file_hash", QString()); } else if (t == IMAGE) { - clip->getProducer()->set("force_reload", 1); + //clip->getProducer() clip->getProducer()->set("force_reload", 1); } QDomElement e = item->toXml(); // Make sure we get the correct producer length if it was adjusted in timeline if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) { - int length = QString(clip->producerProperty("length")).toInt(); - if (length > 0 && !e.hasAttribute("length")) { - e.setAttribute("length", length); - } + int length = QString(clip->producerProperty("length")).toInt(); + if (length > 0 && !e.hasAttribute("length")) { + e.setAttribute("length", length); + } + e.setAttribute("duration", clip->getProperty("duration")); } resetThumbsProducer(clip); m_render->getFileProperties(e, item->clipId(), m_listView->iconSize().height(), true); @@ -699,7 +746,7 @@ void ProjectList::slotModifiedClip(const QString &id) } else { pixmap = KIcon("view-refresh").pixmap(m_listView->iconSize()); } - item->setData(0, Qt::DecorationRole, pixmap); + item->setPixmap(pixmap); } } @@ -709,6 +756,10 @@ void ProjectList::slotMissingClip(const QString &id) if (item) { item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled); int height = m_listView->iconSize().height(); + if (m_render == NULL) { + kDebug() << "********* ERROR, NULL RENDR"; + return; + } int width = (int)(height * m_render->dar()); QPixmap pixmap = qVariantValue(item->data(0, Qt::DecorationRole)); if (pixmap.isNull()) { @@ -719,13 +770,9 @@ void ProjectList::slotMissingClip(const QString &id) QPainter p(&pixmap); p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6)); p.end(); - item->setData(0, Qt::DecorationRole, pixmap); + item->setPixmap(pixmap); if (item->referencedClip()) { item->referencedClip()->setPlaceHolder(true); - if (m_render == NULL) { - kDebug() << "********* ERROR, NULL RENDR"; - return; - } Mlt::Producer *newProd = m_render->invalidProducer(id); if (item->referencedClip()->getProducer()) { Mlt::Properties props(newProd->get_properties()); @@ -738,7 +785,7 @@ void ProjectList::slotMissingClip(const QString &id) } } update(); - emit displayMessage(i18n("Check missing clips"), -2); + emit displayMessage(i18n("Check missing clips"), -2, ErrorMessage); emit updateRenderStatus(); } @@ -778,6 +825,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,18 +839,24 @@ 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); + m_clipsActionsMenu->setEnabled(false); } else { if (item->type() == PROJECTSUBCLIPTYPE) { // this is a sub item, use base clip m_deleteButton->defaultAction()->setEnabled(true); clip = static_cast (item->parent()); - if (clip == NULL) kDebug() << "-----------ERROR"; + if (clip == NULL) { + kDebug() << "-----------ERROR"; + return; + } SubProjectItem *sub = static_cast (item); + if (clip->referencedClip()->getProducer() == NULL) m_render->getFileProperties(clip->referencedClip()->toXML(), clip->clipId(), m_listView->iconSize().height(), true); emit clipSelected(clip->referencedClip(), sub->zone()); + m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); - m_stabilizeAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); m_reloadAction->setEnabled(false); adjustProxyActions(clip); return; @@ -810,11 +864,13 @@ void ProjectList::slotClipSelected() clip = static_cast (item); if (clip && clip->referencedClip()) emit clipSelected(clip->referencedClip()); + if (clip->referencedClip()->getProducer() == NULL) m_render->getFileProperties(clip->referencedClip()->toXML(), clip->clipId(), m_listView->iconSize().height(), true); 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); + m_clipsActionsMenu->setEnabled(true); if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -836,19 +892,23 @@ 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); + m_clipsActionsMenu->setEnabled(false); } adjustProxyActions(clip); } void ProjectList::adjustProxyActions(ProjectItem *clip) const { + if (!m_proxyAction) return; if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) { m_proxyAction->setEnabled(false); return; } - m_proxyAction->setEnabled(useProxy()); + bool enabled = useProxy(); + if (clip->referencedClip() && !clip->referencedClip()->getProperty("_missingsource").isEmpty()) enabled = false; + m_proxyAction->setEnabled(enabled); m_proxyAction->blockSignals(true); m_proxyAction->setChecked(clip->hasProxy()); m_proxyAction->blockSignals(false); @@ -857,11 +917,11 @@ void ProjectList::adjustProxyActions(ProjectItem *clip) const void ProjectList::adjustStabilizeActions(ProjectItem *clip) const { - if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) { - m_stabilizeAction->setEnabled(false); + if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW) { + m_clipsActionsMenu->setEnabled(false); return; } - m_stabilizeAction->setEnabled(true); + m_clipsActionsMenu->setEnabled(true); } @@ -869,9 +929,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; @@ -899,7 +961,7 @@ void ProjectList::slotUpdateClipProperties(const QString &id, 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()); @@ -963,6 +1025,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) if (item->type() == PROJECTFOLDERTYPE) { if (column == 0) { FolderProjectItem *folder = static_cast (item); + if (item->text(0) == folder->groupName()) return; editFolder(item->text(0), folder->groupName(), folder->clipId()); folder->setGroupName(item->text(0)); m_doc->clipManager()->addFolder(folder->clipId(), item->text(0)); @@ -1005,25 +1068,37 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) emit projectModified(); EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false); m_commandStack->push(command); + QTimer::singleShot(100, this, SLOT(slotCheckScrolling())); } } } } +void ProjectList::slotCheckScrolling() +{ + m_listView->scrollToItem(m_listView->currentItem()); +} + void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) { + if (!m_menu) { + kDebug()<<"Warning, menu was not created, something is wrong"; + return; + } bool enable = item ? true : false; 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); + m_clipsActionsMenu->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); + m_clipsActionsMenu->setEnabled(false); adjustProxyActions(clip); } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) { clip = static_cast (item); @@ -1034,8 +1109,9 @@ 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); + m_clipsActionsMenu->setEnabled(false); } if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); @@ -1084,7 +1160,7 @@ void ProjectList::slotRemoveClip() } else { ProjectItem *item = static_cast (selected.at(i)); ids << item->clipId(); - if (item->numReferences() > 0 && KMessageBox::questionYesNo(kapp->activeWindow(), i18np("Delete clip %2?
This will also remove the clip in timeline", "Delete clip %2?
This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip"), KStandardGuiItem::yes(), KStandardGuiItem::no(), "DeleteAll") == KMessageBox::No) { + if (item->numReferences() > 0 && KMessageBox::questionYesNo(kapp->activeWindow(), i18np("Delete clip %2?
This will also remove the clip in timeline", "Delete clip %2?
This will also remove its %1 clips in timeline", item->numReferences(), item->text(1)), i18n("Delete Clip"), KStandardGuiItem::yes(), KStandardGuiItem::no(), "DeleteAll") == KMessageBox::No) { KMessageBox::enableMessage("DeleteAll"); return; } @@ -1113,7 +1189,7 @@ void ProjectList::updateButtons() const m_openAction->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); - m_stabilizeAction->setEnabled(true); + m_clipsActionsMenu->setEnabled(true); return; } else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) { @@ -1122,10 +1198,10 @@ void ProjectList::updateButtons() const else m_editButton->defaultAction()->setEnabled(false); } m_openAction->setEnabled(false); - m_reloadAction->setEnabled(false); + if (m_reloadAction) m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); - m_stabilizeAction->setEnabled(false); - m_proxyAction->setEnabled(false); + m_clipsActionsMenu->setEnabled(false); + if (m_proxyAction) m_proxyAction->setEnabled(false); } void ProjectList::selectItemById(const QString &clipId) @@ -1169,9 +1245,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); } @@ -1235,13 +1311,14 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) { //m_listView->setEnabled(false); const QString parent = clip->getProperty("groupid"); + QString groupName = clip->getProperty("groupname"); + QSize pixelSize((int)(m_listView->iconSize().height() * m_render->dar()), m_listView->iconSize().height()); ProjectItem *item = NULL; monitorItemEditing(false); if (!parent.isEmpty()) { FolderProjectItem *parentitem = getFolderItemById(parent); if (!parentitem) { QStringList text; - QString groupName = clip->getProperty("groupname"); //kDebug() << "Adding clip to new group: " << groupName; if (groupName.isEmpty()) groupName = i18n("Folder"); text << groupName; @@ -1249,22 +1326,23 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) } if (parentitem) - item = new ProjectItem(parentitem, clip); + item = new ProjectItem(parentitem, clip, pixelSize); } if (item == NULL) { - item = new ProjectItem(m_listView, clip); + item = new ProjectItem(m_listView, clip, pixelSize); } if (item->data(0, DurationRole).isNull()) item->setData(0, DurationRole, i18n("Loading")); connect(clip, SIGNAL(createProxy(const QString &)), this, SLOT(slotCreateProxy(const QString &))); connect(clip, SIGNAL(abortProxy(const QString &, const QString &)), this, SLOT(slotAbortProxy(const QString, const QString))); + if (getProperties) { - int height = m_listView->iconSize().height(); - int width = (int)(height * m_render->dar()); - QPixmap pix = KIcon("video-x-generic").pixmap(QSize(width, height)); - item->setData(0, Qt::DecorationRole, pix); //item->setFlags(Qt::ItemIsSelectable); m_listView->processLayout(); QDomElement e = clip->toXML().cloneNode().toElement(); + if (!groupName.isEmpty()) { + e.setAttribute("groupId", parent); + e.setAttribute("group", groupName); + } e.removeAttribute("file_hash"); resetThumbsProducer(clip); m_render->getFileProperties(e, clip->getId(), m_listView->iconSize().height(), true); @@ -1275,12 +1353,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 @@ -1295,7 +1376,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) QList cuts = clip->cutZones(); if (!cuts.isEmpty()) { for (int i = 0; i < cuts.count(); i++) { - SubProjectItem *sub = new SubProjectItem(item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description); + SubProjectItem *sub = new SubProjectItem(m_render->dar(), item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description); if (!clip->getClipHash().isEmpty()) { QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(cuts.at(i).zone.x()) + ".png"; if (QFile::exists(cachedPixmap)) { @@ -1363,6 +1444,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(); @@ -1391,7 +1475,9 @@ void ProjectList::getCachedThumbnail(ProjectItem *item) { if (!item) return; DocClipBase *clip = item->referencedClip(); - if (!clip) return; + if (!clip) { + return; + } QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + ".png"; if (QFile::exists(cachedPixmap)) { QPixmap pix(cachedPixmap); @@ -1400,8 +1486,9 @@ void ProjectList::getCachedThumbnail(ProjectItem *item) requestClipThumbnail(item->clipId()); } else { - processThumbOverlays(item, pix); - item->setData(0, Qt::DecorationRole, pix); + QPixmap result = roundedPixmap(pix); + processThumbOverlays(item, result); + item->setPixmap(result); } } else { @@ -1409,6 +1496,34 @@ void ProjectList::getCachedThumbnail(ProjectItem *item) } } +QPixmap ProjectList::roundedPixmap(QImage img) +{ + QPixmap pix(img.width(), img.height()); + pix.fill(Qt::transparent); + QPainter p(&pix); + p.setRenderHint(QPainter::Antialiasing, true); + QPainterPath path; + path.addRoundedRect(0.5, 0.5, pix.width() - 1, pix.height() - 1, 2, 2); + p.setClipPath(path); + p.drawImage(0, 0, img); + p.end(); + return pix; +} + +QPixmap ProjectList::roundedPixmap(QPixmap source) +{ + QPixmap pix(source.width(), source.height()); + pix.fill(Qt::transparent); + QPainter p(&pix); + p.setRenderHint(QPainter::Antialiasing, true); + QPainterPath path; + path.addRoundedRect(0.5, 0.5, pix.width() - 1, pix.height() - 1, 2, 2); + p.setClipPath(path); + p.drawPixmap(0, 0, source); + p.end(); + return pix; +} + void ProjectList::getCachedThumbnail(SubProjectItem *item) { if (!item) return; @@ -1417,7 +1532,7 @@ void ProjectList::getCachedThumbnail(SubProjectItem *item) DocClipBase *clip = parentItem->referencedClip(); if (!clip) return; int pos = item->zone().x(); - QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + "#" + QString::number(pos) + ".png"; + QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(pos) + ".png"; if (QFile::exists(cachedPixmap)) { QPixmap pix(cachedPixmap); if (pix.isNull()) { @@ -1471,7 +1586,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,41 +1595,47 @@ 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(); + getCachedThumbnail(item); 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); + m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); } - m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); + else if (item->numReferences() > 0) { + // In some cases, like slowmotion clips, the producer is not loaded automatically be MLT + m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); + } } else if (clip->isPlaceHolder()) { item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled); - if (item->data(0, Qt::DecorationRole).isNull()) { - item->setData(0, Qt::DecorationRole, missingPixmap); + if (!item->hasPixmap()) { + item->setPixmap(missingPixmap); } else { QPixmap pixmap = qVariantValue(item->data(0, Qt::DecorationRole)); QPainter p(&pixmap); p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6)); p.end(); - item->setData(0, Qt::DecorationRole, pixmap); + item->setPixmap(pixmap); } } } else { if (displayRatioChanged) { requestClipThumbnail(clip->getId()); } - else if (item->data(0, Qt::DecorationRole).isNull()) { + else if (!item->hasPixmap()) { 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)); @@ -1525,7 +1646,11 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr QPainter p(&pixmap); p.drawPixmap(3, 3, KIcon("dialog-close").pixmap(pixmap.width() - 6, pixmap.height() - 6)); p.end(); - item->setData(0, Qt::DecorationRole, pixmap); + item->setPixmap(pixmap); + } + else if (clip->getProperty("_replaceproxy") == "1") { + clip->setProperty("_replaceproxy", QString()); + slotCreateProxy(clip->getId()); } } item->setData(0, UsageRole, QString::number(item->numReferences())); @@ -1545,10 +1670,16 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr QString ProjectList::getExtensions() { // Build list of mime types - QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/mlt-playlist" << "text/plain" - << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "video/mp4" << "video/quicktime" << "video/webm" - << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "audio/x-aiff" << "audio/aiff" << "application/ogg" << "application/mxf" << "application/x-shockwave-flash" - << "image/gif" << "image/jpeg" << "image/png" << "image/x-tga" << "image/x-bmp" << "image/svg+xml" << "image/tiff" << "image/x-xcf" << "image/x-xcf-gimp" << "image/x-vnd.adobe.photoshop" << "image/x-pcx" << "image/x-exr"; + QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/mlt-playlist" << "text/plain"; + + // Video mimes + mimeTypes << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "video/mp4" << "video/quicktime" << "video/webm" << "video/3gpp" << "video/mp2t"; + + // Audio mimes + mimeTypes << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "audio/x-aiff" << "audio/aiff" << "application/ogg" << "application/mxf" << "application/x-shockwave-flash" << "audio/ac3"; + + // Image mimes + mimeTypes << "image/gif" << "image/jpeg" << "image/png" << "image/x-tga" << "image/x-bmp" << "image/svg+xml" << "image/tiff" << "image/x-xcf" << "image/x-xcf-gimp" << "image/x-vnd.adobe.photoshop" << "image/x-pcx" << "image/x-exr"; QString allExtensions; foreach(const QString & mimeType, mimeTypes) { @@ -1589,7 +1720,7 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group l->addWidget(c); l->addStretch(5); f->setLayout(l); - KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), f); + QPointer d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), f); d->setOperationMode(KFileDialog::Opening); d->setMode(KFile::Files); if (d->exec() == QDialog::Accepted) { @@ -1615,11 +1746,18 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group while (fileName.at(fileName.size() - 1).isDigit()) { fileName.chop(1); } - - m_doc->slotCreateSlideshowClipFile(fileName, pattern, count, m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()), - false, false, false, - m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))), QString(), 0, - QString(), groupInfo.at(0), groupInfo.at(1)); + QMap properties; + properties.insert("name", fileName); + properties.insert("resource", pattern); + properties.insert("in", "0"); + QString duration = m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()); + properties.insert("out", QString::number(m_doc->getFramePos(duration) * count)); + properties.insert("ttl", QString::number(m_doc->getFramePos(duration))); + properties.insert("loop", QString::number(false)); + properties.insert("crop", QString::number(false)); + properties.insert("fade", QString::number(false)); + properties.insert("luma_duration", QString::number(m_doc->getFramePos(m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps())))))); + m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1)); return; } } @@ -1630,31 +1768,68 @@ 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 { - m_doc->slotAddClipList(list, groupName, groupId); + QMap data; + data.insert("group", groupInfo.at(0)); + data.insert("groupId", groupInfo.at(1)); + m_doc->slotAddClipList(list, data); + } else if (!list.isEmpty()) { + QMap data; + data.insert("group", groupName); + data.insert("groupId", groupId); + m_doc->slotAddClipList(list, data); + } + + 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) { + QMap data; + data.insert("group", folder->groupName()); + data.insert("groupId", folder->clipId()); + m_doc->slotAddClipList(urls, data); + } + 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); @@ -1694,7 +1869,7 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled); if (durationError) { kDebug() << "Proxy duration is wrong, try changing transcoding parameters."; - emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2); + emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2, ErrorMessage); } slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings"); QString path = item->referencedClip()->getProperty("proxy"); @@ -1713,7 +1888,6 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) item->referencedClip()->reloadThumbProducer(); } } - m_processingClips.removeAll(id); m_thumbnailQueue.removeAll(id); } @@ -1722,7 +1896,7 @@ void ProjectList::slotAddColorClip() if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK"; - QDialog *dia = new QDialog(this); + QPointer dia = new QDialog(this); Ui::ColorClip_UI dia_ui; dia_ui.setupUi(dia); dia->setWindowTitle(i18n("Color Clip")); @@ -1754,10 +1928,22 @@ void ProjectList::slotAddSlideshowClip() if (dia->exec() == QDialog::Accepted) { QStringList groupInfo = getGroup(); - m_doc->slotCreateSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), - dia->loop(), dia->crop(), dia->fade(), - dia->lumaDuration(), dia->lumaFile(), dia->softness(), - dia->animation(), groupInfo.at(0), groupInfo.at(1)); + + QMap properties; + properties.insert("name", dia->clipName()); + properties.insert("resource", dia->selectedPath()); + properties.insert("in", "0"); + properties.insert("out", QString::number(m_doc->getFramePos(dia->clipDuration()) * dia->imageCount())); + properties.insert("ttl", QString::number(m_doc->getFramePos(dia->clipDuration()))); + properties.insert("loop", QString::number(dia->loop())); + properties.insert("crop", QString::number(dia->crop())); + properties.insert("fade", QString::number(dia->fade())); + properties.insert("luma_duration", dia->lumaDuration()); + properties.insert("luma_file", dia->lumaFile()); + properties.insert("softness", QString::number(dia->softness())); + properties.insert("animation", dia->animation()); + + m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1)); } delete dia; } @@ -1781,7 +1967,7 @@ void ProjectList::slotAddTitleTemplateClip() const QString path = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "titles/"; QStringList templateFiles = QDir(path).entryList(filter, QDir::Files); - QDialog *dia = new QDialog(this); + QPointer dia = new QDialog(this); Ui::TemplateClip_UI dia_ui; dia_ui.setupUi(dia); for (int i = 0; i < templateFiles.size(); ++i) @@ -1823,12 +2009,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); @@ -1865,6 +2053,26 @@ void ProjectList::setDocument(KdenliveDoc *doc) connect(m_doc->clipManager(), SIGNAL(missingClip(const QString &)), this, SLOT(slotMissingClip(const QString &))); connect(m_doc->clipManager(), SIGNAL(availableClip(const QString &)), this, SLOT(slotAvailableClip(const QString &))); connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool, QStringList)), this, SLOT(updateAllClips(bool, bool, QStringList))); + connect(m_doc->clipManager(), SIGNAL(thumbReady(const QString &, int, QImage)), this, SLOT(slotSetThumbnail(const QString &, int, QImage))); +} + +void ProjectList::slotSetThumbnail(const QString &id, int framePos, QImage img) +{ + QString fullid = id + '#' + QString::number(framePos); + ProjectItem *pItem = NULL; + QTreeWidgetItem *item = getAnyItemById(fullid); + if (item && item->parent()) pItem = static_cast (item->parent()); + if (!item && framePos == 0) pItem = getItemById(id); + if (!item && !pItem) return; + if (item) { + if (item->type() == PROJECTCLIPTYPE) static_cast(item)->setPixmap(QPixmap::fromImage(img)); + else item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img)); + } + else if (pItem) pItem->setPixmap(QPixmap::fromImage(img)); + if (pItem) { + QString hash = pItem->getClipHash(); + if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(framePos), img); + } } QList ProjectList::documentClipList() const @@ -1970,26 +2178,22 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) slotProcessNextThumbnail(); return; } - QPixmap pix; QImage img; int height = m_listView->iconSize().height(); int swidth = (int)(height * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5); int dwidth = (int)(height * m_render->dar() + 0.5); - if (clip->clipType() == AUDIO) - pix = KIcon("audio-x-generic").pixmap(QSize(dwidth, height)); - else if (clip->clipType() == IMAGE) + if (clip->clipType() == IMAGE) { img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height); - else { + } + else if (clip->clipType() != AUDIO) { img = item->referencedClip()->extractImage(frame, dwidth, height); } - - if (!pix.isNull() || !img.isNull()) { + if (!img.isNull()) { monitorItemEditing(false); - if (!img.isNull()) { - pix = QPixmap::fromImage(img); - processThumbOverlays(item, pix); - } - it->setData(0, Qt::DecorationRole, pix); + QPixmap pix = roundedPixmap(img); + processThumbOverlays(item, pix); + if (isSubItem) it->setData(0, Qt::DecorationRole, pix); + else item->setPixmap(pix); monitorItemEditing(true); QString hash = item->getClipHash(); @@ -2006,12 +2210,87 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) } } +void ProjectList::extractMetadata(DocClipBase *clip) +{ + CLIPTYPE t = clip->clipType(); + if (t != AV && t != VIDEO) { + // Currently, we only use exiftool on video files + return; + } + QMap props = clip->properties(); + if (KdenliveSettings::use_exiftool() && !props.contains("exiftool")) { + QMap meta; + QString url = clip->fileURL().path(); + //Check for Canon THM file + url = url.section('.', 0, -2) + ".THM"; + if (QFile::exists(url)) { + // Read the exif metadata embeded in the THM file + QProcess p; + QStringList args; + args << "-g" << "-args" << url; + p.start("exiftool", args); + p.waitForFinished(); + QString res = p.readAllStandardOutput(); + QStringList list = res.split("\n"); + foreach(QString tagline, list) { + if (tagline.startsWith("-File") || tagline.startsWith("-ExifTool")) continue; + QString tag = tagline.section(':', 1).simplified(); + if (tag.startsWith("ImageWidth") || tag.startsWith("ImageHeight")) continue; + if (!tag.section('=', 0, 0).isEmpty() && !tag.section('=', 1).simplified().isEmpty()) + meta.insert(tag.section('=', 0, 0), tag.section('=', 1).simplified()); + } + } else { + QString codecid = props.value("videocodecid").simplified(); + if (codecid == "h264") { + QProcess p; + QStringList args; + args << "-g" << "-args" << clip->fileURL().encodedPathAndQuery(); + p.start("exiftool", args); + p.waitForFinished(); + QString res = p.readAllStandardOutput(); + QStringList list = res.split("\n"); + foreach(QString tagline, list) { + if (!tagline.startsWith("-H264")) continue; + QString tag = tagline.section(':', 1); + if (tag.startsWith("ImageWidth") || tag.startsWith("ImageHeight")) continue; + meta.insert(tag.section('=', 0, 0), tag.section('=', 1)); + } + } + } + clip->setProperty("exiftool", "1"); + if (!meta.isEmpty()) { + clip->setMetadata(meta, "ExifTool"); + //checkCamcorderFilters(clip, meta); + } + } + if (KdenliveSettings::use_magicLantern() && !props.contains("magiclantern")) { + QMap meta; + QString url = clip->fileURL().path(); + url = url.section('.', 0, -2) + ".LOG"; + if (QFile::exists(url)) { + QFile file(url); + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { + while (!file.atEnd()) { + QString line = file.readLine().simplified(); + if (line.startsWith('#') || line.isEmpty() || !line.contains(':')) continue; + if (line.startsWith("CSV data")) break; + meta.insert(line.section(':', 0, 0).simplified(), line.section(':', 1).simplified()); + } + } + } + + if (!meta.isEmpty()) + clip->setMetadata(meta, "Magic Lantern"); + clip->setProperty("magiclantern", "1"); + } +} + void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace) { + QMutexLocker lock(&m_processMutex); QString toReload; ProjectItem *item = getItemById(clipId); - int queue = m_render->processingItems(); if (item && producer) { monitorItemEditing(false); DocClipBase *clip = item->referencedClip(); @@ -2024,6 +2303,8 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } item->setProperties(properties, metadata); clip->setProducer(producer, replace); + extractMetadata(clip); + m_render->processingDone(clipId); // Proxy stuff QString size = properties.value("frame_size"); @@ -2035,7 +2316,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(); @@ -2045,7 +2326,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce if (clip->getProperty("proxy").isEmpty()) { KUrl proxyPath = m_doc->projectFolder(); proxyPath.addPath("proxy/"); - proxyPath.addPath(clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension"))); + proxyPath.addPath(clip->getClipHash() + '.' + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension"))); QMap newProps; // insert required duration for proxy if (t != IMAGE) newProps.insert("proxy_out", clip->producerProperty("out")); @@ -2058,12 +2339,16 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } } - if (!replace && m_allClipsProcessed && item->data(0, Qt::DecorationRole).isNull()) { + if (!replace && m_allClipsProcessed && !item->hasPixmap()) { getCachedThumbnail(item); } if (!toReload.isEmpty()) item->slotSetToolTip(); - } else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS..."; + } else { + kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS..."; + m_render->processingDone(clipId); + } + int queue = m_render->processingItems(); if (queue == 0) { monitorItemEditing(true); if (item && m_thumbnailQueue.isEmpty()) { @@ -2076,6 +2361,9 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } else if (KdenliveSettings::checkfirstprojectclip() && m_listView->topLevelItemCount() == 1 && m_refreshed && m_allClipsProcessed) { // this is the first clip loaded in project, check if we want to adjust project settings to the clip updatedProfile = adjustProjectProfileToItem(item); + if (updatedProfile == false) { + emit clipSelected(item->referencedClip()); + } } if (updatedProfile == false) { //emit clipSelected(item->referencedClip()); @@ -2092,8 +2380,9 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce return; } if (replace) toReload = clipId; - if (!toReload.isEmpty()) + if (!toReload.isEmpty()) { emit clipNeedsReload(toReload); + } } bool ProjectList::adjustProjectProfileToItem(ProjectItem *item) @@ -2181,10 +2470,10 @@ void ProjectList::slotReplyGetImage(const QString &clipId, const QImage &img) { ProjectItem *item = getItemById(clipId); if (item && !img.isNull()) { - QPixmap pix = QPixmap::fromImage(img); + QPixmap pix = roundedPixmap(img); processThumbOverlays(item, pix); monitorItemEditing(false); - item->setData(0, Qt::DecorationRole, pix); + item->setPixmap(pix); monitorItemEditing(true); QString hash = item->getClipHash(); if (!hash.isEmpty()) m_doc->cacheImage(hash, img); @@ -2256,6 +2545,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; @@ -2280,8 +2582,9 @@ 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); + m_clipsActionsMenu->setEnabled(true); if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -2337,6 +2640,34 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const return result; } +QMap ProjectList::getConditionalIds(const QString &condition) const +{ + QMap 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.insert(item->clipId(), item->clipUrl().path()); + } + return result; +} + void ProjectList::regenerateTemplate(const QString &id) { ProjectItem *clip = getItemById(id); @@ -2390,17 +2721,14 @@ void ProjectList::addClipCut(const QString &id, int in, int out, const QString d DocClipBase *base = clip->referencedClip(); base->addCutZone(in, out); monitorItemEditing(false); - SubProjectItem *sub = new SubProjectItem(clip, in, out, desc); + SubProjectItem *sub = new SubProjectItem(m_render->dar(), clip, in, out, desc); if (newItem && desc.isEmpty() && !m_listView->isColumnHidden(1)) { if (!clip->isExpanded()) clip->setExpanded(true); m_listView->scrollToItem(sub); m_listView->editItem(sub, 1); } - QImage img = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2); - sub->setData(0, Qt::DecorationRole, QPixmap::fromImage(img)); - QString hash = clip->getClipHash(); - if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(in), img); + m_doc->clipManager()->slotRequestThumbs(QString('#' + id), QList () << in); monitorItemEditing(true); } emit projectModified(); @@ -2493,12 +2821,21 @@ void ProjectList::slotAddOrUpdateSequence(const QString frameName) } else { // Create sequence QStringList groupInfo = getGroup(); - m_doc->slotCreateSlideshowClipFile(fileName, pattern, count, m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()), - false, false, false, - m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))), QString(), 0, - QString(), groupInfo.at(0), groupInfo.at(1)); - } - } else emit displayMessage(i18n("Sequence not found"), -2); + QMap properties; + properties.insert("name", fileName); + properties.insert("resource", pattern); + properties.insert("in", "0"); + QString duration = m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()); + properties.insert("out", QString::number(m_doc->getFramePos(duration) * count)); + properties.insert("ttl", QString::number(m_doc->getFramePos(duration))); + properties.insert("loop", QString::number(false)); + properties.insert("crop", QString::number(false)); + properties.insert("fade", QString::number(false)); + properties.insert("luma_duration", m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps())))); + + m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1)); + } + } else emit displayMessage(i18n("Sequence not found"), -2, ErrorMessage); } QMap ProjectList::getProxies() @@ -2526,26 +2863,30 @@ 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); + QString sourcePath = item->clipUrl().path(); + if (item->clipType() == PLAYLIST) { + // Special case: playlists use the special 'consumer' producer to support resizing + sourcePath.prepend("consumer:"); + } + ProxyJob *job = new ProxyJob(item->clipType(), id, QStringList() << path << sourcePath << 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; + } - 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, 0, job->statusMessage()); slotCheckJobProcess(); @@ -2557,7 +2898,7 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) if (!item|| item->referencedClip()->isPlaceHolder()) return; QString source = item->clipUrl().path(); QString ext = source.section('.', -1); - QString dest = source.section('.', 0, -2) + "_" + QString::number(zone.x()) + "." + ext; + QString dest = source.section('.', 0, -2) + '_' + QString::number(zone.x()) + '.' + ext; double clipFps = item->referencedClip()->getProperty("fps").toDouble(); if (clipFps == 0) clipFps = m_fps; @@ -2571,12 +2912,16 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) QString timeIn = Timecode::getStringTimecode(in, clipFps, true); QString timeOut = Timecode::getStringTimecode(duration, clipFps, true); - QDialog *d = new QDialog(this); + QPointer d = new QDialog(this); Ui::CutJobDialog_UI ui; ui.setupUi(d); - ui.add_clip->setChecked(KdenliveSettings::add_clip_cut()); + ui.extra_params->setVisible(false); + ui.add_clip->setChecked(KdenliveSettings::add_new_clip()); 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) { @@ -2604,20 +2949,99 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) } } QString extraParams = ui.extra_params->toPlainText().simplified(); - KdenliveSettings::setAdd_clip_cut(ui.add_clip->isChecked()); + KdenliveSettings::setAdd_new_clip(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()); + jobParams << dest << item->clipUrl().path() << timeIn << timeOut << QString::number(duration) << QString::number(KdenliveSettings::add_new_clip()); 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, 0, job->statusMessage()); slotCheckJobProcess(); } +void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, QString desc) +{ + QStringList existingFiles; + QMap ids = getConditionalIds(condition); + QMap::const_iterator i = ids.constBegin(); + QStringList destinations; + while (i != ids.constEnd()) { + QString newFile = params.section(' ', -1).replace("%1", i.value()); + destinations << newFile; + if (QFile::exists(newFile)) existingFiles << newFile; + ++i; + } + 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.extra_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5); + if (ids.count() == 1) { + ui.file_url->setUrl(KUrl(destinations.first())); + } + else { + ui.destination_label->setVisible(false); + ui.file_url->setVisible(false); + } + ui.extra_params->setVisible(false); + d->adjustSize(); + ui.button_more->setIcon(KIcon("configure")); + ui.add_clip->setChecked(KdenliveSettings::add_new_clip()); + ui.extra_params->setPlainText(params.simplified().section(' ', 0, -2)); + QString mess = desc; + mess.append(' ' + i18np("(%1 clip)", "(%1 clips)", ids.count())); + ui.info_label->setText(mess); + if (d->exec() != QDialog::Accepted) { + delete d; + return; + } + params = ui.extra_params->toPlainText().simplified(); + KdenliveSettings::setAdd_new_clip(ui.add_clip->isChecked()); + int index = 0; + i = ids.constBegin(); + while (i != ids.constEnd()) { + ProjectItem *item = getItemById(i.key()); + if (!item || !item->referencedClip()) continue; + QString src = i.value(); + QString dest; + if (ids.count() > 1) { + dest = destinations.at(index); + index++; + } + else dest = ui.file_url->url().path(); + 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_new_clip()); + jobParams << params; + CutClipJob *job = new CutClipJob(item->clipType(), i.key(), jobParams); + if (job->isExclusive() && hasPendingJob(item, job->jobType)) { + delete job; + continue; + } + m_jobList.append(job); + setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + ++i; + } + delete d; + slotCheckJobProcess(); + +} void ProjectList::slotCheckJobProcess() { @@ -2631,27 +3055,28 @@ void ProjectList::slotCheckJobProcess() } } if (m_jobList.isEmpty()) return; - int count = 0; + m_jobMutex.lock(); + int count = 0; for (int i = 0; i < m_jobList.count(); i++) { - if (m_jobList.at(i)->jobStatus == JOBWORKING || m_jobList.at(i)->jobStatus == JOBWAITING) + if (m_jobList.at(i)->status() == JOBWORKING || m_jobList.at(i)->status() == JOBWAITING) count ++; else { // remove finished jobs AbstractClipJob *job = m_jobList.takeAt(i); - delete job; + job->deleteLater(); i--; } } - - emit jobCount(count); + emit jobCount(count); m_jobMutex.unlock(); - 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) { + Q_UNUSED(path) + ProjectItem *item = getItemById(id); if (!item) return; if (!item->isProxyRunning()) slotGotProxy(item); @@ -2667,14 +3092,14 @@ void ProjectList::slotProcessJobs() int count = 0; m_jobMutex.lock(); for (int i = 0; i < m_jobList.count(); i++) { - if (m_jobList.at(i)->jobStatus == JOBWAITING) { + if (m_jobList.at(i)->status() == JOBWAITING) { if (job == NULL) { - m_jobList.at(i)->jobStatus = JOBWORKING; + m_jobList.at(i)->setStatus(JOBWORKING); job = m_jobList.at(i); } count++; } - else if (m_jobList.at(i)->jobStatus == JOBWORKING) + else if (m_jobList.at(i)->status() == JOBWORKING) count ++; } // Set jobs count @@ -2685,10 +3110,10 @@ void ProjectList::slotProcessJobs() break; } QString destination = job->destination(); - // Check if the clip is still here - ProjectItem *processingItem = getItemById(job->clipId()); - if (processingItem == NULL) { + DocClipBase *currentClip = m_doc->clipManager()->getClipById(job->clipId()); + //ProjectItem *processingItem = getItemById(job->clipId()); + if (currentClip == NULL) { job->setStatus(JOBDONE); continue; } @@ -2696,86 +3121,38 @@ void ProjectList::slotProcessJobs() 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))); + + if (job->jobType == MLTJOB) { + MeltJob *jb = static_cast (job); + jb->setProducer(currentClip->getProducer(), currentClip->fileURL()); + if (jb->isProjectFilter()) + connect(job, SIGNAL(gotFilterJobResults(QString,int, int, stringMap,stringMap)), this, SLOT(slotGotFilterJobResults(QString,int, int,stringMap,stringMap))); + else + connect(job, SIGNAL(gotFilterJobResults(QString,int, int, stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int,stringMap,stringMap))); + } + job->startJob(); + if (job->status() == 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->status() == JOBCRASHED || job->status() == JOBABORTED) { + emit updateJobStatus(job->clipId(), job->jobType, job->status(), job->errorMessage(), QString(), job->logDetails()); } - continue; } // Thread finished, cleanup & update count QTimer::singleShot(200, this, SIGNAL(checkJobProcess())); @@ -2801,7 +3178,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()) { @@ -2809,7 +3186,7 @@ void ProjectList::updateProxyConfig() QMap oldProps;// = clip->properties(); oldProps.insert("proxy", QString()); QMap newProps; - newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + "." + m_doc->getDocumentProperty("proxyextension")); + newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + '.' + m_doc->getDocumentProperty("proxyextension")); new EditClipCommand(this, clip->getId(), oldProps, newProps, true, command); } } @@ -2818,7 +3195,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); @@ -2843,7 +3219,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); } } @@ -2915,7 +3290,7 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) //oldProps = clip->properties(); if (doProxy) { newProps.clear(); - QString path = proxydir + clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); + QString path = proxydir + clip->getClipHash() + '.' + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); // insert required duration for proxy newProps.insert("proxy_out", clip->producerProperty("out")); newProps.insert("proxy", path); @@ -3019,14 +3394,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")); } } @@ -3034,17 +3408,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(); @@ -3053,7 +3430,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); @@ -3061,17 +3437,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; @@ -3079,7 +3455,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->status() == JOBWAITING || job->status() == JOBWORKING)) return true; } return false; @@ -3089,14 +3465,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; @@ -3109,14 +3484,11 @@ void ProjectList::slotUpdateJobStatus(ProjectItem *item, int type, int status, c item->setJobStatus((JOBTYPE) type, (CLIPJOBSTATUS) status); if (status != JOBCRASHED) return; #if KDE_IS_VERSION(4,7,0) - m_infoMessage->animatedHide(); - m_errorLog.clear(); - m_infoMessage->setText(label); - m_infoMessage->setWordWrap(label.length() > 35); - m_infoMessage->setMessageType(KMessageWidget::Warning); QList actions = m_infoMessage->actions(); - for (int i = 0; i < actions.count(); i++) { - m_infoMessage->removeAction(actions.at(i)); + if (m_infoMessage->isHidden()) { + m_infoMessage->setText(label); + m_infoMessage->setWordWrap(m_infoMessage->text().length() > 35); + m_infoMessage->setMessageType(KMessageWidget::Warning); } if (!actionName.isEmpty()) { @@ -3127,38 +3499,358 @@ void ProjectList::slotUpdateJobStatus(ProjectItem *item, int type, int status, c action = coll->action(actionName); if (action) break; } - if (action) m_infoMessage->addAction(action); + if (action && !actions.contains(action)) m_infoMessage->addAction(action); } if (!details.isEmpty()) { - m_errorLog = details; - m_infoMessage->addAction(m_logAction); + m_errorLog.append(details); + if (!actions.contains(m_logAction)) m_infoMessage->addAction(m_logAction); } m_infoMessage->animatedShow(); +#else + // warning for KDE < 4.7 + KPassivePopup *passivePop = new KPassivePopup( this ); + passivePop->setAutoDelete(true); + connect(passivePop, SIGNAL(clicked()), this, SLOT(slotClosePopup())); + m_errorLog.append(details); + KVBox *vb = new KVBox( passivePop ); + KHBox *vh1 = new KHBox( vb ); + KIcon icon("dialog-warning"); + QLabel *iconLabel = new QLabel(vh1); + iconLabel->setPixmap(icon.pixmap(m_listView->iconSize())); + (void) new QLabel( label, vh1); + KHBox *box = new KHBox( vb ); + QPushButton *but = new QPushButton( "Show log", box ); + connect(but, SIGNAL(clicked(bool)), this, SLOT(slotShowJobLog())); + + passivePop->setView( vb ); + passivePop->show(); + #endif } void ProjectList::slotShowJobLog() { -#if KDE_IS_VERSION(4,7,0) KDialog d(this); d.setButtons(KDialog::Close); QTextEdit t(&d); - t.setPlainText(m_errorLog); + for (int i = 0; i < m_errorLog.count(); i++) { + if (i > 0) t.insertHtml("

"); + t.insertPlainText(m_errorLog.at(i)); + } 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)->status() == JOBWAITING || m_jobList.at(i)->status() == 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&consumer, const QString&consumerParams, const QMap &extraParams) +{ + ProjectItem *item = getItemById(id); + if (!item) return; + QStringList jobParams; + jobParams << QString::number((int) info.cropStart.frames(m_fps)) << QString::number((int) (info.cropStart + info.cropDuration).frames(m_fps)); + jobParams << QString() << filterName << filterParams << consumer << consumerParams << QString::number((int) info.startPos.frames(m_fps)) << QString::number(info.track); + MeltJob *job = new MeltJob(item->clipType(), id, jobParams, extraParams); + if (job->isExclusive() && hasPendingJob(item, job->jobType)) { + delete job; + return; + } + job->description = i18n("Filter %1", extraParams.value("finalfilter")); + m_jobList.append(job); + setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + slotCheckJobProcess(); +} + +void ProjectList::startClipFilterJob(const QString &filterName, const QString &condition) +{ + QMap ids = getConditionalIds(condition); + QStringList destination; + QMap::const_iterator first = ids.constBegin(); + if (first == ids.constEnd()) { + emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2, ErrorMessage); + return; + } + ProjectItem *item = getItemById(first.key()); + if (!item) { + emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2, ErrorMessage); + return; + } + if (ids.count() == 1) { + destination << item->clipUrl().path(); + } + else { + destination = ids.values(); + } + + if (filterName == "motion_est") { + // Show config dialog + QPointer d = new QDialog(this); + Ui::SceneCutDialog_UI ui; + ui.setupUi(d); + // Set up categories + for (int i = 0; i < 5; ++i) { + ui.marker_type->insertItem(i, i18n("Category %1", i)); + ui.marker_type->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole); + } + ui.marker_type->setCurrentIndex(KdenliveSettings::default_marker_type()); + if (d->exec() != QDialog::Accepted) { + delete d; + return; + } + // Autosplit filter + QStringList jobParams; + // Producer params + jobParams << QString(); + // Filter params, use a smaller region of the image to speed up operation + // In fact, it's faster to rescale whole image than using part of it (bounding=\"25%x25%:15%x15\") + jobParams << filterName << "shot_change_list=0 denoise=0"; + // Consumer + jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1 rescale=nearest deinterlace_method=onefield top_field_first=-1"; + QMap extraParams; + extraParams.insert("key", "shot_change_list"); + extraParams.insert("projecttreefilter", "1"); + QString keyword("%count"); + extraParams.insert("resultmessage", i18n("Found %1 scenes.", keyword)); + extraParams.insert("resize_profile", "160"); + if (ui.store_data->isChecked()) { + // We want to save result as clip metadata + extraParams.insert("storedata", "1"); + } + if (ui.zone_only->isChecked()) { + // We want to analyze only clip zone + extraParams.insert("zoneonly", "1"); + } + if (ui.add_markers->isChecked()) { + // We want to create markers + extraParams.insert("addmarkers", QString::number(ui.marker_type->currentIndex())); + } + if (ui.cut_scenes->isChecked()) { + // We want to cut scenes + extraParams.insert("cutscenes", "1"); + } + delete d; + processClipJob(ids.keys(), QString(), false, jobParams, i18n("Auto split"), extraParams); + } + else { + QPointer d = new ClipStabilize(destination, filterName); + if (d->exec() == QDialog::Accepted) { + QMap extraParams; + extraParams.insert("producer_profile", "1"); + processClipJob(ids.keys(), d->destination(), d->autoAddClip(), d->params(), d->desc(), extraParams); + } + delete d; + } +} + +void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap extraParams) +{ + QStringList preParams; + // in and out + preParams << QString::number(0) << QString::number(-1); + // producer params + preParams << jobParams.takeFirst(); + // filter name + preParams << jobParams.takeFirst(); + // filter params + preParams << jobParams.takeFirst(); + // consumer + QString consumer = jobParams.takeFirst(); + + foreach(const QString&id, ids) { + ProjectItem *item = getItemById(id); + if (!item) continue; + QStringList jobArgs; + if (extraParams.contains("zoneonly")) { + // Analyse clip zone only, remove in / out and replace with zone + preParams.takeFirst(); + preParams.takeFirst(); + QPoint zone = item->referencedClip()->zone(); + jobArgs << QString::number(zone.x()) << QString::number(zone.y()); + } + jobArgs << preParams; + if (ids.count() == 1) { + jobArgs << consumer + ':' + destination; + } + else { + jobArgs << consumer + ':' + destination + item->clipUrl().fileName() + ".mlt"; + } + jobArgs << jobParams; + + MeltJob *job = new MeltJob(item->clipType(), id, jobArgs, extraParams); + if (autoAdd) { + job->setAddClipToProject(true); + kDebug()<<"// ADDING TRUE"; + } + else kDebug()<<"// ADDING FALSE!!!"; + + if (job->isExclusive() && hasPendingJob(item, job->jobType)) { + delete job; + return; + } + job->description = description; + 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); +} + +void ProjectList::updatePalette() +{ + m_infoLabel->setStyleSheet(SmallInfoLabel::getStyleSheet(QApplication::palette())); + m_listView->updateStyleSheet(); +} + +void ProjectList::slotResetInfoMessage() +{ +#if KDE_IS_VERSION(4,7,0) + m_errorLog.clear(); + QList actions = m_infoMessage->actions(); + for (int i = 0; i < actions.count(); i++) { + m_infoMessage->removeAction(actions.at(i)); + } +#endif +} + +void ProjectList::slotClosePopup() +{ + m_errorLog.clear(); +} + +void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap results, stringMap filterInfo) +{ + // Currently, only the first value of results is used + //kDebug()<<"// FILTER RES:\n"<setText(i18n("Auto Split Clip")); + foreach (QString pos, value) { + if (!pos.contains("=")) continue; + int newPos = pos.section("=", 0, 0).toInt(); + // Don't use scenes shorter than 1 second + if (newPos - cutPos < 24) continue; + (void) new AddClipCutCommand(this, id, cutPos + offset, newPos + offset, QString(), true, false, command); + cutPos = newPos; + } + if (command->childCount() == 0) + delete command; + else m_commandStack->push(command); + } + if (markersType >= 0) { + // Add markers from returned data + dataProcessed = true; + int cutPos = 0; + QUndoCommand *command = new QUndoCommand(); + command->setText(i18n("Add Markers")); + QList markersList; + int index = 1; + foreach (QString pos, value) { + if (!pos.contains("=")) continue; + int newPos = pos.section("=", 0, 0).toInt(); + // Don't use scenes shorter than 1 second + if (newPos - cutPos < 24) continue; + CommentedTime m(GenTime(newPos + offset, m_fps), QString::number(index), markersType); + markersList << m; + index++; + cutPos = newPos; + } + emit addMarkers(id, markersList); + } + if (!dataProcessed || filterInfo.contains("storedata")) { + // Store returned data as clip extra data + clip->referencedClip()->setAnalysisData(filterInfo.contains("displaydataname") ? filterInfo.value("displaydataname") : key, results.value(key), filterInfo.value("offset").toInt()); + emit updateAnalysisData(clip->referencedClip()); + } +} + + +/* +// Work in progress: apply filter based on clip's camcorder +void ProjectList::checkCamcorderFilters(DocClipBase *clip, QMap meta) +{ + KConfig conf("camcorderfilters.rc", KConfig::CascadeConfig, "appdata"); + QStringList groups = conf.groupList(); + foreach(QString grp, groups) { + if (!meta.contains(grp)) continue; + KConfigGroup group(&conf, grp); + QString value = group.readEntry(meta.value(grp)); + if (value.isEmpty()) continue; + clip->setProperty(value.section(' ', 0, 0), value.section(' ', 1)); + break; + } +}*/ #include "projectlist.moc"