X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=ccdaed495d30cbd333efe0654b6ea158aa08ac5e;hb=de93dc84bc5f050272e4e736c3afa6ad5f3c6654;hp=6c77cd7e69d5efe8c881f7819887628307d7e158;hpb=250bfbb98bd50fd9fca3982790c91830ab11458d;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 6c77cd7e..ccdaed49 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -44,10 +44,11 @@ #include "ui_templateclip_ui.h" #include "ui_cutjobdialog_ui.h" +#include "ui_scenecutdialog_ui.h" #include #include -#include +#include #include #include #include @@ -58,6 +59,8 @@ #include #include #include +#include +#include #ifdef USE_NEPOMUK #include @@ -66,6 +69,11 @@ //#include #endif +#ifdef USE_NEPOMUKCORE +#include +#include +#endif + #include #include #include @@ -77,6 +85,17 @@ #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) { @@ -197,7 +216,7 @@ void InvalidDialog::addClip(const QString &id, const QString &path) 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; @@ -205,22 +224,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_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"); QVBoxLayout *layout = new QVBoxLayout; @@ -253,7 +274,7 @@ ProjectList::ProjectList(QWidget *parent) : m_jobsMenu->addAction(m_discardCurrentClipJobs); m_infoLabel->setMenu(m_jobsMenu); box->addWidget(m_infoLabel); - + int size = style()->pixelMetric(QStyle::PM_SmallIconSize); QSize iconSize(size, size); @@ -278,10 +299,11 @@ ProjectList::ProjectList(QWidget *parent) : 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); @@ -295,22 +317,23 @@ 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(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *))); + connect(m_listView, SIGNAL(focusMonitor(bool)), this, SIGNAL(raiseClipMonitor(bool))); + connect(m_listView, SIGNAL(pauseMonitor()), this, SIGNAL(pauseMonitor())); + 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 , 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 &))); - 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,QString,QString)), this, SLOT(slotAddClip(QList,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); @@ -323,12 +346,22 @@ ProjectList::ProjectList(QWidget *parent) : } } #endif +#ifdef USE_NEPOMUKCORE + if (KdenliveSettings::activate_nepomuk()) { + Nepomuk2::ResourceManager::instance()->init(); + if (!Nepomuk2::ResourceManager::instance()->initialized()) { + kDebug() << "Cannot communicate with Nepomuk, DISABLING it"; + KdenliveSettings::setActivate_nepomuk(false); + } + } +#endif + } 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; @@ -337,7 +370,7 @@ ProjectList::~ProjectList() 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; @@ -354,27 +387,27 @@ void ProjectList::focusTree() const void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) { QList 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; } } @@ -388,43 +421,47 @@ 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(); - if (menus.contains("addMenu") && menus.value("addMenu")){ - QMenu* addMenu=menus.value("addMenu"); - menu->addMenu(addMenu); - m_addButton->setMenu(menu); - if (addMenu->isEmpty()) - addMenu->setEnabled(false); - } - if (menus.contains("extractAudioMenu") && menus.value("extractAudioMenu") ){ - QMenu* extractAudioMenu = menus.value("extractAudioMenu"); - m_menu->addMenu(extractAudioMenu); - m_extractAudioAction = extractAudioMenu; - } - if (menus.contains("transcodeMenu") && menus.value("transcodeMenu") ){ - QMenu* transcodeMenu = menus.value("transcodeMenu"); - m_menu->addMenu(transcodeMenu); - if (transcodeMenu->isEmpty()) - transcodeMenu->setEnabled(false); - m_transcodeAction = transcodeMenu; - } - if (menus.contains("stabilizeMenu") && menus.value("stabilizeMenu") ){ - QMenu* stabilizeMenu=menus.value("stabilizeMenu"); - m_menu->addMenu(stabilizeMenu); - if (stabilizeMenu->isEmpty()) - stabilizeMenu->setEnabled(false); - m_stabilizeAction=stabilizeMenu; - - } - m_menu->addAction(m_reloadAction); - m_menu->addAction(m_proxyAction); - if (menus.contains("inTimelineMenu") && menus.value("inTimelineMenu")){ - QMenu* inTimelineMenu=menus.value("inTimelineMenu"); - m_menu->addMenu(inTimelineMenu); - inTimelineMenu->setEnabled(false); - } + if (menus.contains("addMenu") && menus.value("addMenu")){ + QMenu* addMenu=menus.value("addMenu"); + menu->addMenu(addMenu); + m_addButton->setMenu(menu); + if (addMenu->isEmpty()) + addMenu->setEnabled(false); + } + if (menus.contains("extractAudioMenu") && menus.value("extractAudioMenu") ){ + QMenu* extractAudioMenu = menus.value("extractAudioMenu"); + m_menu->addMenu(extractAudioMenu); + m_extractAudioAction = extractAudioMenu; + } + if (menus.contains("transcodeMenu") && menus.value("transcodeMenu") ){ + QMenu* transcodeMenu = menus.value("transcodeMenu"); + m_menu->addMenu(transcodeMenu); + if (transcodeMenu->isEmpty()) + transcodeMenu->setEnabled(false); + m_transcodeAction = transcodeMenu; + } + if (menus.contains("clipActionsMenu") && menus.value("clipActionsMenu") ){ + QMenu* stabilizeMenu=menus.value("clipActionsMenu"); + m_menu->addMenu(stabilizeMenu); + if (stabilizeMenu->isEmpty()) + stabilizeMenu->setEnabled(false); + m_clipsActionsMenu = stabilizeMenu; + + } + 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); + inTimelineMenu->setEnabled(false); + } m_menu->addAction(m_editButton->defaultAction()); m_menu->addAction(m_openAction); m_menu->addAction(m_deleteButton->defaultAction()); @@ -493,7 +530,7 @@ void ProjectList::editClipSelection(QList list) 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 @@ -518,7 +555,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 @@ -528,7 +565,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 @@ -571,7 +608,7 @@ void ProjectList::editClipSelection(QList 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); } @@ -656,7 +693,7 @@ void ProjectList::trashUnusedClips() } emit deleteProjectClips(ids, QMap ()); - for (int i = 0; i < urls.count(); i++) + for (int i = 0; i < urls.count(); ++i) KIO::NetAccess::del(KUrl(urls.at(i)), this); } @@ -670,7 +707,7 @@ void ProjectList::slotReloadClip(const QString &id) 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++) @@ -703,6 +740,7 @@ void ProjectList::slotReloadClip(const QString &id) 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); @@ -723,7 +761,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); } } @@ -733,6 +771,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()) { @@ -743,13 +785,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()); @@ -762,7 +800,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(); } @@ -818,18 +856,22 @@ void ProjectList::slotClipSelected() 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; @@ -837,12 +879,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); @@ -866,13 +909,14 @@ void ProjectList::slotClipSelected() 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; @@ -888,11 +932,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); } @@ -908,7 +952,7 @@ void ProjectList::adjustTranscodeActions(ProjectItem *clip) const QList 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); @@ -932,7 +976,7 @@ void ProjectList::slotUpdateClipProperties(const QString &id, QMap 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)); const int children = item->childCount(); - for (int i = 0; i < children; i++) { + for (int i = 0; i < children; ++i) { ProjectItem *child = static_cast (item->child(i)); child->setProperty("groupname", item->text(0)); } @@ -1038,7 +1083,7 @@ 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())); + QTimer::singleShot(100, this, SLOT(slotCheckScrolling())); } } } @@ -1051,20 +1096,24 @@ void ProjectList::slotCheckScrolling() 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); @@ -1077,7 +1126,7 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *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())); @@ -1105,7 +1154,7 @@ void ProjectList::slotRemoveClip() 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 (selected.at(i)); @@ -1155,7 +1204,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) { @@ -1164,10 +1213,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) @@ -1217,7 +1266,7 @@ void ProjectList::slotAddFolder(const QString &name) m_commandStack->push(command); } -void ProjectList::slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit) +void ProjectList::slotAddFolder(const QString &foldername, const QString &clipId, bool remove, bool edit) { if (remove) { FolderProjectItem *item = getFolderItemById(clipId); @@ -1241,7 +1290,7 @@ void ProjectList::slotAddFolder(const QString foldername, 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 (item->child(i)); child->setProperty("groupname", foldername); } @@ -1277,13 +1326,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; @@ -1291,22 +1341,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))); + 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(); + 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); @@ -1333,14 +1384,14 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) // Add info to date column QFileInfo fileInfo(url.path()); if (fileInfo.exists()) { - item->setText(3, fileInfo.lastModified().toString(QString("yyyy/MM/dd hh:mm:ss"))); + item->setText(3, fileInfo.lastModified().toString(QString("yyyy/MM/dd hh:mm:ss"))); } // Add cut zones 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); + 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)) { @@ -1408,7 +1459,7 @@ void ProjectList::slotResetProjectList() { 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; @@ -1439,7 +1490,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); @@ -1448,8 +1501,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 { @@ -1457,6 +1511,34 @@ void ProjectList::getCachedThumbnail(ProjectItem *item) } } +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; @@ -1465,7 +1547,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()) { @@ -1477,7 +1559,7 @@ void ProjectList::getCachedThumbnail(SubProjectItem *item) else requestClipThumbnail(parentItem->clipId() + '#' + QString::number(pos)); } -void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips) +void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, const QStringList &brokenClips) { if (!m_allClipsProcessed) m_listView->setEnabled(false); m_listView->setSortingEnabled(false); @@ -1530,6 +1612,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr } if (clip->isPlaceHolder() == false && !hasPendingJob(item, PROXYJOB)) { QDomElement xml = clip->toXML(); + getCachedThumbnail(item); if (fpsChanged) { xml.removeAttribute("out"); xml.removeAttribute("file_hash"); @@ -1539,27 +1622,31 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr xml.removeAttribute("_replaceproxy"); if (replace) { resetThumbsProducer(clip); + 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); } - 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 { + } 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()) { @@ -1574,7 +1661,7 @@ 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()); @@ -1589,8 +1676,8 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStr m_listView->setSortingEnabled(true); m_allClipsProcessed = true; if (m_render->processingItems() == 0) { - monitorItemEditing(true); - slotProcessNextThumbnail(); + monitorItemEditing(true); + slotProcessNextThumbnail(); } } @@ -1598,10 +1685,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) { @@ -1614,7 +1707,7 @@ QString ProjectList::getExtensions() return allExtensions.simplified(); } -void ProjectList::slotAddClip(const QString url, const QString &groupName, const QString &groupId) +void ProjectList::slotAddClip(const QString &url, const QString &groupName, const QString &groupId) { kDebug()<<"// Adding clip: "< list; @@ -1622,7 +1715,7 @@ void ProjectList::slotAddClip(const QString url, const QString &groupName, const slotAddClip(list, groupName, groupId); } -void ProjectList::slotAddClip(const QList givenList, const QString &groupName, const QString &groupId) +void ProjectList::slotAddClip(const QList &givenList, const QString &groupName, const QString &groupId) { if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK"; @@ -1642,52 +1735,53 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group l->addWidget(c); l->addStretch(5); f->setLayout(l); + QPointer d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), f); d->setOperationMode(KFileDialog::Opening); d->setMode(KFile::Files); if (d->exec() == QDialog::Accepted) { KdenliveSettings::setAutoimagetransparency(c->isChecked()); - } - list = d->selectedUrls(); - if (b->isChecked() && list.count() == 1) { - // Check for image sequence - KUrl url = list.at(0); - QString fileName = url.fileName().section('.', 0, -2); - if (fileName.at(fileName.size() - 1).isDigit()) { - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); - if (item.mimetype().startsWith("image")) { - // import as sequence if we found more than one image in the sequence - QStringList list; - QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &list); - int count = list.count(); - if (count > 1) { - delete d; - QStringList groupInfo = getGroup(); - - // get image sequence base name - while (fileName.at(fileName.size() - 1).isDigit()) { - fileName.chop(1); + list = d->selectedUrls(); + if (b->isChecked() && list.count() == 1) { + // Check for image sequence + KUrl url = list.at(0); + QString fileName = url.fileName().section('.', 0, -2); + if (fileName.at(fileName.size() - 1).isDigit()) { + KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + if (item.mimetype().startsWith("image")) { + // import as sequence if we found more than one image in the sequence + QStringList list; + QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &list); + int count = list.count(); + if (count > 1) { + delete d; + QStringList groupInfo = getGroup(); + + // get image sequence base name + while (fileName.at(fileName.size() - 1).isDigit()) { + fileName.chop(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; } - 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; } } } } delete d; } else { - for (int i = 0; i < givenList.count(); i++) + for (int i = 0; i < givenList.count(); ++i) list << givenList.at(i); } QList foldersList; @@ -1713,14 +1807,20 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group if (givenList.isEmpty() && !list.isEmpty()) { QStringList groupInfo = getGroup(); - m_doc->slotAddClipList(list, groupInfo.at(0), groupInfo.at(1)); + QMap data; + data.insert("group", groupInfo.at(0)); + data.insert("groupId", groupInfo.at(1)); + m_doc->slotAddClipList(list, data); } else if (!list.isEmpty()) { - m_doc->slotAddClipList(list, groupName, groupId); + 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++) { + // create folders + for (int i = 0; i < foldersList.count(); ++i) { KUrl::List urls = foldersList.at(i); KUrl folderUrl = urls.takeFirst(); QString folderName = folderUrl.fileName(); @@ -1732,8 +1832,12 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group folder = getFolderItemByName(folderName); } } - if (folder) - m_doc->slotAddClipList(urls, folder->groupName(), folder->clipId()); + if (folder) { + QMap data; + data.insert("group", folder->groupName()); + data.insert("groupId", folder->clipId()); + m_doc->slotAddClipList(urls, data); + } else m_doc->slotAddClipList(urls); } } @@ -1750,13 +1854,15 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace) if (!path.isEmpty()) { if (m_invalidClipDialog) { m_invalidClipDialog->addClip(id, path); + qDebug() << "Toto"; return; } else { + qDebug() << "Tata"; if (replace) - m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"), i18n("Clip %1
is invalid, will be removed from project.", QString()), replace, kapp->activeWindow()); + m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"), i18n("Clip is invalid, will be removed from project."), replace, kapp->activeWindow()); else { - m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"), i18n("Clip %1
is missing or invalid. Remove it from project?", QString()), replace, kapp->activeWindow()); + m_invalidClipDialog = new InvalidDialog(i18n("Invalid clip"), i18n("Clip is missing or invalid. Remove it from project?"), replace, kapp->activeWindow()); } m_invalidClipDialog->addClip(id, path); int result = m_invalidClipDialog->exec(); @@ -1781,7 +1887,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"); @@ -1921,7 +2027,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) { 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; @@ -1956,15 +2062,35 @@ void ProjectList::setDocument(KdenliveDoc *doc) 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 (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 @@ -2010,7 +2136,7 @@ void ProjectList::slotCheckForEmptyQueue() } -void ProjectList::requestClipThumbnail(const QString id) +void ProjectList::requestClipThumbnail(const QString &id) { if (!m_thumbnailQueue.contains(id)) m_thumbnailQueue.append(id); slotProcessNextThumbnail(); @@ -2070,26 +2196,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(); @@ -2106,12 +2228,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(); @@ -2124,6 +2321,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"); @@ -2145,7 +2344,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")); @@ -2158,12 +2357,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()) { @@ -2176,6 +2379,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()); @@ -2192,8 +2398,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) @@ -2281,10 +2488,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); @@ -2327,7 +2534,7 @@ QTreeWidgetItem *ProjectList::getAnyItemById(const QString &id) 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 (result->child(i)); if (sub && sub->zone().x() == id.section('#', 1, 1).toInt()) return sub; @@ -2360,7 +2567,7 @@ 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++) { + for (int i = 0; i < hits.count(); ++i) { if (hits.at(i)->type() == PROJECTFOLDERTYPE) { item = static_cast(hits.at(i)); break; @@ -2395,7 +2602,7 @@ void ProjectList::slotSelectClip(const QString &ix) 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); @@ -2428,7 +2635,7 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const KUrl::List result; ProjectItem *item; QList 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) { @@ -2451,12 +2658,12 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const return result; } -QStringList ProjectList::getConditionalIds(const QString &condition) const +QMap ProjectList::getConditionalIds(const QString &condition) const { - QStringList result; + QMap result; ProjectItem *item; QList 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) { @@ -2474,7 +2681,7 @@ QStringList ProjectList::getConditionalIds(const QString &condition) const 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; } @@ -2507,7 +2714,7 @@ QDomDocument ProjectList::generateTemplateXml(QString path, const QString &repla } 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); @@ -2532,17 +2739,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(); @@ -2564,11 +2768,11 @@ void ProjectList::removeClipCut(const QString &id, int in, int out) 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 (it); @@ -2592,7 +2796,7 @@ void ProjectList::slotUpdateClipCut(QPoint p) 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); @@ -2612,7 +2816,7 @@ void ProjectList::slotForceProcessing(const QString &id) 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; @@ -2646,10 +2850,10 @@ void ProjectList::slotAddOrUpdateSequence(const QString frameName) 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); + } else emit displayMessage(i18n("Sequence not found"), -2, ErrorMessage); } QMap ProjectList::getProxies() @@ -2674,7 +2878,7 @@ QMap 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; @@ -2690,8 +2894,12 @@ void ProjectList::slotCreateProxy(const QString id) slotGotProxy(path); 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())); + 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; @@ -2708,7 +2916,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; @@ -2726,7 +2934,7 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) Ui::CutJobDialog_UI ui; ui.setupUi(d); ui.extra_params->setVisible(false); - ui.add_clip->setChecked(KdenliveSettings::add_clip_cut()); + 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)); @@ -2759,11 +2967,11 @@ 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; 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)) { @@ -2779,14 +2987,14 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, QString desc) { QStringList existingFiles; - QStringList ids = getConditionalIds(condition); + QMap ids = getConditionalIds(condition); + QMap::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()); + 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; @@ -2807,24 +3015,28 @@ void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, ui.extra_params->setVisible(false); d->adjustSize(); ui.button_more->setIcon(KIcon("configure")); - ui.add_clip->setChecked(KdenliveSettings::add_clip_cut()); - ui.extra_params->setPlainText(params.simplified().section(" ", 0, -2)); + 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())); + 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_clip_cut(ui.add_clip->isChecked()); - - foreach(const QString &id, ids) { - ProjectItem *item = getItemById(id); + 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 = item->clipUrl().path(); + QString src = i.value(); QString dest; - if (ids.count() > 1) dest = params.section(' ', -1).replace("%1", src); + if (ids.count() > 1) { + dest = destinations.at(index); + index++; + } else dest = ui.file_url->url().path(); QStringList jobParams; jobParams << dest << src << QString() << QString(); @@ -2833,15 +3045,16 @@ void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, int max = item->clipMaxDuration(); QString duration = QString::number(max); jobParams << duration; - jobParams << QString::number(KdenliveSettings::add_clip_cut()); + 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(); @@ -2854,32 +3067,31 @@ void ProjectList::slotCheckJobProcess() // Remove inactive threads QList > 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); 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) @@ -2897,15 +3109,15 @@ void ProjectList::slotProcessJobs() 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 @@ -2924,7 +3136,7 @@ void ProjectList::slotProcessJobs() continue; } // Set clip status to started - emit processLog(job->clipId(), 0, job->jobType, job->statusMessage()); + emit processLog(job->clipId(), 0, job->jobType, job->statusMessage()); // Make sure destination path is writable if (!destination.isEmpty()) { @@ -2937,24 +3149,27 @@ void ProjectList::slotProcessJobs() file.close(); QFile::remove(destination); } - connect(job, SIGNAL(jobProgress(QString, int, int)), this, SIGNAL(processLog(QString, int, int))); - connect(job, SIGNAL(cancelRunningJob(const QString, stringMap)), this, SIGNAL(cancelRunningJob(const QString, stringMap))); - connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap))); + 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 (job); - jb->setProducer(currentClip->getProducer()); + 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->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 @@ -2989,7 +3204,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); } } @@ -3031,7 +3246,7 @@ void ProjectList::updateProxyConfig() 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); @@ -3046,7 +3261,7 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) // expand list (folders, subclips) to get real clips QTreeWidgetItem *listItem; QList 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++) { @@ -3075,11 +3290,11 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) // Make sure the proxy folder exists QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"; KStandardDirs::makeDir(proxydir); - + QMap newProps; QMap 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()) { @@ -3089,11 +3304,11 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) kDebug()<<"//// TRYING TO PROXY: "<clipId()<<", but it is busy"; continue; } - + //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); @@ -3132,7 +3347,7 @@ void ProjectList::slotDeleteProxy(const QString proxyPath) QMap props; props.insert("proxy", QString()); new EditClipCommand(this, item->clipId(), item->referencedClip()->currentProperties(props), props, true, proxyCommand); - + } } ++it; @@ -3170,8 +3385,8 @@ void ProjectList::setJobStatus(ProjectItem *item, JOBTYPE jobType, CLIPJOBSTATUS 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 @@ -3211,7 +3426,7 @@ void ProjectList::processThumbOverlays(ProjectItem *item, QPixmap &pix) 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(); @@ -3219,7 +3434,7 @@ void ProjectList::slotCancelJobs() 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 newProps = m_jobList.at(i)->cancelProperties(); @@ -3235,7 +3450,7 @@ void ProjectList::slotCancelJobs() if (!m_jobList.isEmpty()) qDeleteAll(m_jobList); m_jobList.clear(); m_abortAllJobs = false; - m_infoLabel->slotSetJobCount(0); + m_infoLabel->slotSetJobCount(0); } void ProjectList::slotCancelRunningJob(const QString id, stringMap newProps) @@ -3247,7 +3462,7 @@ void ProjectList::slotCancelRunningJob(const QString id, stringMap newProps) if (newProps == oldProps) return; QMapIterator i(oldProps); EditClipCommand *command = new EditClipCommand(this, id, oldProps, newProps, true); - m_commandStack->push(command); + m_commandStack->push(command); } bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type) @@ -3255,10 +3470,10 @@ bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type) if (!item || !item->referencedClip() || m_abortAllJobs) return false; AbstractClipJob *job; QMutexLocker lock(&m_jobMutex); - for (int i = 0; i < m_jobList.count(); i++) { + 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; @@ -3267,7 +3482,7 @@ bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type) 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); } @@ -3287,63 +3502,80 @@ 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()) { 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; } - 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)->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; } - } + } return result; } 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); @@ -3351,19 +3583,19 @@ void ProjectList::discardJobs(const QString &id, JOBTYPE type) { } } -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 &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(); @@ -3371,27 +3603,124 @@ void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QStr void ProjectList::startClipFilterJob(const QString &filterName, const QString &condition) { - QStringList ids = getConditionalIds(condition); - QString destination; - ProjectItem *item = getItemById(ids.at(0)); + 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); + 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 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); } - QPointer d = new ClipStabilize(destination, ids.count(), filterName); - if (d->exec() == QDialog::Accepted) { - processClipJob(ids, d->destination(), d->autoAddClip(), d->params(), d->desc()); + 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; } - delete d; } -void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description) +void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap extraParams) { QStringList preParams; // in and out @@ -3408,20 +3737,30 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo 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) { - consumer += ":" + destination; + jobArgs << consumer + ':' + destination; } else { - consumer += ":" + destination + item->clipUrl().fileName() + ".mlt"; + jobArgs << consumer + ':' + destination + item->clipUrl().fileName() + ".mlt"; } - preParams << consumer << jobParams; + jobArgs << jobParams; - MeltJob *job = new MeltJob(item->clipType(), id, preParams); + 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; @@ -3429,10 +3768,11 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo job->description = description; m_jobList.append(job); setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + slotCheckJobProcess(); } - slotCheckJobProcess(); } + void ProjectList::slotPrepareJobsMenu() { ProjectItem *item; @@ -3466,4 +3806,107 @@ void ProjectList::updatePalette() 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"