#include <KIO/NetAccess>
#include <KFileItem>
#include <KApplication>
+#include <KStandardDirs>
+
#ifdef NEPOMUK
#include <nepomuk/global.h>
#include <nepomuk/resourcemanager.h>
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;
// 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) {
}
if (allowDurationChange)
commonproperties.insert("out", QString::number(commonDuration));
+ if (hasImages)
+ commonproperties.insert("transparency", transparency);
/*QMapIterator<QString, QString> p(commonproperties);
while (p.hasNext()) {
p.next();
int length = QString(item->referencedClip()->producerProperty("length")).toInt();
if (length > 0 && !e.hasAttribute("length")) {
e.setAttribute("length", length);
- e.setAttribute("out", length - 1);
}
- }
-
+ }
emit getFileProperties(e, item->clipId(), m_listView->iconSize().height(), true, false);
}
}
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 = 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";
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;
}
- m_proxyAction->setEnabled(true);
+ m_proxyAction->setEnabled(useProxy());
m_proxyAction->blockSignals(true);
m_proxyAction->setChecked(clip->hasProxy());
m_proxyAction->blockSignals(false);
QMap <QString, QString> oldprops;
QMap <QString, QString> 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);
+ }
}
}
}
m_openAction->setEnabled(true);
m_reloadAction->setEnabled(true);
m_transcodeAction->setEnabled(true);
- m_proxyAction->setEnabled(true);
+ m_proxyAction->setEnabled(useProxy());
return;
}
else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) {
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)
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)), this, SLOT(slotAbortProxy(const QString)));
if (getProperties) {
- qApp->processEvents();
- m_refreshed = false;
- // Proxy clips
- CLIPTYPE t = clip->clipType();
- if ((t == VIDEO || t == AV || t == UNKNOWN) && useProxy()) {
- if (clip->getProperty("proxy").isEmpty()) {
- connect(clip, SIGNAL(proxyReady(const QString&, bool)), this, SLOT(slotGotProxy(const QString&, bool)));
- setProxyStatus(item, 1);
- clip->generateProxy(m_doc->projectFolder(), proxyParams());
- }
- else {
- // Proxy clip already created
- setProxyStatus(item, 2);
- QDomElement e = clip->toXML().cloneNode().toElement();
- e.removeAttribute("file_hash");
- m_infoQueue.insert(clip->getId(), e);
- }
- }
- else {
- // We don't use proxies
- // 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);
+ m_listView->processLayout();
+ QDomElement e = clip->toXML().cloneNode().toElement();
+ e.removeAttribute("file_hash");
+ m_infoQueue.insert(clip->getId(), e);
}
- else if (!clip->getProperty("proxy").isEmpty()) {
- connect(clip, SIGNAL(proxyReady(const QString&, bool)), this, SLOT(slotGotProxy(const QString&, bool)));
- setProxyStatus(item, 1);
- clip->generateProxy(m_doc->projectFolder(), proxyParams());
+ else if (item->hasProxy() && !item->isProxyRunning()) {
+ slotCreateProxy(clip->getId(), false);
}
clip->askForAudioThumbs();
m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
-void ProjectList::slotGotProxy(const QString &id, bool success)
+void ProjectList::slotGotProxy(const QString &id)
{
ProjectItem *item = getItemById(id);
if (item) {
- if (success) {
- // Proxy clip successfully created
- setProxyStatus(item, 2);
- QDomElement e = item->referencedClip()->toXML().cloneNode().toElement();
- e.removeAttribute("file_hash");
- e.setAttribute("replace", 1);
- m_infoQueue.insert(id, e);
- if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ // Proxy clip successfully created
+ QDomElement e = item->referencedClip()->toXML().cloneNode().toElement();
+ //e.removeAttribute("file_hash");
+
+ // 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);
+ }
}
- else setProxyStatus(item, 0);
- update();
+ e.setAttribute("replace", 1);
+ m_infoQueue.insert(id, e);
+ if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
}
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()));
}
monitorItemEditing(true);
}
-void ProjectList::updateAllClips()
+void ProjectList::updateAllClips(bool displayRatioChanged)
{
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 <SubProjectItem *>(*it);
- if (sub->data(0, Qt::DecorationRole).isNull()) {
+ if (displayRatioChanged || sub->data(0, Qt::DecorationRole).isNull()) {
item = static_cast <ProjectItem *>((*it)->parent());
requestClipThumbnail(item->clipId() + '#' + QString::number(sub->zone().x()));
}
if (item->referencedClip()->producer() == NULL) {
if (clip->isPlaceHolder() == false)
requestClipInfo(clip->toXML(), clip->getId());
- else if (!clip->isPlaceHolder())
+ else {
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
+ if (item->data(0, Qt::DecorationRole).isNull()) {
+ item->setData(0, Qt::DecorationRole, missingPixmap);
+ }
+ }
} 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());
+ }
}
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())
monitorItemEditing(true);
m_listView->setSortingEnabled(true);
- if (m_infoQueue.isEmpty())
- slotProcessNextThumbnail();
+ if (m_infoQueue.isEmpty()) {
+ slotProcessNextThumbnail();
+ }
}
// static
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, kapp->activeWindow(), 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
}
}
+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);
+ if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+}
+
void ProjectList::slotAddColorClip()
{
if (!m_commandStack)
m_timecode = doc->timecode();
m_commandStack = doc->commandStack();
m_doc = doc;
+ m_proxyList.clear();
QMap <QString, QString> flist = doc->clipManager()->documentFolderList();
+ QStringList openedFolders = doc->getExpandedFolders();
QMapIterator<QString, QString> 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 <DocClipBase*> list = doc->clipManager()->documentClipList();
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)), this, SLOT(updateAllClips(bool)));
}
QList <DocClipBase*> ProjectList::documentClipList() const
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);
}
}
-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)
{
QTreeWidgetItem *item = getAnyItemById(clipId);
if (item)
slotRefreshClipThumbnail(item, update);
- else
+ else {
slotProcessNextThumbnail();
+ }
}
void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
}
if (update)
emit projectModified();
-
slotProcessNextThumbnail();
}
}
{
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);
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;
}
- if (item->referencedClip()->getProperty("proxy").isEmpty()) setProxyStatus(item, 0);
- 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 ((size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize) && (((t == AV || t == VIDEO || t == PLAYLIST) && generateProxy()) || (t == IMAGE && generateImageProxy()))) {
+ 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 <QString, QString> newProps;
+ newProps.insert("proxy", proxyPath.path());
+ // insert required duration for proxy
+ if (t != IMAGE) newProps.insert("proxy_out", clip->producerProperty("out"));
+ QMap <QString, QString> 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())
if (m_listView->isEnabled() && replace) {
// update clip in clip monitor
emit clipSelected(NULL);
- emit clipSelected(item->referencedClip());
+ emit clipSelected(clip);
//TODO: Make sure the line below has no side effect
toReload = clipId;
}
return profileUpdated;
}
+QString ProjectList::getDocumentProperty(const QString &key) const
+{
+ return m_doc->getDocumentProperty(key);
+}
+
bool ProjectList::useProxy() const
{
return m_doc->getDocumentProperty("enableproxy").toInt();
}
-QString ProjectList::proxyParams() const
+bool ProjectList::generateProxy() const
{
- return m_doc->getDocumentProperty("proxyparams").simplified();
+ 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)
m_deleteButton->defaultAction()->setEnabled(true);
m_reloadAction->setEnabled(true);
m_transcodeAction->setEnabled(true);
- m_proxyAction->setEnabled(true);
+ m_proxyAction->setEnabled(useProxy());
if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
m_openAction->setEnabled(true);
}
item = static_cast<ProjectItem *>(*it);
if (item && item->referencedClip() != NULL) {
- QString proxy = item->referencedClip()->getProperty("proxy");
- if (!proxy.isEmpty()) list.insert(proxy, item->clipUrl().path());
+ if (item->hasProxy()) {
+ QString proxy = item->referencedClip()->getProperty("proxy");
+ list.insert(proxy, item->clipUrl().path());
+ }
}
++it;
}
return list;
}
+void ProjectList::slotCreateProxy(const QString id, bool createProducer)
+{
+ ProjectItem *item = getItemById(id);
+ if (!item || item->isProxyRunning()) return;
+
+ // If proxy producer already exists, skip creation
+ if (!createProducer) {
+ setProxyStatus(id, PROXYDONE);
+ return;
+ }
+ setProxyStatus(id, PROXYWAITING);
+ if (m_abortProxyId.contains(id)) m_abortProxyId.removeAll(id);
+ emit projectModified();
+ QtConcurrent::run(this, &ProjectList::slotGenerateProxy, id);
+}
+
+void ProjectList::slotAbortProxy(const QString id)
+{
+ if (m_proxyList.contains(id)) m_proxyList.removeAll(id);
+ ProjectItem *item = getItemById(id);
+ if (item) {
+ emit projectModified();
+ if (item->isProxyReady()) slotGotProxy(id);
+ else if (item->isProxyRunning()) m_abortProxyId << id;
+ setProxyStatus(id, NOPROXY);
+ }
+}
+
+void ProjectList::slotGenerateProxy(const QString id)
+{
+ setProxyStatus(id, CREATINGPROXY);
+ ProjectItem *item = getItemById(id);
+ if (item == NULL) return;
+ QString path = item->referencedClip()->getProperty("proxy");
+ if (path.isEmpty()) {
+ setProxyStatus(id, PROXYCRASHED);
+ return;
+ }
+
+ 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;
+ }
+ file.close();
+ QFile::remove(path);
+ }
+
+ QString url = item->clipUrl().path();
+
+ // Special case: playlist clips (.mlt or .kdenlive project files)
+ if (item->clipType() == PLAYLIST) {
+ // change FFmpeg params to MLT format
+ QStringList parameters;
+ parameters << url;
+ parameters << "-consumer" << "avformat:" + path;
+ 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;
+ }
+
+ // currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy
+ double display_ratio = KdenliveDoc::getDisplayRatio(url);
+ parameters << "aspect=" + QString::number(display_ratio);
+
+ //kDebug()<<"TRANSCOD: "<<parameters;
+ QProcess myProcess;
+ myProcess.start(KdenliveSettings::rendererpath(), parameters);
+ myProcess.waitForStarted();
+ int result = -1;
+ while (myProcess.state() != QProcess::NotRunning) {
+ // building proxy file
+ if (m_abortProxyId.contains(id)) {
+ myProcess.close();
+ myProcess.waitForFinished();
+ m_abortProxyId.removeAll(id);
+ QFile::remove(path);
+ setProxyStatus(id, NOPROXY);
+ result = -2;
+
+ }
+ myProcess.waitForFinished(500);
+ }
+ myProcess.waitForFinished();
+ if (result == -1) result = myProcess.exitStatus();
+ if (result == 0) {
+ // proxy successfully created
+ setProxyStatus(id, PROXYDONE);
+ slotGotProxy(id);
+ }
+ else if (result == 1) {
+ // Proxy process crashed
+ QFile::remove(path);
+ setProxyStatus(id, PROXYCRASHED);
+ }
+
+ }
+
+ if (item->clipType() == IMAGE) {
+ // Image proxy
+ QImage i(url);
+ if (i.isNull()) {
+ // Cannot load image
+ setProxyStatus(id, PROXYCRASHED);
+ return;
+ }
+ QImage proxy;
+ // Images are scaled to profile size.
+ //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;
+ 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(path);
+ }
+ else proxy.save(path);
+ setProxyStatus(id, PROXYDONE);
+ slotGotProxy(id);
+ return;
+ }
+
+ QStringList parameters;
+ parameters << "-i" << url;
+ 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;
+ QProcess myProcess;
+ myProcess.start("ffmpeg", parameters);
+ myProcess.waitForStarted();
+ int result = -1;
+ while (myProcess.state() != QProcess::NotRunning) {
+ // building proxy file
+ if (m_abortProxyId.contains(id)) {
+ myProcess.close();
+ myProcess.waitForFinished();
+ m_abortProxyId.removeAll(id);
+ QFile::remove(path);
+ setProxyStatus(id, NOPROXY);
+ result = -2;
+
+ }
+ myProcess.waitForFinished(500);
+ }
+ myProcess.waitForFinished();
+ if (result == -1) result = myProcess.exitStatus();
+ if (result == 0) {
+ // proxy successfully created
+ setProxyStatus(id, PROXYDONE);
+ slotGotProxy(id);
+ }
+ else if (result == 1) {
+ // Proxy process crashed
+ QFile::remove(path);
+ setProxyStatus(id, PROXYCRASHED);
+ }
+}
+
void ProjectList::updateProxyConfig()
{
ProjectItem *item;
QTreeWidgetItemIterator it(m_listView);
+ QUndoCommand *command = new QUndoCommand();
+ command->setText(i18n("Update proxy settings"));
+ QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/";
while (*it) {
if ((*it)->type() != PROJECTCLIPTYPE) {
++it;
}
CLIPTYPE t = item->clipType();
if ((t == VIDEO || t == AV || t == UNKNOWN) && item->referencedClip() != NULL) {
- if (useProxy()) {
+ 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 <QString, QString> oldProps = clip->properties();
+ oldProps.insert("proxy", QString());
+ QMap <QString, QString> 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 <QString, QString> 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();
- connect(clip, SIGNAL(proxyReady(const QString &, bool)), this, SLOT(slotGotProxy(const QString &, bool)));
- setProxyStatus(item, 1);
- clip->generateProxy(m_doc->projectFolder(), proxyParams());
+ 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 <QString, QString> oldProps = clip->properties();
+ oldProps.insert("proxy", QString());
+ QMap <QString, QString> newProps;
+ newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + ".png");
+ new EditClipCommand(this, clip->getId(), oldProps, newProps, true, command);
+ }
+ }
}
- else if (!item->referencedClip()->getProperty("proxy").isEmpty()) {
+ else if (item->hasProxy()) {
// remove proxy
- item->referencedClip()->clearProperty("proxy");
- QDomElement e = item->toXml().cloneNode().toElement();
- e.removeAttribute("file_hash");
- e.setAttribute("replace", 1);
- m_infoQueue.insert(item->clipId(), e);
+ QMap <QString, QString> 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);
}
{
QList<QTreeWidgetItem *> 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 <QString, QString> newProps;
+ QMap <QString, QString> oldProps;
+ if (!doProxy) newProps.insert("proxy", "-");
for (int i = 0; i < list.count(); i++) {
listItem = list.at(i);
if (listItem->type() == PROJECTFOLDERTYPE) {
if (listItem->type() == PROJECTCLIPTYPE) {
ProjectItem *item = static_cast <ProjectItem*>(listItem);
CLIPTYPE t = item->clipType();
- if ((t == VIDEO || t == AV || t == UNKNOWN) && item->referencedClip()) {
+ if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) {
+ oldProps = item->referencedClip()->properties();
if (doProxy) {
- DocClipBase *clip = item->referencedClip();
- connect(clip, SIGNAL(proxyReady(const QString&, bool)), this, SLOT(slotGotProxy(const QString&, bool)));
- setProxyStatus(item, 1);
- clip->generateProxy(m_doc->projectFolder(), proxyParams());
- }
- else if (!item->referencedClip()->getProperty("proxy").isEmpty()) {
- // remove proxy
- if (!item->isProxyRunning()) {
- setProxyStatus(item, 0);
- QDomElement e = item->toXml().cloneNode().toElement();
- e.removeAttribute("file_hash");
- e.setAttribute("replace", 1);
- m_infoQueue.insert(item->clipId(), e);
- }
- else setProxyStatus(item, 0);
+ 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"));
+ // 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 (!m_infoQueue.isEmpty() && !m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ 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::setProxyStatus(ProjectItem *item, int status)
+void ProjectList::setProxyStatus(const QString id, PROXYSTATUS status)
{
+ ProjectItem *item = getItemById(id);
+ setProxyStatus(item, status);
+}
+
+void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status)
+{
+ if (item == NULL) return;
monitorItemEditing(false);
item->setProxyStatus(status);
monitorItemEditing(true);
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<FolderProjectItem *>(*it);
+ result.append(item->clipId());
+ }
+ ++it;
+ }
+ return result;
+}
+
#include "projectlist.moc"
projects / kdenlive / blobdiff