#include "ui_templateclip_ui.h"
#include "ui_cutjobdialog_ui.h"
+#include "ui_scenecutdialog_ui.h"
#include <KDebug>
#include <KAction>
QStringList InvalidDialog::getIds() const
{
QStringList ids;
- for (int i = 0; i < m_clipList->count(); i++) {
+ for (int i = 0; i < m_clipList->count(); ++i) {
ids << m_clipList->item(i)->data(Qt::UserRole).toString();
}
return ids;
ProjectList::ProjectList(QWidget *parent) :
- QWidget(parent),
- m_render(NULL),
- m_fps(-1),
- m_commandStack(NULL),
- m_openAction(NULL),
- m_reloadAction(NULL),
- m_extractAudioAction(NULL),
- m_transcodeAction(NULL),
- m_stabilizeAction(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> ("stringMap");
QVBoxLayout *layout = new QVBoxLayout;
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(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(requestMenu(QPoint,QTreeWidgetItem*)), this, SLOT(slotContextMenu(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 <QUrl>, const QString &, const QString &)), this, SLOT(slotAddClip(const QList <QUrl>, const QString &, const QString &)));
- connect(this, SIGNAL(addClip(const QString, const QString &, const QString &)), this, SLOT(slotAddClip(const QString, const QString &, const QString &)));
- connect(m_listView, SIGNAL(addClipCut(const QString &, int, int)), this, SLOT(slotAddClipCut(const QString &, int, int)));
- connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));
- connect(m_listView, SIGNAL(showProperties(DocClipBase *)), this, SIGNAL(showClipProperties(DocClipBase *)));
+ connect(m_listView, SIGNAL(addClip(QList<QUrl>,QString,QString)), this, SLOT(slotAddClip(QList<QUrl>,QString,QString)));
+ connect(this, SIGNAL(addClip(QString,QString,QString)), this, SLOT(slotAddClip(QString,QString,QString)));
+ connect(m_listView, SIGNAL(addClipCut(QString,int,int)), this, SLOT(slotAddClipCut(QString,int,int)));
+ connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemEdited(QTreeWidgetItem*,int)));
+ connect(m_listView, SIGNAL(showProperties(DocClipBase*)), this, SIGNAL(showClipProperties(DocClipBase*)));
- connect(this, SIGNAL(cancelRunningJob(const QString, stringMap )), this, SLOT(slotCancelRunningJob(const QString, stringMap)));
- connect(this, SIGNAL(processLog(const QString, int , int, const QString)), this, SLOT(slotProcessLog(const QString, int , int, const QString)));
+ connect(this, SIGNAL(cancelRunningJob(QString,stringMap)), this, SLOT(slotCancelRunningJob(QString,stringMap)));
+ connect(this, SIGNAL(processLog(QString,int,int,QString)), this, SLOT(slotProcessLog(QString,int,int,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(QString,int,int,QString,QString,QString)), this, SLOT(slotUpdateJobStatus(QString,int,int,QString,QString,QString)));
- connect(this, SIGNAL(gotProxy(const QString)), this, SLOT(slotGotProxyForId(const QString)));
+ connect(this, SIGNAL(gotProxy(QString)), this, SLOT(slotGotProxyForId(QString)));
m_listViewDelegate = new ItemDelegate(m_listView);
m_listView->setItemDelegate(m_listViewDelegate);
ProjectList::~ProjectList()
{
m_abortAllJobs = true;
- for (int i = 0; i < m_jobList.count(); i++) {
+ for (int i = 0; i < m_jobList.count(); ++i) {
m_jobList.at(i)->setStatus(JOBABORTED);
}
m_closing = true;
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;
void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction)
{
QList <QAction *> actions = addMenu->actions();
- for (int i = 0; i < actions.count(); i++) {
+ for (int i = 0; i < actions.count(); ++i) {
if (actions.at(i)->data().toString() == "clip_properties") {
m_editButton->setDefaultAction(actions.at(i));
actions.removeAt(i);
- i--;
+ --i;
} else if (actions.at(i)->data().toString() == "delete_clip") {
m_deleteButton->setDefaultAction(actions.at(i));
actions.removeAt(i);
- i--;
+ --i;
} else if (actions.at(i)->data().toString() == "edit_clip") {
m_openAction = actions.at(i);
actions.removeAt(i);
- i--;
+ --i;
} else if (actions.at(i)->data().toString() == "reload_clip") {
m_reloadAction = actions.at(i);
actions.removeAt(i);
- i--;
+ --i;
} else if (actions.at(i)->data().toString() == "proxy_clip") {
m_proxyAction = actions.at(i);
actions.removeAt(i);
- i--;
+ --i;
}
}
void ProjectList::setupGeneratorMenu(const QHash<QString,QMenu*>& 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();
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);
int commonDuration = -1;
bool hasImages = false;;
ProjectItem *item;
- for (int i = 0; i < list.count(); i++) {
+ for (int i = 0; i < list.count(); ++i) {
item = NULL;
if (list.at(i)->type() == PROJECTFOLDERTYPE) {
// Add folder items to the list
kDebug() << "Result: " << p.key() << " = " << p.value();
}*/
if (clipList.isEmpty()) {
- emit displayMessage(i18n("No available clip selected"), -2);
+ emit displayMessage(i18n("No available clip selected"), -2, ErrorMessage);
}
else emit showClipProperties(clipList, commonproperties);
}
}
emit deleteProjectClips(ids, QMap <QString, QString>());
- for (int i = 0; i < urls.count(); i++)
+ for (int i = 0; i < urls.count(); ++i)
KIO::NetAccess::del(KUrl(urls.at(i)), this);
}
if (itemToReLoad) selected.append(itemToReLoad);
}
ProjectItem *item;
- for (int i = 0; i < selected.count(); i++) {
+ for (int i = 0; i < selected.count(); ++i) {
if (selected.at(i)->type() != PROJECTCLIPTYPE) {
if (selected.at(i)->type() == PROJECTFOLDERTYPE) {
for (int j = 0; j < selected.at(i)->childCount(); j++)
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);
} else {
pixmap = KIcon("view-refresh").pixmap(m_listView->iconSize());
}
- item->setData(0, Qt::DecorationRole, pixmap);
+ item->setPixmap(pixmap);
}
}
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);
Mlt::Producer *newProd = m_render->invalidProducer(id);
}
}
update();
- emit displayMessage(i18n("Check missing clips"), -2);
+ emit displayMessage(i18n("Check missing clips"), -2, ErrorMessage);
emit updateRenderStatus();
}
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 <ProjectItem*>(item->parent());
- if (clip == NULL) kDebug() << "-----------ERROR";
+ if (clip == NULL) {
+ kDebug() << "-----------ERROR";
+ return;
+ }
SubProjectItem *sub = static_cast <SubProjectItem*>(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;
clip = static_cast <ProjectItem*>(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);
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;
{
if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW) {
- m_stabilizeAction->setEnabled(false);
+ m_clipsActionsMenu->setEnabled(false);
return;
}
- m_stabilizeAction->setEnabled(true);
+ m_clipsActionsMenu->setEnabled(true);
}
QList<QAction *> transcodeActions = m_transcodeAction->actions();
QStringList data;
QString condition;
- for (int i = 0; i < transcodeActions.count(); i++) {
+ for (int i = 0; i < transcodeActions.count(); ++i) {
data = transcodeActions.at(i)->data().toStringList();
if (data.count() > 2) {
condition = data.at(2);
ProjectItem *item = getItemById(id);
if (item) {
slotUpdateClipProperties(item, properties);
- if (properties.contains("out") || properties.contains("force_fps") || properties.contains("resource") || properties.contains("video_index") || properties.contains("audio_index")) {
+ if (properties.contains("out") || properties.contains("force_fps") || properties.contains("resource") || properties.contains("video_index") || properties.contains("audio_index") || properties.contains("full_luma") || properties.contains("force_progressive") || properties.contains("force_tff") || properties.contains("force_colorspace")) {
slotReloadClip(id);
} else if (properties.contains("colour") ||
properties.contains("xmldata") ||
properties.contains("templatetext")) {
slotRefreshClipThumbnail(item);
emit refreshClip(id, true);
- } else if (properties.contains("full_luma") || properties.contains("force_colorspace") || properties.contains("loop")) {
+ } else if (properties.contains("loop")) {
emit refreshClip(id, false);
}
}
if (item->type() == PROJECTFOLDERTYPE) {
if (column == 0) {
FolderProjectItem *folder = static_cast <FolderProjectItem*>(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));
const int children = item->childCount();
- for (int i = 0; i < children; i++) {
+ for (int i = 0; i < children; ++i) {
ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
child->setProperty("groupname", item->text(0));
}
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 <ProjectItem*>(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 <ProjectItem*>(item);
} 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()));
QUndoCommand *delCommand = new QUndoCommand();
delCommand->setText(i18n("Delete Clip Zone"));
- for (int i = 0; i < selected.count(); i++) {
+ for (int i = 0; i < selected.count(); ++i) {
if (selected.at(i)->type() == PROJECTSUBCLIPTYPE) {
// subitem
SubProjectItem *sub = static_cast <SubProjectItem *>(selected.at(i));
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) {
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)
m_listView->blockSignals(false);
m_doc->clipManager()->addFolder(clipId, foldername);
const int children = item->childCount();
- for (int i = 0; i < children; i++) {
+ for (int i = 0; i < children; ++i) {
ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
child->setProperty("groupname", foldername);
}
//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()) {
}
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)));
+ connect(clip, SIGNAL(createProxy(QString)), this, SLOT(slotCreateProxy(QString)));
+ connect(clip, SIGNAL(abortProxy(QString,QString)), this, SLOT(slotAbortProxy(QString,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();
// Add cut zones
QList <CutZoneInfo> 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);
+ for (int i = 0; i < cuts.count(); ++i) {
+ 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)) {
{
m_listView->blockSignals(true);
m_abortAllJobs = true;
- for (int i = 0; i < m_jobList.count(); i++) {
+ for (int i = 0; i < m_jobList.count(); ++i) {
m_jobList.at(i)->setStatus(JOBABORTED);
}
m_closing = true;
{
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);
requestClipThumbnail(item->clipId());
}
else {
- processThumbOverlays(item, pix);
- item->setData(0, Qt::DecorationRole, pix);
+ QPixmap result = roundedPixmap(pix);
+ processThumbOverlays(item, result);
+ item->setPixmap(result);
}
}
else {
}
}
+QPixmap ProjectList::roundedPixmap(const 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(const 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;
}
if (clip->isPlaceHolder() == false && !hasPendingJob(item, PROXYJOB)) {
QDomElement xml = clip->toXML();
+ getCachedThumbnail(item);
if (fpsChanged) {
xml.removeAttribute("out");
xml.removeAttribute("file_hash");
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<QPixmap>(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()) {
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());
}
delete d;
} else {
- for (int i = 0; i < givenList.count(); i++)
+ for (int i = 0; i < givenList.count(); ++i)
list << givenList.at(i);
}
QList <KUrl::List> foldersList;
if (!foldersList.isEmpty()) {
// create folders
- for (int i = 0; i < foldersList.count(); i++) {
+ for (int i = 0; i < foldersList.count(); ++i) {
KUrl::List urls = foldersList.at(i);
KUrl folderUrl = urls.takeFirst();
QString folderName = folderUrl.fileName();
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");
{
m_listView->blockSignals(true);
m_abortAllJobs = true;
- for (int i = 0; i < m_jobList.count(); i++) {
+ for (int i = 0; i < m_jobList.count(); ++i) {
m_jobList.at(i)->setStatus(JOBABORTED);
}
m_closing = true;
m_refreshed = true;
m_allClipsProcessed = true;
}
- for (int i = 0; i < list.count(); i++)
+ for (int i = 0; i < list.count(); ++i)
slotAddClip(list.at(i), false);
m_listView->blockSignals(false);
- connect(m_doc->clipManager(), SIGNAL(reloadClip(const QString &)), this, SLOT(slotReloadClip(const QString &)));
- connect(m_doc->clipManager(), SIGNAL(modifiedClip(const QString &)), this, SLOT(slotModifiedClip(const QString &)));
- connect(m_doc->clipManager(), SIGNAL(missingClip(const QString &)), this, SLOT(slotMissingClip(const QString &)));
- connect(m_doc->clipManager(), SIGNAL(availableClip(const QString &)), this, SLOT(slotAvailableClip(const QString &)));
- connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool, QStringList)), this, SLOT(updateAllClips(bool, bool, QStringList)));
+ connect(m_doc->clipManager(), SIGNAL(reloadClip(QString)), this, SLOT(slotReloadClip(QString)));
+ connect(m_doc->clipManager(), SIGNAL(modifiedClip(QString)), this, SLOT(slotModifiedClip(QString)));
+ connect(m_doc->clipManager(), SIGNAL(missingClip(QString)), this, SLOT(slotMissingClip(QString)));
+ connect(m_doc->clipManager(), SIGNAL(availableClip(QString)), this, SLOT(slotAvailableClip(QString)));
+ connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool,bool,QStringList)), this, SLOT(updateAllClips(bool,bool,QStringList)));
+ connect(m_doc->clipManager(), SIGNAL(thumbReady(QString,int,QImage)), this, SLOT(slotSetThumbnail(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 <ProjectItem *>(item->parent());
+ if (!item && framePos == 0) pItem = getItemById(id);
+ if (!item && !pItem) return;
+ if (item) {
+ if (item->type() == PROJECTCLIPTYPE) static_cast<ProjectItem*>(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 <DocClipBase*> ProjectList::documentClipList() const
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();
}
}
+void ProjectList::extractMetadata(DocClipBase *clip)
+{
+ CLIPTYPE t = clip->clipType();
+ if (t != AV && t != VIDEO) {
+ // Currently, we only use exiftool on video files
+ return;
+ }
+ QMap <QString, QString> props = clip->properties();
+ if (KdenliveSettings::use_exiftool() && !props.contains("exiftool")) {
+ QMap <QString, QString> 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 <QString, QString> 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();
}
item->setProperties(properties, metadata);
clip->setProducer(producer, replace);
+ extractMetadata(clip);
+ m_render->processingDone(clipId);
// Proxy stuff
QString size = properties.value("frame_size");
}
}
- 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()) {
} 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());
return;
}
if (replace) toReload = clipId;
- if (!toReload.isEmpty())
+ if (!toReload.isEmpty()) {
emit clipNeedsReload(toReload);
+ }
}
bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)
{
ProjectItem *item = getItemById(clipId);
if (item && !img.isNull()) {
- 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();
+ 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);
if (result == NULL || !id.contains('#')) {
return result;
} else {
- for (int i = 0; i < result->childCount(); i++) {
+ for (int i = 0; i < result->childCount(); ++i) {
SubProjectItem *sub = static_cast <SubProjectItem *>(result->child(i));
if (sub && sub->zone().x() == id.section('#', 1, 1).toInt())
return sub;
{
FolderProjectItem *item = NULL;
QList <QTreeWidgetItem *> hits = m_listView->findItems(name, Qt::MatchExactly, 0);
- for (int i = 0; i < hits.count(); i++) {
+ for (int i = 0; i < hits.count(); ++i) {
if (hits.at(i)->type() == PROJECTFOLDERTYPE) {
item = static_cast<FolderProjectItem *>(hits.at(i));
break;
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);
KUrl::List result;
ProjectItem *item;
QList<QTreeWidgetItem *> list = m_listView->selectedItems();
- for (int i = 0; i < list.count(); i++) {
+ for (int i = 0; i < list.count(); ++i) {
if (list.at(i)->type() == PROJECTFOLDERTYPE)
continue;
if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
return result;
}
-QStringList ProjectList::getConditionalIds(const QString &condition) const
+QMap <QString, QString> ProjectList::getConditionalIds(const QString &condition) const
{
- QStringList result;
+ QMap <QString, QString> result;
ProjectItem *item;
QList<QTreeWidgetItem *> list = m_listView->selectedItems();
- for (int i = 0; i < list.count(); i++) {
+ for (int i = 0; i < list.count(); ++i) {
if (list.at(i)->type() == PROJECTFOLDERTYPE)
continue;
if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
else if (condition.startsWith("acodec") && !clip->hasAudioCodec(condition.section('=', 1, 1)))
continue;
}
- result.append(item->clipId());
+ result.insert(item->clipId(), item->clipUrl().path());
}
return result;
}
}
file.close();
QDomNodeList texts = doc.elementsByTagName("content");
- for (int i = 0; i < texts.count(); i++) {
+ for (int i = 0; i < texts.count(); ++i) {
QString data = texts.item(i).firstChild().nodeValue();
data.replace("%s", replaceString);
texts.item(i).firstChild().setNodeValue(data);
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 <int>() << in);
monitorItemEditing(true);
}
emit projectModified();
emit projectModified();
}
-SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, QPoint zone)
+SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, const QPoint &zone)
{
SubProjectItem *sub = NULL;
if (clip) {
- for (int i = 0; i < clip->childCount(); i++) {
+ for (int i = 0; i < clip->childCount(); ++i) {
QTreeWidgetItem *it = clip->child(i);
if (it->type() == PROJECTSUBCLIPTYPE) {
sub = static_cast <SubProjectItem*>(it);
m_commandStack->push(command);
}
-void ProjectList::doUpdateClipCut(const QString &id, const QPoint oldzone, const QPoint zone, const QString &comment)
+void ProjectList::doUpdateClipCut(const QString &id, const QPoint &oldzone, const QPoint &zone, const QString &comment)
{
ProjectItem *clip = getItemById(id);
SubProjectItem *sub = getSubItem(clip, oldzone);
m_render->forceProcessing(id);
}
-void ProjectList::slotAddOrUpdateSequence(const QString frameName)
+void ProjectList::slotAddOrUpdateSequence(const QString &frameName)
{
QString fileName = KUrl(frameName).fileName().section('_', 0, -2);
QStringList list;
m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1));
}
- } else emit displayMessage(i18n("Sequence not found"), -2);
+ } else emit displayMessage(i18n("Sequence not found"), -2, ErrorMessage);
}
QMap <QString, QString> ProjectList::getProxies()
return list;
}
-void ProjectList::slotCreateProxy(const QString id)
+void ProjectList::slotCreateProxy(const QString &id)
{
ProjectItem *item = getItemById(id);
if (!item || hasPendingJob(item, PROXYJOB) || item->referencedClip()->isPlaceHolder()) return;
void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, QString desc)
{
QStringList existingFiles;
- QStringList ids = getConditionalIds(condition);
+ QMap <QString, QString> ids = getConditionalIds(condition);
+ QMap<QString, QString>::const_iterator i = ids.constBegin();
QStringList destinations;
- foreach(const QString &id, ids) {
- ProjectItem *item = getItemById(id);
- if (!item) continue;
- QString newFile = params.section(' ', -1).replace("%1", item->clipUrl().path());
- destinations << newFile;
+ 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;
params = ui.extra_params->toPlainText().simplified();
KdenliveSettings::setAdd_new_clip(ui.add_clip->isChecked());
int index = 0;
- foreach(const QString &id, ids) {
- ProjectItem *item = getItemById(id);
+ i = ids.constBegin();
+ while (i != ids.constEnd()) {
+ ProjectItem *item = getItemById(i.key());
if (!item || !item->referencedClip()) continue;
- QString src = item->clipUrl().path();
+ QString src = i.value();
QString dest;
if (ids.count() > 1) {
dest = destinations.at(index);
jobParams << duration;
jobParams << QString::number(KdenliveSettings::add_new_clip());
jobParams << params;
- CutClipJob *job = new CutClipJob(item->clipType(), id, jobParams);
+ 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();
// Remove inactive threads
QList <QFuture<void> > futures = m_jobThreads.futures();
m_jobThreads.clearFutures();
- for (int i = 0; i < futures.count(); i++)
+ for (int i = 0; i < futures.count(); ++i)
if (!futures.at(i).isFinished()) {
m_jobThreads.addFuture(futures.at(i));
}
}
if (m_jobList.isEmpty()) return;
- int count = 0;
+
m_jobMutex.lock();
- for (int i = 0; i < m_jobList.count(); i++) {
- if (m_jobList.at(i)->jobStatus == JOBWORKING || m_jobList.at(i)->jobStatus == JOBWAITING)
+ int count = 0;
+ for (int i = 0; i < m_jobList.count(); ++i) {
+ 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;
- i--;
+ 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)
+void ProjectList::slotAbortProxy(const QString &id, const QString &path)
{
Q_UNUSED(path)
AbstractClipJob *job = NULL;
int count = 0;
m_jobMutex.lock();
- for (int i = 0; i < m_jobList.count(); i++) {
- if (m_jobList.at(i)->jobStatus == JOBWAITING) {
+ for (int i = 0; i < m_jobList.count(); ++i) {
+ 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
file.close();
QFile::remove(destination);
}
- connect(job, SIGNAL(jobProgress(QString, int, int)), this, SIGNAL(processLog(QString, int, int)));
- connect(job, SIGNAL(cancelRunningJob(const QString, stringMap)), this, SIGNAL(cancelRunningJob(const QString, stringMap)));
+ connect(job, SIGNAL(jobProgress(QString,int,int)), this, SIGNAL(processLog(QString,int,int)));
+ connect(job, SIGNAL(cancelRunningJob(QString,stringMap)), this, SIGNAL(cancelRunningJob(QString,stringMap)));
if (job->jobType == MLTJOB) {
MeltJob *jb = static_cast<MeltJob *> (job);
jb->setProducer(currentClip->getProducer(), currentClip->fileURL());
if (jb->isProjectFilter())
- connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)), this, SLOT(slotGotFilterJobResults(QString,int, int, QString,stringMap)));
+ 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, QString,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)));
+ connect(job, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap)));
}
job->startJob();
- if (job->jobStatus == JOBDONE) {
+ 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());
if (job->addClipToProject()) {
emit addClip(destination, QString(), QString());
}
- } else if (job->jobStatus == JOBCRASHED || job->jobStatus == JOBABORTED) {
- emit updateJobStatus(job->clipId(), job->jobType, job->jobStatus, job->errorMessage(), QString(), job->logDetails());
+ } else if (job->status() == JOBCRASHED || job->status() == JOBABORTED) {
+ emit updateJobStatus(job->clipId(), job->jobType, job->status(), job->errorMessage(), QString(), job->logDetails());
}
}
// Thread finished, cleanup & update count
else delete command;
}
-void ProjectList::slotProcessLog(const QString id, int progress, int type, const QString message)
+void ProjectList::slotProcessLog(const QString &id, int progress, int type, const QString &message)
{
ProjectItem *item = getItemById(id);
setJobStatus(item, (JOBTYPE) type, JOBWORKING, progress, message);
// expand list (folders, subclips) to get real clips
QTreeWidgetItem *listItem;
QList<ProjectItem *> clipList;
- for (int i = 0; i < list.count(); i++) {
+ for (int i = 0; i < list.count(); ++i) {
listItem = list.at(i);
if (listItem->type() == PROJECTFOLDERTYPE) {
for (int j = 0; j < listItem->childCount(); j++) {
QMap <QString, QString> newProps;
QMap <QString, QString> oldProps;
if (!doProxy) newProps.insert("proxy", "-");
- for (int i = 0; i < clipList.count(); i++) {
+ for (int i = 0; i < clipList.count(); ++i) {
ProjectItem *item = clipList.at(i);
CLIPTYPE t = item->clipType();
if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) {
void ProjectList::monitorItemEditing(bool enable)
{
- if (enable) connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));
- else disconnect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));
+ if (enable) connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemEdited(QTreeWidgetItem*,int)));
+ else disconnect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(slotItemEdited(QTreeWidgetItem*,int)));
}
QStringList ProjectList::expandedFolders() const
void ProjectList::slotCancelJobs()
{
m_abortAllJobs = true;
- for (int i = 0; i < m_jobList.count(); i++) {
+ for (int i = 0; i < m_jobList.count(); ++i) {
m_jobList.at(i)->setStatus(JOBABORTED);
}
m_jobThreads.waitForFinished();
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++) {
+ for (int i = 0; i < m_jobList.count(); ++i) {
DocClipBase *currentClip = m_doc->clipManager()->getClipById(m_jobList.at(i)->clipId());
if (!currentClip) continue;
QMap <QString, QString> newProps = m_jobList.at(i)->cancelProperties();
if (!item || !item->referencedClip() || m_abortAllJobs) return false;
AbstractClipJob *job;
QMutexLocker lock(&m_jobMutex);
- for (int i = 0; i < m_jobList.count(); i++) {
+ 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 == type && (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;
void ProjectList::deleteJobsForClip(const QString &clipId)
{
QMutexLocker lock(&m_jobMutex);
- for (int i = 0; i < m_jobList.count(); i++) {
+ for (int i = 0; i < m_jobList.count(); ++i) {
if (m_jobList.at(i)->clipId() == clipId) {
m_jobList.at(i)->setStatus(JOBABORTED);
}
if (!actionName.isEmpty()) {
QAction *action = NULL;
QList< KActionCollection * > collections = KActionCollection::allCollections();
- for (int i = 0; i < collections.count(); i++) {
+ for (int i = 0; i < collections.count(); ++i) {
KActionCollection *coll = collections.at(i);
action = coll->action(actionName);
if (action) break;
KDialog d(this);
d.setButtons(KDialog::Close);
QTextEdit t(&d);
- for (int i = 0; i < m_errorLog.count(); i++) {
+ for (int i = 0; i < m_errorLog.count(); ++i) {
if (i > 0) t.insertHtml("<br><hr /><br>");
t.insertPlainText(m_errorLog.at(i));
}
{
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)) {
+ 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;
}
void ProjectList::discardJobs(const QString &id, JOBTYPE type) {
QMutexLocker lock(&m_jobMutex);
- for (int i = 0; i < m_jobList.count(); i++) {
+ for (int i = 0; i < m_jobList.count(); ++i) {
if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobType == type || type == NOJOBTYPE)) {
// discard this job
m_jobList.at(i)->setStatus(JOBABORTED);
}
}
-void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QString&properties)
+void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&consumer, const QString&consumerParams, const QMap <QString, QString> &extraParams)
{
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 << QString() << 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);
+ 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", finalFilterName);
+ 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)
{
- QStringList ids = getConditionalIds(condition);
- QString destination;
- ProjectItem *item = getItemById(ids.at(0));
+ QMap <QString, QString> ids = getConditionalIds(condition);
+ QStringList destination;
+ QMap<QString, QString>::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);
+ emit displayMessage(i18n("Cannot find clip to process filter %1", filterName), -2, ErrorMessage);
return;
}
if (ids.count() == 1) {
- destination = item->clipUrl().path();
+ destination << item->clipUrl().path();
}
else {
- destination = item->clipUrl().directory();
+ destination = ids.values();
+ }
+ if (filterName == "framebuffer") {
+ Mlt::Profile profile;
+ QStringList keys = ids.keys();
+ int ix = 0;
+ foreach(const QString &url, destination) {
+ QString prodstring = QString("framebuffer:" + url + "?-1");
+ Mlt::Producer *reversed = new Mlt::Producer(profile, prodstring.toUtf8().constData());
+ if (!reversed || !reversed->is_valid()) {
+ emit displayMessage(i18n("Cannot reverse clip"), -2, ErrorMessage);
+ continue;
+ }
+ QString dest = url + ".mlt";
+ if (QFile::exists(dest)) {
+ if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", dest)) == KMessageBox::No) continue;
+ }
+ Mlt::Consumer *cons = new Mlt::Consumer(profile, "xml", dest.toUtf8().constData());
+ if (cons == NULL || !cons->is_valid()) {
+ emit displayMessage(i18n("Cannot render reversed clip"), -2, ErrorMessage);
+ continue;
+ }
+ Mlt::Playlist list;
+ list.insert_at(0, reversed, 0);
+ delete reversed;
+ cons->connect(list);
+ cons->run();
+ delete cons;
+ QString groupId;
+ QString groupName;
+ DocClipBase *base = m_doc->clipManager()->getClipById(keys.at(ix));
+ if (base) {
+ groupId = base->getProperty("groupid");
+ groupName = base->getProperty("groupname");
+ }
+ emit addClip(dest, groupId, groupName);
+ ix++;
+ }
+ return;
}
+
if (filterName == "motion_est") {
+ // Show config dialog
+ QPointer<QDialog> 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
- jobParams << filterName << "bounding=\"25%x25%:25%x25";
+ // 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";
- // Keys
- jobParams << "scene_cuts";
- QStringList extraParams;
- extraParams << "projecttreefilter" << "project_profile";
- processClipJob(ids, QString(), false, jobParams, i18n("Auto split"), extraParams);
+ jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1 rescale=nearest deinterlace_method=onefield top_field_first=-1";
+ QMap <QString, QString> 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<ClipStabilize> d = new ClipStabilize(destination, ids.count(), filterName);
+ QPointer<ClipStabilize> d = new ClipStabilize(destination, filterName);
if (d->exec() == QDialog::Accepted) {
- processClipJob(ids, d->destination(), d->autoAddClip(), d->params(), d->desc());
+ QMap <QString, QString> 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, QStringList extraParams)
+void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString> extraParams)
{
QStringList preParams;
// in and out
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;
job->description = description;
m_jobList.append(job);
setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
+ slotCheckJobProcess();
}
- slotCheckJobProcess();
}
+
void ProjectList::slotPrepareJobsMenu()
{
#if KDE_IS_VERSION(4,7,0)
m_errorLog.clear();
QList<QAction *> actions = m_infoMessage->actions();
- for (int i = 0; i < actions.count(); i++) {
+ for (int i = 0; i < actions.count(); ++i) {
m_infoMessage->removeAction(actions.at(i));
}
#endif
m_errorLog.clear();
}
-void ProjectList::slotGotFilterJobResults(QString id, int , int , QString filter, stringMap results)
+void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap results, stringMap filterInfo)
{
- if (filter == "motion_est") {
- // Autosplit filter, add sub zones
- QStringList cuts = results.value("scene_cuts").split(':', QString::SkipEmptyParts);
+ // Currently, only the first value of results is used
+ //kDebug()<<"// FILTER RES:\n"<<filterInfo<<"\n--------------\n"<<results;
+ ProjectItem *clip = getItemById(id);
+ if (!clip) return;
+
+ // Check for return value
+ int markersType = -1;
+ if (filterInfo.contains("addmarkers")) markersType = filterInfo.value("addmarkers").toInt();
+ if (results.isEmpty()) {
+ emit displayMessage(i18n("No data returned from clip analysis"), 0, ErrorMessage);
+ return;
+ }
+ bool dataProcessed = false;
+ QString key = filterInfo.value("key");
+ int offset = filterInfo.value("offset").toInt();
+ QStringList value = results.value(key).split(';', QString::SkipEmptyParts);
+ kDebug()<<"// RESULT; "<<key<<" = "<<value;
+ if (filterInfo.contains("resultmessage")) {
+ QString mess = filterInfo.value("resultmessage");
+ mess.replace("%count", QString::number(value.count()));
+ emit displayMessage(mess, 0, InformationMessage);
+ }
+ else emit displayMessage(i18n("Processing data analysis"), 0, InformationMessage);
+ if (filterInfo.contains("cutscenes")) {
+ // Check if we want to cut scenes from returned data
+ dataProcessed = true;
int cutPos = 0;
QUndoCommand *command = new QUndoCommand();
command->setText(i18n("Auto Split Clip"));
- foreach (const QString &pos, cuts) {
- int newPos = pos.toInt();
- kDebug()<<"// SCENE CUT: "<<cutPos<<" - "<<newPos;
+ 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, newPos, QString(), true, false, command);
+ (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 <CommentedTime> 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 <QString, QString> 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"
projects / kdenlive / blobdiff