X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=5d74c7bdd3e313daab2b8286983f89e6a05335af;hb=24bf4e16f446c1c4b2e5a6939155e0cf00d2c792;hp=35bec5148f529003227e6aca0013525cc869a47f;hpb=8cc84073a91a888c89cfeb5e3aa7e658354f683d;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 35bec514..5d74c7bd 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -32,6 +32,7 @@ #include "kthumb.h" #include "projectlistview.h" #include "timecodedisplay.h" +#include "profilesdialog.h" #include "editclipcommand.h" #include "editclipcutcommand.h" #include "editfoldercommand.h" @@ -47,6 +48,9 @@ #include #include #include +#include +#include + #ifdef NEPOMUK #include #include @@ -61,49 +65,60 @@ #include #include #include +#include ProjectList::ProjectList(QWidget *parent) : - QWidget(parent), - m_render(NULL), - m_fps(-1), - m_commandStack(NULL), - m_editAction(NULL), - m_deleteAction(NULL), - m_openAction(NULL), - m_reloadAction(NULL), - m_transcodeAction(NULL), - m_doc(NULL), - m_refreshed(false), - m_infoQueue(), - m_thumbnailQueue() -{ - - m_listView = new ProjectListView(this);; + QWidget(parent), + m_render(NULL), + m_fps(-1), + m_commandStack(NULL), + m_openAction(NULL), + m_reloadAction(NULL), + m_transcodeAction(NULL), + m_doc(NULL), + m_refreshed(false), + m_infoQueue(), + m_thumbnailQueue() +{ QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); - + qRegisterMetaType("QDomElement"); // setup toolbar - KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine(this); - m_toolbar = new QToolBar("projectToolBar", this); - m_toolbar->addWidget(searchView); - int s = style()->pixelMetric(QStyle::PM_SmallIconSize); - m_toolbar->setIconSize(QSize(s, s)); - searchView->setTreeWidget(m_listView); + QFrame *frame = new QFrame; + frame->setFrameStyle(QFrame::NoFrame); + QHBoxLayout *box = new QHBoxLayout; + KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine; + + box->addWidget(searchView); + //int s = style()->pixelMetric(QStyle::PM_SmallIconSize); + //m_toolbar->setIconSize(QSize(s, s)); - m_addButton = new QToolButton(m_toolbar); + m_addButton = new QToolButton; m_addButton->setPopupMode(QToolButton::MenuButtonPopup); - m_toolbar->addWidget(m_addButton); + m_addButton->setAutoRaise(true); + box->addWidget(m_addButton); - layout->addWidget(m_toolbar); - layout->addWidget(m_listView); - setLayout(layout); + m_editButton = new QToolButton; + m_editButton->setAutoRaise(true); + box->addWidget(m_editButton); - m_queueTimer.setInterval(100); - connect(&m_queueTimer, SIGNAL(timeout()), this, SLOT(slotProcessNextClipInQueue())); - m_queueTimer.setSingleShot(true); + m_deleteButton = new QToolButton; + m_deleteButton->setAutoRaise(true); + box->addWidget(m_deleteButton); + frame->setLayout(box); + layout->addWidget(frame); + m_listView = new ProjectListView; + layout->addWidget(m_listView); + setLayout(layout); + searchView->setTreeWidget(m_listView); + m_proxyAction = new QAction(i18n("Proxy clip"), this); + m_proxyAction->setCheckable(true); + m_proxyAction->setChecked(false); + connect(m_proxyAction, SIGNAL(toggled(bool)), this, SLOT(slotProxyCurrentItem(bool))); + 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, SLOT(slotClipSelected())); @@ -131,7 +146,6 @@ ProjectList::ProjectList(QWidget *parent) : ProjectList::~ProjectList() { delete m_menu; - delete m_toolbar; m_listView->blockSignals(true); m_listView->clear(); delete m_listViewDelegate; @@ -147,13 +161,11 @@ void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) QList actions = addMenu->actions(); for (int i = 0; i < actions.count(); i++) { if (actions.at(i)->data().toString() == "clip_properties") { - m_editAction = actions.at(i); - m_toolbar->addAction(m_editAction); + m_editButton->setDefaultAction(actions.at(i)); actions.removeAt(i); i--; } else if (actions.at(i)->data().toString() == "delete_clip") { - m_deleteAction = actions.at(i); - m_toolbar->addAction(m_deleteAction); + m_deleteButton->setDefaultAction(actions.at(i)); actions.removeAt(i); i--; } else if (actions.at(i)->data().toString() == "edit_clip") { @@ -191,12 +203,13 @@ void ProjectList::setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu, QMenu transcodeMenu->setEnabled(false); m_transcodeAction = transcodeMenu; m_menu->addAction(m_reloadAction); + m_menu->addAction(m_proxyAction); m_menu->addMenu(inTimelineMenu); inTimelineMenu->setEnabled(false); - m_menu->addAction(m_editAction); + m_menu->addAction(m_editButton->defaultAction()); m_menu->addAction(m_openAction); - m_menu->addAction(m_deleteAction); - m_menu->insertSeparator(m_deleteAction); + m_menu->addAction(m_deleteButton->defaultAction()); + m_menu->insertSeparator(m_deleteButton->defaultAction()); } @@ -218,7 +231,8 @@ void ProjectList::updateProjectFormat(Timecode t) void ProjectList::slotEditClip() { QList list = m_listView->selectedItems(); - if (list.count() > 1) { + if (list.isEmpty()) return; + if (list.count() > 1 || list.at(0)->type() == PROJECTFOLDERTYPE) { editClipSelection(list); return; } @@ -240,21 +254,33 @@ void ProjectList::editClipSelection(QList list) // Gather all common properties QMap commonproperties; QList clipList; - commonproperties.insert("force_aspect_ratio", "-"); + commonproperties.insert("force_aspect_num", "-"); + commonproperties.insert("force_aspect_den", "-"); commonproperties.insert("force_fps", "-"); commonproperties.insert("force_progressive", "-"); + commonproperties.insert("force_tff", "-"); commonproperties.insert("threads", "-"); commonproperties.insert("video_index", "-"); commonproperties.insert("audio_index", "-"); + commonproperties.insert("force_colorspace", "-"); + commonproperties.insert("full_luma", "-"); + QString transparency = "-"; bool allowDurationChange = true; int commonDuration = -1; + bool hasImages = false;; ProjectItem *item; for (int i = 0; i < list.count(); i++) { item = NULL; - if (list.at(i)->type() == PROJECTFOLDERTYPE) + if (list.at(i)->type() == PROJECTFOLDERTYPE) { + // Add folder items to the list + int ct = list.at(i)->childCount(); + for (int j = 0; j < ct; j++) { + list.append(list.at(i)->child(j)); + } continue; - if (list.at(i)->type() == PROJECTSUBCLIPTYPE) + } + else if (list.at(i)->type() == PROJECTSUBCLIPTYPE) item = static_cast (list.at(i)->parent()); else item = static_cast (list.at(i)); @@ -264,6 +290,29 @@ void ProjectList::editClipSelection(QList list) // check properties DocClipBase *clip = item->referencedClip(); if (clipList.contains(clip)) continue; + if (clip->clipType() == IMAGE) { + hasImages = true; + if (clip->getProperty("transparency").isEmpty() || clip->getProperty("transparency").toInt() == 0) { + if (transparency == "-") { + // first non transparent image + transparency = "0"; + } + else if (transparency == "1") { + // we have transparent and non transparent clips + transparency = "-1"; + } + } + else { + if (transparency == "-") { + // first transparent image + transparency = "1"; + } + else if (transparency == "0") { + // we have transparent and non transparent clips + transparency = "-1"; + } + } + } if (clip->clipType() != COLOR && clip->clipType() != IMAGE && clip->clipType() != TEXT) allowDurationChange = false; if (allowDurationChange && commonDuration != 0) { @@ -291,11 +340,13 @@ void ProjectList::editClipSelection(QList list) } if (allowDurationChange) commonproperties.insert("out", QString::number(commonDuration)); - QMapIterator p(commonproperties); + if (hasImages) + commonproperties.insert("transparency", transparency); + /*QMapIterator p(commonproperties); while (p.hasNext()) { p.next(); kDebug() << "Result: " << p.key() << " = " << p.value(); - } + }*/ emit showClipProperties(clipList, commonproperties); } @@ -311,13 +362,13 @@ void ProjectList::slotOpenClip() if (item) { if (item->clipType() == IMAGE) { if (KdenliveSettings::defaultimageapp().isEmpty()) - KMessageBox::sorry(this, i18n("Please set a default application to open images in the Settings dialog")); + KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open images in the Settings dialog")); else QProcess::startDetached(KdenliveSettings::defaultimageapp(), QStringList() << item->clipUrl().path()); } if (item->clipType() == AUDIO) { if (KdenliveSettings::defaultaudioapp().isEmpty()) - KMessageBox::sorry(this, i18n("Please set a default application to open audio files in the Settings dialog")); + KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open audio files in the Settings dialog")); else QProcess::startDetached(KdenliveSettings::defaultaudioapp(), QStringList() << item->clipUrl().path()); } @@ -388,8 +439,10 @@ void ProjectList::slotReloadClip(const QString &id) QList selected; if (id.isEmpty()) selected = m_listView->selectedItems(); - else - selected.append(getItemById(id)); + else { + ProjectItem *itemToReLoad = getItemById(id); + if (itemToReLoad) selected.append(itemToReLoad); + } ProjectItem *item; for (int i = 0; i < selected.count(); i++) { if (selected.at(i)->type() != PROJECTCLIPTYPE) { @@ -401,18 +454,26 @@ void ProjectList::slotReloadClip(const QString &id) } item = static_cast (selected.at(i)); if (item) { - if (item->clipType() == TEXT) { + CLIPTYPE t = item->clipType(); + if (t == TEXT) { if (!item->referencedClip()->getProperty("xmltemplate").isEmpty()) regenerateTemplate(item); - } else if (item->clipType() != COLOR && item->clipType() != SLIDESHOW && item->referencedClip() && item->referencedClip()->checkHash() == false) { + } else if (t != COLOR && t != SLIDESHOW && item->referencedClip() && item->referencedClip()->checkHash() == false) { item->referencedClip()->setPlaceHolder(true); item->setProperty("file_hash", QString()); - } else if (item->clipType() == IMAGE) { + } else if (t == IMAGE) { item->referencedClip()->producer()->set("force_reload", 1); } - //requestClipInfo(item->toXml(), item->clipId(), true); - // Clear the file_hash value, which will cause a complete reload of the clip - emit getFileProperties(item->toXml(), item->clipId(), m_listView->iconSize().height(), true); + + 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(item->referencedClip()->producerProperty("length")).toInt(); + if (length > 0 && !e.hasAttribute("length")) { + e.setAttribute("length", length); + } + } + emit getFileProperties(e, item->clipId(), m_listView->iconSize().height(), true, false); } } } @@ -439,10 +500,31 @@ void ProjectList::slotMissingClip(const QString &id) ProjectItem *item = getItemById(id); if (item) { item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled); + int height = m_listView->iconSize().height(); + int width = (int)(height * m_render->dar()); + QPixmap pixmap = qVariantValue(item->data(0, Qt::DecorationRole)); + if (pixmap.isNull()) { + pixmap = QPixmap(width, height); + pixmap.fill(Qt::transparent); + } + KIcon icon("dialog-close"); + QPainter p(&pixmap); + p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6)); + p.end(); + item->setData(0, Qt::DecorationRole, pixmap); if (item->referencedClip()) { item->referencedClip()->setPlaceHolder(true); - if (m_render == NULL) kDebug() << "********* ERROR, NULL RENDR"; - item->referencedClip()->setProducer(m_render->invalidProducer(id), true); + if (m_render == NULL) { + kDebug() << "********* ERROR, NULL RENDR"; + return; + } + Mlt::Producer *newProd = m_render->invalidProducer(id); + if (item->referencedClip()->producer()) { + Mlt::Properties props(newProd->get_properties()); + Mlt::Properties src_props(item->referencedClip()->producer()->get_properties()); + props.inherit(src_props); + } + item->referencedClip()->setProducer(newProd, true); item->slotSetToolTip(); emit clipNeedsReload(id, true); } @@ -496,16 +578,17 @@ void ProjectList::slotClipSelected() if (m_listView->currentItem()) { if (m_listView->currentItem()->type() == PROJECTFOLDERTYPE) { emit clipSelected(NULL); - m_editAction->setEnabled(false); - m_deleteAction->setEnabled(true); + m_editButton->defaultAction()->setEnabled(m_listView->currentItem()->childCount() > 0); + m_deleteButton->defaultAction()->setEnabled(true); m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); + m_proxyAction->setEnabled(false); } else { ProjectItem *clip; if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { // this is a sub item, use base clip - m_deleteAction->setEnabled(true); + m_deleteButton->defaultAction()->setEnabled(true); clip = static_cast (m_listView->currentItem()->parent()); if (clip == NULL) kDebug() << "-----------ERROR"; SubProjectItem *sub = static_cast (m_listView->currentItem()); @@ -514,10 +597,10 @@ void ProjectList::slotClipSelected() return; } clip = static_cast (m_listView->currentItem()); - if (clip) + if (clip && clip->referencedClip()) emit clipSelected(clip->referencedClip()); - m_editAction->setEnabled(true); - m_deleteAction->setEnabled(true); + m_editButton->defaultAction()->setEnabled(true); + m_deleteButton->defaultAction()->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { @@ -536,14 +619,26 @@ void ProjectList::slotClipSelected() } } else { emit clipSelected(NULL); - m_editAction->setEnabled(false); - m_deleteAction->setEnabled(false); + m_editButton->defaultAction()->setEnabled(false); + m_deleteButton->defaultAction()->setEnabled(false); m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); } } +void ProjectList::adjustProxyActions(ProjectItem *clip) const +{ + if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) { + m_proxyAction->setEnabled(false); + return; + } + m_proxyAction->setEnabled(useProxy()); + m_proxyAction->blockSignals(true); + m_proxyAction->setChecked(clip->hasProxy()); + m_proxyAction->blockSignals(false); +} + void ProjectList::adjustTranscodeActions(ProjectItem *clip) const { if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) { @@ -559,9 +654,9 @@ void ProjectList::adjustTranscodeActions(ProjectItem *clip) const if (data.count() > 2) { condition = data.at(2); if (condition.startsWith("vcodec")) - transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section("=", 1, 1))); + transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section('=', 1, 1))); else if (condition.startsWith("acodec")) - transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section("=", 1, 1))); + transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section('=', 1, 1))); } } @@ -578,11 +673,17 @@ void ProjectList::slotUpdateClipProperties(const QString &id, QMap setProperties(properties); if (properties.contains("name")) { - m_listView->blockSignals(true); + monitorItemEditing(false); clip->setText(0, properties.value("name")); - m_listView->blockSignals(false); + monitorItemEditing(true); emit clipNameChanged(clip->clipId(), properties.value("name")); } if (properties.contains("description")) { CLIPTYPE type = clip->clipType(); - m_listView->blockSignals(true); + monitorItemEditing(false); clip->setText(1, properties.value("description")); - m_listView->blockSignals(false); + monitorItemEditing(true); #ifdef NEPOMUK if (KdenliveSettings::activate_nepomuk() && (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST)) { // Use Nepomuk system to store clip description @@ -667,11 +768,13 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) QMap oldprops; QMap newprops; oldprops["name"] = clip->referencedClip()->getProperty("name"); - newprops["name"] = item->text(0); - slotUpdateClipProperties(clip, newprops); - emit projectModified(); - EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false); - m_commandStack->push(command); + if (oldprops.value("name") != item->text(0)) { + newprops["name"] = item->text(0); + slotUpdateClipProperties(clip, newprops); + emit projectModified(); + EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false); + m_commandStack->push(command); + } } } } @@ -679,8 +782,8 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) { bool enable = item ? true : false; - m_editAction->setEnabled(enable); - m_deleteAction->setEnabled(enable); + m_editButton->defaultAction()->setEnabled(enable); + m_deleteButton->defaultAction()->setEnabled(enable); m_reloadAction->setEnabled(enable); m_transcodeAction->setEnabled(enable); if (enable) { @@ -692,6 +795,7 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) clip = static_cast (item); // Display relevant transcoding actions only adjustTranscodeActions(clip); + adjustProxyActions(clip); // Display uses in timeline emit findInTimeline(clip->clipId()); } else { @@ -723,7 +827,6 @@ void ProjectList::slotRemoveClip() QUndoCommand *delCommand = new QUndoCommand(); delCommand->setText(i18n("Delete Clip Zone")); - for (int i = 0; i < selected.count(); i++) { if (selected.at(i)->type() == PROJECTSUBCLIPTYPE) { // subitem @@ -736,7 +839,7 @@ void ProjectList::slotRemoveClip() folderids[folder->groupName()] = folder->clipId(); int children = folder->childCount(); - if (children > 0 && KMessageBox::questionYesNo(this, i18np("Delete folder %2?
This will also remove the clip in that folder", "Delete folder %2?
This will also remove the %1 clips in that folder", children, folder->text(1)), i18n("Delete Folder")) != KMessageBox::Yes) + if (children > 0 && KMessageBox::questionYesNo(kapp->activeWindow(), i18np("Delete folder %2?
This will also remove the clip in that folder", "Delete folder %2?
This will also remove the %1 clips in that folder", children, folder->text(1)), i18n("Delete Folder")) != KMessageBox::Yes) return; for (int i = 0; i < children; ++i) { ProjectItem *child = static_cast (folder->child(i)); @@ -745,11 +848,13 @@ void ProjectList::slotRemoveClip() } else { ProjectItem *item = static_cast (selected.at(i)); ids << item->clipId(); - if (item->numReferences() > 0 && KMessageBox::questionYesNo(this, i18np("Delete clip %2?
This will also remove the clip in timeline", "Delete clip %2?
This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) + if (item->numReferences() > 0 && KMessageBox::questionYesNo(kapp->activeWindow(), i18np("Delete clip %2?
This will also remove the clip in timeline", "Delete clip %2?
This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip"), KStandardGuiItem::yes(), KStandardGuiItem::no(), "DeleteAll") == KMessageBox::No) { + KMessageBox::enableMessage("DeleteAll"); return; + } } } - + KMessageBox::enableMessage("DeleteAll"); if (delCommand->childCount() == 0) delete delCommand; else @@ -760,25 +865,30 @@ void ProjectList::slotRemoveClip() void ProjectList::updateButtons() const { if (m_listView->topLevelItemCount() == 0) { - m_deleteAction->setEnabled(false); + m_deleteButton->defaultAction()->setEnabled(false); + m_editButton->defaultAction()->setEnabled(false); } else { - m_deleteAction->setEnabled(true); + m_deleteButton->defaultAction()->setEnabled(true); if (!m_listView->currentItem()) m_listView->setCurrentItem(m_listView->topLevelItem(0)); QTreeWidgetItem *item = m_listView->currentItem(); if (item && item->type() == PROJECTCLIPTYPE) { - m_editAction->setEnabled(true); + m_editButton->defaultAction()->setEnabled(true); m_openAction->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); + m_proxyAction->setEnabled(useProxy()); return; } + else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) { + m_editButton->defaultAction()->setEnabled(true); + } + else m_editButton->defaultAction()->setEnabled(false); } - - m_editAction->setEnabled(false); m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); + m_proxyAction->setEnabled(false); } void ProjectList::selectItemById(const QString &clipId) @@ -877,24 +987,16 @@ void ProjectList::deleteProjectFolder(QMap map) i.next(); new AddFolderCommand(this, i.key(), i.value(), false, delCommand); } - m_commandStack->push(delCommand); + if (delCommand->childCount() > 0) m_commandStack->push(delCommand); + else delete delCommand; } void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) { m_listView->setEnabled(false); - if (getProperties) { - m_listView->blockSignals(true); - m_refreshed = false; - // remove file_hash so that we load all properties for the clip - QDomElement e = clip->toXML().cloneNode().toElement(); - e.removeAttribute("file_hash"); - m_infoQueue.insert(clip->getId(), e); - //m_render->getFileProperties(clip->toXML(), clip->getId(), true); - } - clip->askForAudioThumbs(); const QString parent = clip->getProperty("groupid"); ProjectItem *item = NULL; + monitorItemEditing(false); if (!parent.isEmpty()) { FolderProjectItem *parentitem = getFolderItemById(parent); if (!parentitem) { @@ -909,10 +1011,24 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) if (parentitem) item = new ProjectItem(parentitem, clip); } - if (item == NULL) + if (item == NULL) { item = new ProjectItem(m_listView, clip); + } + if (item->data(0, DurationRole).isNull()) item->setData(0, DurationRole, i18n("Loading")); + connect(clip, SIGNAL(createProxy(const QString)), this, SLOT(slotCreateProxy(const QString))); + connect(clip, SIGNAL(abortProxy(const QString, const QString)), this, SLOT(slotAbortProxy(const QString, const QString))); + if (getProperties) { + m_listView->processLayout(); + QDomElement e = clip->toXML().cloneNode().toElement(); + e.removeAttribute("file_hash"); + m_infoQueue.insert(clip->getId(), e); + } + else if (item->hasProxy() && !item->isProxyRunning()) { + slotCreateProxy(clip->getId()); + } + clip->askForAudioThumbs(); + KUrl url = clip->fileURL(); - if (getProperties == false && !clip->getClipHash().isEmpty()) { QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + ".png"; if (QFile::exists(cachedPixmap)) { @@ -947,13 +1063,49 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) } } } + monitorItemEditing(true); if (m_listView->isEnabled()) { updateButtons(); - if (getProperties) - m_listView->blockSignals(false); } - if (getProperties && !m_queueTimer.isActive()) - slotProcessNextClipInQueue(); + + if (getProperties && m_processingClips.isEmpty()) + m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); +} + +void ProjectList::slotGotProxy(const QString &proxyPath) +{ + if (proxyPath.isEmpty()) return; + QTreeWidgetItemIterator it(m_listView); + ProjectItem *item; + + while (*it) { + if ((*it)->type() == PROJECTCLIPTYPE) { + item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == proxyPath) + slotGotProxy(item); + } + ++it; + } +} + +void ProjectList::slotGotProxy(ProjectItem *item) +{ + if (item == NULL) return; + DocClipBase *clip = item->referencedClip(); + // Proxy clip successfully created + QDomElement e = clip->toXML().cloneNode().toElement(); + + // Make sure we get the correct producer length if it was adjusted in timeline + CLIPTYPE t = item->clipType(); + 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); + } + } + e.setAttribute("replace", 1); + m_infoQueue.insert(clip->getId(), e); + if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } void ProjectList::slotResetProjectList() @@ -967,7 +1119,6 @@ void ProjectList::slotResetProjectList() void ProjectList::requestClipInfo(const QDomElement xml, const QString id) { - m_refreshed = false; m_infoQueue.insert(id, xml); //if (m_infoQueue.count() == 1 || ) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue())); } @@ -975,42 +1126,59 @@ void ProjectList::requestClipInfo(const QDomElement xml, const QString id) void ProjectList::slotProcessNextClipInQueue() { if (m_infoQueue.isEmpty()) { - slotProcessNextThumbnail(); + emit processNextThumbnail(); return; } QMap::const_iterator j = m_infoQueue.constBegin(); if (j != m_infoQueue.constEnd()) { - const QDomElement dom = j.value(); + QDomElement dom = j.value(); const QString id = j.key(); - m_infoQueue.remove(j.key()); - emit getFileProperties(dom, id, m_listView->iconSize().height(), false); + m_infoQueue.remove(id); + m_processingClips.append(id); + bool replace; + if (dom.hasAttribute("replace")) { + // Proxy action was enabled / disabled and we want to replace current producer + dom.removeAttribute("replace"); + replace = true; + } + else replace = false; + bool selectClip = !replace; + if (m_infoQueue.count() > 1) selectClip = false; + emit getFileProperties(dom, id, m_listView->iconSize().height(), replace, selectClip); } - if (!m_infoQueue.isEmpty()) m_queueTimer.start(); } void ProjectList::slotUpdateClip(const QString &id) { ProjectItem *item = getItemById(id); - m_listView->blockSignals(true); + monitorItemEditing(false); if (item) item->setData(0, UsageRole, QString::number(item->numReferences())); - m_listView->blockSignals(false); + monitorItemEditing(true); } -void ProjectList::updateAllClips() +void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) { m_listView->setSortingEnabled(false); - kDebug() << "// UPDATE ALL CLPY"; QTreeWidgetItemIterator it(m_listView); DocClipBase *clip; ProjectItem *item; - m_listView->blockSignals(true); + monitorItemEditing(false); + int height = m_listView->iconSize().height(); + int width = (int)(height * m_render->dar()); + QPixmap missingPixmap = QPixmap(width, height); + missingPixmap.fill(Qt::transparent); + KIcon icon("dialog-close"); + QPainter p(&missingPixmap); + p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6)); + p.end(); + while (*it) { if ((*it)->type() == PROJECTSUBCLIPTYPE) { // subitem SubProjectItem *sub = static_cast (*it); - if (sub->data(0, Qt::DecorationRole).isNull()) { + if (displayRatioChanged || sub->data(0, Qt::DecorationRole).isNull()) { item = static_cast ((*it)->parent()); requestClipThumbnail(item->clipId() + '#' + QString::number(sub->zone().x())); } @@ -1024,28 +1192,58 @@ void ProjectList::updateAllClips() item = static_cast (*it); clip = item->referencedClip(); if (item->referencedClip()->producer() == NULL) { - if (clip->isPlaceHolder() == false) - requestClipInfo(clip->toXML(), clip->getId()); - else if (!clip->isPlaceHolder()) + if (clip->isPlaceHolder() == false) { + QDomElement xml = clip->toXML(); + if (fpsChanged) { + xml.removeAttribute("out"); + xml.removeAttribute("file_hash"); + xml.removeAttribute("proxy_out"); + } + requestClipInfo(xml, clip->getId()); + } + else { item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled); + if (item->data(0, Qt::DecorationRole).isNull()) { + item->setData(0, Qt::DecorationRole, 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); + } + } } else { - if (item->data(0, Qt::DecorationRole).isNull()) + if (displayRatioChanged || item->data(0, Qt::DecorationRole).isNull()) requestClipThumbnail(clip->getId()); - if (item->data(0, DurationRole).toString().isEmpty()) + if (item->data(0, DurationRole).toString().isEmpty()) { item->changeDuration(item->referencedClip()->producer()->get_playtime()); + } + if (clip->isPlaceHolder()) { + QPixmap pixmap = qVariantValue(item->data(0, Qt::DecorationRole)); + if (pixmap.isNull()) { + pixmap = QPixmap(width, height); + pixmap.fill(Qt::transparent); + } + 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->setData(0, UsageRole, QString::number(item->numReferences())); } - //qApp->processEvents(); ++it; } - if (!m_queueTimer.isActive()) - m_queueTimer.start(); + + if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); if (m_listView->isEnabled()) - m_listView->blockSignals(false); + monitorItemEditing(true); m_listView->setSortingEnabled(true); - if (m_infoQueue.isEmpty()) - slotProcessNextThumbnail(); + if (m_infoQueue.isEmpty()) { + slotProcessNextThumbnail(); + } } // static @@ -1053,12 +1251,12 @@ 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" - << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "application/ogg" << "application/mxf" + << "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"; QString allExtensions; - foreach(const QString& mimeType, mimeTypes) { + foreach(const QString & mimeType, mimeTypes) { KMimeType::Ptr mime(KMimeType::mimeType(mimeType)); if (mime) { allExtensions.append(mime->patterns().join(" ")); @@ -1079,10 +1277,21 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group const QString dialogFilter = allExtensions + ' ' + QLatin1Char('|') + i18n("All Supported Files") + "\n* " + QLatin1Char('|') + i18n("All Files"); QCheckBox *b = new QCheckBox(i18n("Import image sequence")); b->setChecked(KdenliveSettings::autoimagesequence()); - KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, this, b); + QCheckBox *c = new QCheckBox(i18n("Transparent background for images")); + c->setChecked(KdenliveSettings::autoimagetransparency()); + QFrame *f = new QFrame; + f->setFrameShape(QFrame::NoFrame); + QHBoxLayout *l = new QHBoxLayout; + l->addWidget(b); + l->addWidget(c); + l->addStretch(5); + f->setLayout(l); + KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), f); d->setOperationMode(KFileDialog::Opening); d->setMode(KFile::Files); - d->exec(); + if (d->exec() == QDialog::Accepted) { + KdenliveSettings::setAutoimagetransparency(c->isChecked()); + } list = d->selectedUrls(); if (b->isChecked() && list.count() == 1) { // Check for image sequence @@ -1091,9 +1300,10 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group if (fileName.at(fileName.size() - 1).isDigit()) { KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); if (item.mimetype().startsWith("image")) { - int count = 0; - // import as sequence if we found at least 5 images in the sequence - QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &count); + // 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(); @@ -1118,7 +1328,7 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group list << givenList.at(i); } - foreach(const KUrl &file, list) { + foreach(const KUrl & file, list) { // Check there is no folder here KMimeType::Ptr type = KMimeType::findByUrl(file); if (type->is("inode/directory")) { @@ -1141,14 +1351,16 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace) { ProjectItem *item = getItemById(id); - QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue())); + m_processingClips.removeAll(id); + m_thumbnailQueue.removeAll(id); + if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); if (item) { const QString path = item->referencedClip()->fileURL().path(); if (item->referencedClip()->isPlaceHolder()) replace = false; if (!path.isEmpty()) { if (replace) - KMessageBox::sorry(this, i18n("Clip %1
is invalid, will be removed from project.", path)); - else if (KMessageBox::questionYesNo(this, i18n("Clip %1
is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes) + KMessageBox::sorry(kapp->activeWindow(), i18n("Clip %1
is invalid, will be removed from project.", path)); + else if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("Clip %1
is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes) replace = true; } if (replace) @@ -1156,6 +1368,28 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace) } } +void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) +{ + ProjectItem *item = getItemById(id); + if (item) { + if (durationError) { + kDebug() << "Proxy duration is wrong, try changing transcoding parameters."; + emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2); + } + item->setProxyStatus(PROXYCRASHED); + QString path = item->referencedClip()->getProperty("proxy"); + KUrl proxyFolder(m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"); + + //Security check: make sure the invalid proxy file is in the proxy folder + if (proxyFolder.isParentOf(KUrl(path))) { + QFile::remove(path); + } + } + m_processingClips.removeAll(id); + m_thumbnailQueue.removeAll(id); + if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); +} + void ProjectList::slotAddColorClip() { if (!m_commandStack) @@ -1229,7 +1463,7 @@ void ProjectList::slotAddTitleTemplateClip() if (!templateFiles.isEmpty()) dia_ui.buttonBox->button(QDialogButtonBox::Ok)->setFocus(); - dia_ui.template_list->fileDialog()->setFilter("*.kdenlivetitle"); + dia_ui.template_list->fileDialog()->setFilter("application/x-kdenlivetitle"); //warning: setting base directory doesn't work?? KUrl startDir(path); dia_ui.template_list->fileDialog()->setUrl(startDir); @@ -1263,6 +1497,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) { m_listView->blockSignals(true); m_listView->clear(); + m_processingClips.clear(); m_listView->setSortingEnabled(false); emit clipSelected(NULL); m_thumbnailQueue.clear(); @@ -1274,10 +1509,12 @@ void ProjectList::setDocument(KdenliveDoc *doc) m_doc = doc; QMap flist = doc->clipManager()->documentFolderList(); + QStringList openedFolders = doc->getExpandedFolders(); QMapIterator f(flist); while (f.hasNext()) { f.next(); - (void) new FolderProjectItem(m_listView, QStringList() << f.value(), f.key()); + FolderProjectItem *folder = new FolderProjectItem(m_listView, QStringList() << f.value(), f.key()); + folder->setExpanded(openedFolders.contains(f.key())); } QList list = doc->clipManager()->documentClipList(); @@ -1285,12 +1522,11 @@ void ProjectList::setDocument(KdenliveDoc *doc) slotAddClip(list.at(i), false); m_listView->blockSignals(false); - m_toolbar->setEnabled(true); 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()), this, SLOT(updateAllClips())); + connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool)), this, SLOT(updateAllClips(bool, bool))); } QList ProjectList::documentClipList() const @@ -1322,7 +1558,7 @@ QDomElement ProjectList::producersList() void ProjectList::slotCheckForEmptyQueue() { - if (!m_refreshed && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) { + if (!m_refreshed && m_processingClips.isEmpty() && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) { m_refreshed = true; emit loadingIsOver(); emit displayMessage(QString(), -1); @@ -1334,22 +1570,6 @@ void ProjectList::slotCheckForEmptyQueue() } } -void ProjectList::reloadClipThumbnails() -{ - kDebug() << "////////////// RELOAD CLIPS THUMBNAILS!!!"; - m_thumbnailQueue.clear(); - QTreeWidgetItemIterator it(m_listView); - while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { - // subitem - ++it; - continue; - } - m_thumbnailQueue << ((ProjectItem *)(*it))->clipId(); - ++it; - } - QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail())); -} void ProjectList::requestClipThumbnail(const QString id) { @@ -1378,8 +1598,9 @@ void ProjectList::slotRefreshClipThumbnail(const QString &clipId, bool update) QTreeWidgetItem *item = getAnyItemById(clipId); if (item) slotRefreshClipThumbnail(item, update); - else + else { slotProcessNextThumbnail(); + } } void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) @@ -1412,13 +1633,13 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) else if (clip->clipType() == IMAGE) pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->producer(), 0, width, height)); else - pix = item->referencedClip()->thumbProducer()->extractImage(frame, width, height); + pix = item->referencedClip()->extractImage(frame, width, height); if (!pix.isNull()) { - m_listView->blockSignals(true); + monitorItemEditing(false); it->setData(0, Qt::DecorationRole, pix); - if (m_listView->isEnabled()) - m_listView->blockSignals(false); + monitorItemEditing(true); + if (!isSubItem) m_doc->cachePixmap(item->getClipHash(), pix); else @@ -1426,72 +1647,184 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) } if (update) emit projectModified(); - QTimer::singleShot(30, this, SLOT(slotProcessNextThumbnail())); + slotProcessNextThumbnail(); } } -void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace) +void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace, bool selectClip) { QString toReload; ProjectItem *item = getItemById(clipId); + if (!m_refreshed) { + // we are still finishing to load the document + selectClip = false; + } + m_processingClips.removeAll(clipId); + if (m_infoQueue.isEmpty() && m_processingClips.isEmpty()) m_listView->setEnabled(true); + if (item && producer) { - m_listView->blockSignals(true); + //m_listView->blockSignals(true); + monitorItemEditing(false); + DocClipBase *clip = item->referencedClip(); item->setProperties(properties, metadata); - if (item->referencedClip()->isPlaceHolder() && producer->is_valid()) { - item->referencedClip()->setValid(); + if (clip->isPlaceHolder() && producer->is_valid()) { + clip->setValid(); item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled); toReload = clipId; } - //Q_ASSERT_X(item->referencedClip(), "void ProjectList::slotReplyGetFileProperties", QString("Item with groupName %1 does not have a clip associated").arg(item->groupName()).toLatin1()); - item->referencedClip()->setProducer(producer, replace); - item->referencedClip()->askForAudioThumbs(); + // Proxy stuff + QString size = properties.value("frame_size"); + if (!useProxy() && clip->getProperty("proxy").isEmpty()) setProxyStatus(item, NOPROXY); + if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") setProxyStatus(item, NOPROXY); + else if (useProxy() && !item->isProxyRunning()) { + // proxy video and image clips + int maxSize; + CLIPTYPE t = item->clipType(); + if (t == IMAGE) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt(); + else maxSize = m_doc->getDocumentProperty("proxyminsize").toInt(); + if ((((t == AV || t == VIDEO || t == PLAYLIST) && generateProxy()) || (t == IMAGE && generateImageProxy())) && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize)) { + if (clip->getProperty("proxy").isEmpty()) { + KUrl proxyPath = m_doc->projectFolder(); + proxyPath.addPath("proxy/"); + 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")); + newProps.insert("proxy", proxyPath.path()); + QMap oldProps = clip->properties(); + oldProps.insert("proxy", QString()); + EditClipCommand *command = new EditClipCommand(this, clipId, oldProps, newProps, true); + m_doc->commandStack()->push(command); + } + } + } + clip->setProducer(producer, replace); + clip->askForAudioThumbs(); + if (!replace && item->data(0, Qt::DecorationRole).isNull()) requestClipThumbnail(clipId); if (!toReload.isEmpty()) item->slotSetToolTip(); - //emit receivedClipDuration(clipId); - if (m_listView->isEnabled() && replace) { - // update clip in clip monitor - emit clipSelected(NULL); - emit clipSelected(item->referencedClip()); - //TODO: Make sure the line below has no side effect - toReload = clipId; - } - /*else { - // Check if duration changed. - emit receivedClipDuration(clipId); - delete producer; - }*/ if (m_listView->isEnabled()) - m_listView->blockSignals(false); - /*if (item->icon(0).isNull()) { - requestClipThumbnail(clipId); - }*/ + monitorItemEditing(true); } else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS..."; - int max = m_doc->clipManager()->clipsCount(); - if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty()) { - m_listView->setCurrentItem(item); - if (item->parent()) { - if (item->parent()->type() == PROJECTFOLDERTYPE) - static_cast (item->parent())->switchIcon(); + if (selectClip && m_infoQueue.isEmpty()) { + if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty()) { + m_listView->setCurrentItem(item); + bool updatedProfile = false; + if (item->parent()) { + if (item->parent()->type() == PROJECTFOLDERTYPE) + static_cast (item->parent())->switchIcon(); + } else if (KdenliveSettings::checkfirstprojectclip() && m_listView->topLevelItemCount() == 1) { + // 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()); + } else { + int max = m_doc->clipManager()->clipsCount(); + emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max)); } - emit clipSelected(item->referencedClip()); - } else { - emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max)); } + if (item && m_listView->isEnabled() && replace) { + // update clip in clip monitor + if (item->isSelected() && m_listView->selectedItems().count() == 1) + emit clipSelected(item->referencedClip()); + //TODO: Make sure the line below has no side effect + toReload = clipId; + } if (!toReload.isEmpty()) emit clipNeedsReload(toReload, true); - // small delay so that the app can display the progress info - QTimer::singleShot(30, this, SLOT(slotProcessNextClipInQueue())); + + if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); +} + +bool ProjectList::adjustProjectProfileToItem(ProjectItem *item) +{ + if (item == NULL) { + if (m_listView->currentItem() && m_listView->currentItem()->type() != PROJECTFOLDERTYPE) + item = static_cast (m_listView->currentItem()); + } + if (item == NULL || item->referencedClip() == NULL) { + KMessageBox::information(kapp->activeWindow(), i18n("Cannot find profile from current clip")); + return false; + } + bool profileUpdated = false; + QString size = item->referencedClip()->getProperty("frame_size"); + int width = size.section('x', 0, 0).toInt(); + int height = size.section('x', -1).toInt(); + double fps = item->referencedClip()->getProperty("fps").toDouble(); + double par = item->referencedClip()->getProperty("aspect_ratio").toDouble(); + if (item->clipType() == IMAGE || item->clipType() == AV || item->clipType() == VIDEO) { + if (ProfilesDialog::matchProfile(width, height, fps, par, item->clipType() == IMAGE, m_doc->mltProfile()) == false) { + // get a list of compatible profiles + QMap suggestedProfiles = ProfilesDialog::getProfilesFromProperties(width, height, fps, par, item->clipType() == IMAGE); + if (!suggestedProfiles.isEmpty()) { + KDialog *dialog = new KDialog(this); + dialog->setCaption(i18n("Change project profile")); + dialog->setButtons(KDialog::Ok | KDialog::Cancel); + + QWidget container; + QVBoxLayout *l = new QVBoxLayout; + QLabel *label = new QLabel(i18n("Your clip does not match current project's profile.\nDo you want to change the project profile?\n\nThe following profiles match the clip (size: %1, fps: %2)", size, fps)); + l->addWidget(label); + QListWidget *list = new QListWidget; + list->setAlternatingRowColors(true); + QMapIterator i(suggestedProfiles); + while (i.hasNext()) { + i.next(); + QListWidgetItem *item = new QListWidgetItem(i.value(), list); + item->setData(Qt::UserRole, i.key()); + item->setToolTip(i.key()); + } + list->setCurrentRow(0); + l->addWidget(list); + container.setLayout(l); + dialog->setButtonText(KDialog::Ok, i18n("Update profile")); + dialog->setMainWidget(&container); + if (dialog->exec() == QDialog::Accepted) { + //Change project profile + profileUpdated = true; + if (list->currentItem()) + emit updateProfile(list->currentItem()->data(Qt::UserRole).toString()); + } + delete list; + delete label; + } else if (fps > 0) { + KMessageBox::information(kapp->activeWindow(), i18n("Your clip does not match current project's profile.\nNo existing profile found to match the clip's properties.\nClip size: %1\nFps: %2\n", size, fps)); + } + } + } + return profileUpdated; +} + +QString ProjectList::getDocumentProperty(const QString &key) const +{ + return m_doc->getDocumentProperty(key); +} + +bool ProjectList::useProxy() const +{ + return m_doc->getDocumentProperty("enableproxy").toInt(); +} + +bool ProjectList::generateProxy() const +{ + return m_doc->getDocumentProperty("generateproxy").toInt(); +} + +bool ProjectList::generateImageProxy() const +{ + return m_doc->getDocumentProperty("generateimageproxy").toInt(); } void ProjectList::slotReplyGetImage(const QString &clipId, const QPixmap &pix) { ProjectItem *item = getItemById(clipId); if (item && !pix.isNull()) { - m_listView->blockSignals(true); + monitorItemEditing(false); item->setData(0, Qt::DecorationRole, pix); + monitorItemEditing(true); m_doc->cachePixmap(item->getClipHash(), pix); if (m_listView->isEnabled()) m_listView->blockSignals(false); @@ -1539,7 +1872,7 @@ ProjectItem *ProjectList::getItemById(const QString &id) QTreeWidgetItemIterator it(m_listView); while (*it) { if ((*it)->type() != PROJECTCLIPTYPE) { - // subitem + // subitem or folder ++it; continue; } @@ -1572,10 +1905,11 @@ void ProjectList::slotSelectClip(const QString &ix) if (clip) { m_listView->setCurrentItem(clip); m_listView->scrollToItem(clip); - m_editAction->setEnabled(true); - m_deleteAction->setEnabled(true); + m_editButton->defaultAction()->setEnabled(true); + m_deleteButton->defaultAction()->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); + m_proxyAction->setEnabled(useProxy()); if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -1621,9 +1955,9 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const continue; DocClipBase *clip = item->referencedClip(); if (!condition.isEmpty()) { - if (condition.startsWith("vcodec") && !clip->hasVideoCodec(condition.section("=", 1, 1))) + if (condition.startsWith("vcodec") && !clip->hasVideoCodec(condition.section('=', 1, 1))) continue; - else if (condition.startsWith("acodec") && !clip->hasAudioCodec(condition.section("=", 1, 1))) + else if (condition.startsWith("acodec") && !clip->hasAudioCodec(condition.section('=', 1, 1))) continue; } result.append(item->clipUrl()); @@ -1683,7 +2017,7 @@ void ProjectList::addClipCut(const QString &id, int in, int out, const QString d if (clip) { DocClipBase *base = clip->referencedClip(); base->addCutZone(in, out); - m_listView->blockSignals(true); + monitorItemEditing(false); SubProjectItem *sub = new SubProjectItem(clip, in, out, desc); if (newItem && desc.isEmpty() && !m_listView->isColumnHidden(1)) { if (!clip->isExpanded()) @@ -1691,10 +2025,10 @@ void ProjectList::addClipCut(const QString &id, int in, int out, const QString d m_listView->scrollToItem(sub); m_listView->editItem(sub, 1); } - QPixmap p = clip->referencedClip()->thumbProducer()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2); + QPixmap p = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2); sub->setData(0, Qt::DecorationRole, p); m_doc->cachePixmap(clip->getClipHash() + '#' + QString::number(in), p); - m_listView->blockSignals(false); + monitorItemEditing(true); } emit projectModified(); } @@ -1707,9 +2041,9 @@ void ProjectList::removeClipCut(const QString &id, int in, int out) base->removeCutZone(in, out); SubProjectItem *sub = getSubItem(clip, QPoint(in, out)); if (sub) { - m_listView->blockSignals(true); + monitorItemEditing(false); delete sub; - m_listView->blockSignals(false); + monitorItemEditing(true); } } emit projectModified(); @@ -1751,10 +2085,10 @@ void ProjectList::doUpdateClipCut(const QString &id, const QPoint oldzone, const return; DocClipBase *base = clip->referencedClip(); base->updateCutZone(oldzone.x(), oldzone.y(), zone.x(), zone.y(), comment); - m_listView->blockSignals(true); + monitorItemEditing(false); sub->setZone(zone); sub->setDescription(comment); - m_listView->blockSignals(false); + monitorItemEditing(true); emit projectModified(); } @@ -1765,4 +2099,460 @@ void ProjectList::slotForceProcessing(const QString &id) } } +void ProjectList::slotAddOrUpdateSequence(const QString frameName) +{ + QString fileName = KUrl(frameName).fileName().section('_', 0, -2); + QStringList list; + QString pattern = SlideshowClip::selectedPath(frameName, false, QString(), &list); + int count = list.count(); + if (count > 1) { + const QList existing = m_doc->clipManager()->getClipByResource(pattern); + if (!existing.isEmpty()) { + // Sequence already exists, update + QString id = existing.at(0)->getId(); + //ProjectItem *item = getItemById(id); + QMap oldprops; + QMap newprops; + int ttl = existing.at(0)->getProperty("ttl").toInt(); + oldprops["out"] = existing.at(0)->getProperty("out"); + newprops["out"] = QString::number(ttl * count - 1); + slotUpdateClipProperties(id, newprops); + EditClipCommand *command = new EditClipCommand(this, id, oldprops, newprops, false); + m_commandStack->push(command); + } else { + // Create sequence + QStringList groupInfo = getGroup(); + m_doc->slotCreateSlideshowClipFile(fileName, pattern, count, m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()), + false, false, false, + m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))), QString(), 0, + QString(), groupInfo.at(0), groupInfo.at(1)); + } + } else emit displayMessage(i18n("Sequence not found"), -2); +} + +QMap ProjectList::getProxies() +{ + QMap list; + ProjectItem *item; + QTreeWidgetItemIterator it(m_listView); + while (*it) { + if ((*it)->type() != PROJECTCLIPTYPE) { + ++it; + continue; + } + item = static_cast(*it); + if (item && item->referencedClip() != NULL) { + if (item->hasProxy()) { + QString proxy = item->referencedClip()->getProperty("proxy"); + list.insert(proxy, item->clipUrl().path()); + } + } + ++it; + } + return list; +} + +void ProjectList::slotCreateProxy(const QString id) +{ + ProjectItem *item = getItemById(id); + if (!item || item->isProxyRunning() || item->referencedClip()->isPlaceHolder()) return; + QString path = item->referencedClip()->getProperty("proxy"); + if (path.isEmpty()) { + setProxyStatus(path, PROXYCRASHED); + return; + } + setProxyStatus(path, PROXYWAITING); + if (m_abortProxy.contains(path)) m_abortProxy.removeAll(path); + if (m_processingProxy.contains(path)) { + // Proxy is already being generated + return; + } + if (QFile::exists(path)) { + // Proxy already created + setProxyStatus(path, PROXYDONE); + slotGotProxy(path); + return; + } + m_processingProxy.append(path); + QtConcurrent::run(this, &ProjectList::slotGenerateProxy, path, item->clipUrl().path(), item->clipType(), QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt()); +} + +void ProjectList::slotAbortProxy(const QString id, const QString path) +{ + QTreeWidgetItemIterator it(m_listView); + ProjectItem *item = getItemById(id); + setProxyStatus(item, NOPROXY); + slotGotProxy(item); + if (!path.isEmpty() && m_processingProxy.contains(path)) { + m_abortProxy << path; + setProxyStatus(path, NOPROXY); + } +} + +void ProjectList::slotGenerateProxy(const QString destPath, const QString sourcePath, int clipType, int exif_orientation) +{ + emit projectModified(); + // Make sure proxy path is writable + QFile file(destPath); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + setProxyStatus(destPath, PROXYCRASHED); + return; + } + file.close(); + QFile::remove(destPath); + + setProxyStatus(destPath, CREATINGPROXY); + + // Special case: playlist clips (.mlt or .kdenlive project files) + if (clipType == PLAYLIST) { + // change FFmpeg params to MLT format + QStringList parameters; + parameters << sourcePath; + parameters << "-consumer" << "avformat:" + destPath; + QStringList params = m_doc->getDocumentProperty("proxyparams").simplified().split('-', QString::SkipEmptyParts); + + foreach(QString s, params) { + s = s.simplified(); + if (s.count(' ') == 0) { + s.append("=1"); + } + else s.replace(' ', '='); + parameters << s; + } + + parameters.append(QString("real_time=-%1").arg(KdenliveSettings::mltthreads())); + + //TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy + double display_ratio = KdenliveDoc::getDisplayRatio(sourcePath); + parameters << "aspect=" + QString::number(display_ratio); + + //kDebug()<<"TRANSCOD: "< i.height()) proxy = i.scaledToWidth(m_render->frameRenderWidth()); + else proxy = i.scaledToHeight(m_render->renderHeight()); + if (exif_orientation > 1) { + // Rotate image according to exif data + QImage processed; + QMatrix matrix; + + switch ( exif_orientation ) { + case 2: + matrix.scale( -1, 1 ); + break; + case 3: + matrix.rotate( 180 ); + break; + case 4: + matrix.scale( 1, -1 ); + break; + case 5: + matrix.rotate( 270 ); + matrix.scale( -1, 1 ); + break; + case 6: + matrix.rotate( 90 ); + break; + case 7: + matrix.rotate( 90 ); + matrix.scale( -1, 1 ); + break; + case 8: + matrix.rotate( 270 ); + break; + } + processed = proxy.transformed( matrix ); + processed.save(destPath); + } + else proxy.save(destPath); + setProxyStatus(destPath, PROXYDONE); + slotGotProxy(destPath); + m_abortProxy.removeAll(destPath); + m_processingProxy.removeAll(destPath); + return; + } + + QStringList parameters; + parameters << "-i" << sourcePath; + QString params = m_doc->getDocumentProperty("proxyparams").simplified(); + foreach(QString s, params.split(' ')) + parameters << s; + + // Make sure we don't block when proxy file already exists + parameters << "-y"; + parameters << destPath; + kDebug()<<"// STARTING PROXY GEN: "<setText(i18n("Update proxy settings")); + QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"; + while (*it) { + if ((*it)->type() != PROJECTCLIPTYPE) { + ++it; + continue; + } + item = static_cast(*it); + if (item == NULL) { + ++it; + continue; + } + CLIPTYPE t = item->clipType(); + if ((t == VIDEO || t == AV || t == UNKNOWN) && item->referencedClip() != NULL) { + if (generateProxy() && useProxy() && !item->isProxyRunning()) { + DocClipBase *clip = item->referencedClip(); + if (clip->getProperty("frame_size").section('x', 0, 0).toInt() > m_doc->getDocumentProperty("proxyminsize").toInt()) { + if (clip->getProperty("proxy").isEmpty()) { + // We need to insert empty proxy in old properties so that undo will work + QMap oldProps = clip->properties(); + oldProps.insert("proxy", QString()); + QMap newProps; + newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + "." + m_doc->getDocumentProperty("proxyextension")); + new EditClipCommand(this, clip->getId(), oldProps, newProps, true, command); + } + } + } + else if (item->hasProxy()) { + // remove proxy + QMap newProps; + newProps.insert("proxy", QString()); + newProps.insert("replace", "1"); + // insert required duration for proxy + newProps.insert("proxy_out", item->referencedClip()->producerProperty("out")); + new EditClipCommand(this, item->clipId(), item->referencedClip()->properties(), newProps, true, command); + } + } + else if (t == IMAGE && item->referencedClip() != NULL) { + if (generateImageProxy() && useProxy()) { + DocClipBase *clip = item->referencedClip(); + int maxImageSize = m_doc->getDocumentProperty("proxyimageminsize").toInt(); + if (clip->getProperty("frame_size").section('x', 0, 0).toInt() > maxImageSize || clip->getProperty("frame_size").section('x', 1, 1).toInt() > maxImageSize) { + if (clip->getProperty("proxy").isEmpty()) { + // We need to insert empty proxy in old properties so that undo will work + QMap oldProps = clip->properties(); + oldProps.insert("proxy", QString()); + QMap newProps; + newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + ".png"); + new EditClipCommand(this, clip->getId(), oldProps, newProps, true, command); + } + } + } + else if (item->hasProxy()) { + // remove proxy + QMap newProps; + newProps.insert("proxy", QString()); + newProps.insert("replace", "1"); + new EditClipCommand(this, item->clipId(), item->referencedClip()->properties(), newProps, true, command); + } + } + ++it; + } + if (command->childCount() > 0) m_doc->commandStack()->push(command); + else delete command; + if (!m_infoQueue.isEmpty() && !m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); +} + +void ProjectList::slotProxyCurrentItem(bool doProxy) +{ + QList list = m_listView->selectedItems(); + QTreeWidgetItem *listItem; + QUndoCommand *command = new QUndoCommand(); + if (doProxy) command->setText(i18np("Add proxy clip", "Add proxy clips", list.count())); + else command->setText(i18np("Remove proxy clip", "Remove proxy clips", list.count())); + + // 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 < list.count(); i++) { + listItem = list.at(i); + if (listItem->type() == PROJECTFOLDERTYPE) { + for (int j = 0; j < listItem->childCount(); j++) { + QTreeWidgetItem *sub = listItem->child(j); + if (!list.contains(sub)) list.append(sub); + } + } + if (listItem->type() == PROJECTCLIPTYPE) { + ProjectItem *item = static_cast (listItem); + CLIPTYPE t = item->clipType(); + if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) { + oldProps = item->referencedClip()->properties(); + if (doProxy) { + newProps.clear(); + QString path = proxydir + item->referencedClip()->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); + // insert required duration for proxy + newProps.insert("proxy_out", item->referencedClip()->producerProperty("out")); + newProps.insert("proxy", path); + // We need to insert empty proxy so that undo will work + oldProps.insert("proxy", QString()); + } + new EditClipCommand(this, item->clipId(), oldProps, newProps, true, command); + } + } + } + if (command->childCount() > 0) { + m_doc->commandStack()->push(command); + } + else delete command; + //if (!m_infoQueue.isEmpty() && !m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); +} + + +void ProjectList::slotDeleteProxy(const QString proxyPath) +{ + if (proxyPath.isEmpty()) return; + QUndoCommand *proxyCommand = new QUndoCommand(); + proxyCommand->setText(i18n("Remove Proxy")); + QTreeWidgetItemIterator it(m_listView); + ProjectItem *item; + while (*it) { + if ((*it)->type() == PROJECTCLIPTYPE) { + item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == proxyPath) { + QMap props; + props.insert("proxy", QString()); + new EditClipCommand(this, item->clipId(), item->referencedClip()->properties(), props, true, proxyCommand); + + } + } + ++it; + } + if (proxyCommand->childCount() == 0) + delete proxyCommand; + else + m_commandStack->push(proxyCommand); + QFile::remove(proxyPath); +} + +void ProjectList::setProxyStatus(const QString proxyPath, PROXYSTATUS status) +{ + if (proxyPath.isEmpty()) return; + QTreeWidgetItemIterator it(m_listView); + ProjectItem *item; + while (*it) { + if ((*it)->type() == PROJECTCLIPTYPE) { + item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == proxyPath) { + setProxyStatus(item, status); + } + } + ++it; + } +} + +void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status) +{ + if (item == NULL) return; + monitorItemEditing(false); + item->setProxyStatus(status); + monitorItemEditing(true); +} + +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))); +} + +QStringList ProjectList::expandedFolders() const +{ + QStringList result; + FolderProjectItem *item; + QTreeWidgetItemIterator it(m_listView); + while (*it) { + if ((*it)->type() != PROJECTFOLDERTYPE) { + ++it; + continue; + } + if ((*it)->isExpanded()) { + item = static_cast(*it); + result.append(item->clipId()); + } + ++it; + } + return result; +} + #include "projectlist.moc"