X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=5d74c7bdd3e313daab2b8286983f89e6a05335af;hb=24bf4e16f446c1c4b2e5a6939155e0cf00d2c792;hp=3ca48c99b7d2b5af156a5b6dd3e3d6b9860af396;hpb=37ae2ecef6f5c1c2e6643e83aa34213da0f5176b;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 3ca48c99..5d74c7bd 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -500,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); } @@ -608,7 +629,7 @@ void ProjectList::slotClipSelected() void ProjectList::adjustProxyActions(ProjectItem *clip) const { - if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) { + if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) { m_proxyAction->setEnabled(false); return; } @@ -995,7 +1016,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) } 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)), this, SLOT(slotAbortProxy(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(); @@ -1003,7 +1024,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) m_infoQueue.insert(clip->getId(), e); } else if (item->hasProxy() && !item->isProxyRunning()) { - slotCreateProxy(clip->getId(), false); + slotCreateProxy(clip->getId()); } clip->askForAudioThumbs(); @@ -1051,28 +1072,42 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } -void ProjectList::slotGotProxy(const QString &id) +void ProjectList::slotGotProxy(const QString &proxyPath) { - ProjectItem *item = getItemById(id); - if (item) { - // Proxy clip successfully created - QDomElement e = item->referencedClip()->toXML().cloneNode().toElement(); - //e.removeAttribute("file_hash"); + if (proxyPath.isEmpty()) return; + QTreeWidgetItemIterator it(m_listView); + ProjectItem *item; - // 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(item->referencedClip()->producerProperty("length")).toInt(); - if (length > 0 && !e.hasAttribute("length")) { - e.setAttribute("length", length); - } + while (*it) { + if ((*it)->type() == PROJECTCLIPTYPE) { + item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == proxyPath) + slotGotProxy(item); } - e.setAttribute("replace", 1); - m_infoQueue.insert(id, e); - if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); + ++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() { m_listView->clear(); @@ -1122,20 +1157,28 @@ void ProjectList::slotUpdateClip(const QString &id) 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; 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())); } @@ -1149,20 +1192,48 @@ 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()) { 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; } @@ -1170,8 +1241,9 @@ void ProjectList::updateAllClips() if (m_listView->isEnabled()) monitorItemEditing(true); m_listView->setSortingEnabled(true); - if (m_infoQueue.isEmpty()) - slotProcessNextThumbnail(); + if (m_infoQueue.isEmpty()) { + slotProcessNextThumbnail(); + } } // static @@ -1280,6 +1352,7 @@ void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace) { ProjectItem *item = getItemById(id); 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(); @@ -1299,8 +1372,10 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) { ProjectItem *item = getItemById(id); if (item) { - //TODO: use durationError to display correct message to user after 0.8 release - if (durationError) kDebug() << "Proxy duration is wrong, try changing transcoding parameters."; + 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/"); @@ -1311,6 +1386,7 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) } } m_processingClips.removeAll(id); + m_thumbnailQueue.removeAll(id); if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } @@ -1431,7 +1507,6 @@ void ProjectList::setDocument(KdenliveDoc *doc) m_timecode = doc->timecode(); m_commandStack = doc->commandStack(); m_doc = doc; - m_proxyList.clear(); QMap flist = doc->clipManager()->documentFolderList(); QStringList openedFolders = doc->getExpandedFolders(); @@ -1451,7 +1526,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) 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 @@ -1495,21 +1570,6 @@ void ProjectList::slotCheckForEmptyQueue() } } -void ProjectList::reloadClipThumbnails() -{ - 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) { @@ -1538,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) @@ -1572,7 +1633,7 @@ 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()) { monitorItemEditing(false); @@ -1586,7 +1647,6 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) } if (update) emit projectModified(); - slotProcessNextThumbnail(); } } @@ -1601,77 +1661,78 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } m_processingClips.removeAll(clipId); if (m_infoQueue.isEmpty() && m_processingClips.isEmpty()) m_listView->setEnabled(true); + if (item && producer) { //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; } - // Proxy stuff QString size = properties.value("frame_size"); - DocClipBase *clip = item->referencedClip(); - if (!useProxy() && item->referencedClip()->getProperty("proxy").isEmpty()) setProxyStatus(item, NOPROXY); - if (useProxy() && generateProxy() && item->referencedClip()->getProperty("proxy") == "-") setProxyStatus(item, NOPROXY); - else if (useProxy() && !item->isProxyRunning() && (item->clipType() == AV || item->clipType() == VIDEO) && generateProxy() && size.section('x', 0, 0).toInt() > m_doc->getDocumentProperty("proxyminsize").toInt()) { - if (clip->getProperty("proxy").isEmpty()) { - QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"; - QMap newProps; - newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + "." + m_doc->getDocumentProperty("proxyextension")); - // insert required duration for proxy - newProps.insert("proxy_out", item->referencedClip()->producerProperty("out")); - QMap oldProps = clip->properties(); - oldProps.insert("proxy", QString()); - EditClipCommand *command = new EditClipCommand(this, clipId, oldProps, newProps, true); - m_doc->commandStack()->push(command); + 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(); - if (m_listView->isEnabled() && replace) { - // update clip in clip monitor - emit clipSelected(NULL); - emit clipSelected(clip); - //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()) monitorItemEditing(true); - /*if (item->icon(0).isNull()) { - requestClipThumbnail(clipId); - }*/ } else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS..."; 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)); - } + 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)); + } } + 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); @@ -1964,7 +2025,7 @@ 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); monitorItemEditing(true); @@ -2091,68 +2152,121 @@ QMap ProjectList::getProxies() return list; } -void ProjectList::slotCreateProxy(const QString id, bool createProducer) +void ProjectList::slotCreateProxy(const QString id) { ProjectItem *item = getItemById(id); - if (!item || item->isProxyRunning()) return; - - // If proxy producer already exists, skip creation - if (!createProducer) { - setProxyStatus(id, PROXYDONE); + if (!item || item->isProxyRunning() || item->referencedClip()->isPlaceHolder()) return; + QString path = item->referencedClip()->getProperty("proxy"); + if (path.isEmpty()) { + setProxyStatus(path, PROXYCRASHED); return; } - setProxyStatus(id, PROXYWAITING); - if (m_abortProxyId.contains(id)) m_abortProxyId.removeAll(id); - emit projectModified(); - QtConcurrent::run(this, &ProjectList::slotGenerateProxy, id); + 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) +void ProjectList::slotAbortProxy(const QString id, const QString path) { - if (m_proxyList.contains(id)) m_proxyList.removeAll(id); + QTreeWidgetItemIterator it(m_listView); ProjectItem *item = getItemById(id); - if (item) { - emit projectModified(); - if (item->isProxyReady()) slotGotProxy(id); - else if (item->isProxyRunning()) m_abortProxyId << id; - setProxyStatus(id, NOPROXY); + setProxyStatus(item, NOPROXY); + slotGotProxy(item); + if (!path.isEmpty() && m_processingProxy.contains(path)) { + m_abortProxy << path; + setProxyStatus(path, NOPROXY); } } -void ProjectList::slotGenerateProxy(const QString id) +void ProjectList::slotGenerateProxy(const QString destPath, const QString sourcePath, int clipType, int exif_orientation) { - setProxyStatus(id, CREATINGPROXY); - ProjectItem *item = getItemById(id); - if (item == NULL) return; - QString path = item->referencedClip()->getProperty("proxy"); - if (path.isEmpty()) { - setProxyStatus(id, PROXYCRASHED); + emit projectModified(); + // Make sure proxy path is writable + QFile file(destPath); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + setProxyStatus(destPath, PROXYCRASHED); return; } - - QString url = item->clipUrl().path(); + file.close(); + QFile::remove(destPath); - if (QFile::exists(path)) { - setProxyStatus(id, PROXYDONE); - slotGotProxy(id); - return; - } - else { - // Make sure proxy path is writable - QFile file(path); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - setProxyStatus(id, PROXYCRASHED); - return; + 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; } - file.close(); - QFile::remove(path); + + 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: "<clipType() == IMAGE) { + + if (clipType == IMAGE) { // Image proxy - QImage i(url); + QImage i(sourcePath); if (i.isNull()) { // Cannot load image - setProxyStatus(id, PROXYCRASHED); + setProxyStatus(destPath, PROXYCRASHED); return; } QImage proxy; @@ -2160,7 +2274,6 @@ void ProjectList::slotGenerateProxy(const QString id) //TODO: Make it be configurable? if (i.width() > i.height()) proxy = i.scaledToWidth(m_render->frameRenderWidth()); else proxy = i.scaledToHeight(m_render->renderHeight()); - int exif_orientation = QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt(); if (exif_orientation > 1) { // Rotate image according to exif data QImage processed; @@ -2192,35 +2305,39 @@ void ProjectList::slotGenerateProxy(const QString id) break; } processed = proxy.transformed( matrix ); - processed.save(path); + processed.save(destPath); } - else proxy.save(path); - setProxyStatus(id, PROXYDONE); - slotGotProxy(id); + else proxy.save(destPath); + setProxyStatus(destPath, PROXYDONE); + slotGotProxy(destPath); + m_abortProxy.removeAll(destPath); + m_processingProxy.removeAll(destPath); return; } QStringList parameters; - parameters << "-i" << url; + 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 << path; + parameters << destPath; + kDebug()<<"// STARTING PROXY GEN: "<type() == PROJECTCLIPTYPE) { ProjectItem *item = static_cast (listItem); CLIPTYPE t = item->clipType(); - if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE) && item->referencedClip()) { + 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")); - newProps.insert("proxy", path); // 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()); } @@ -2360,10 +2479,47 @@ void ProjectList::slotProxyCurrentItem(bool doProxy) //if (!m_infoQueue.isEmpty() && !m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); } -void ProjectList::setProxyStatus(const QString id, PROXYSTATUS status) + +void ProjectList::slotDeleteProxy(const QString proxyPath) { - ProjectItem *item = getItemById(id); - setProxyStatus(item, status); + 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)