m_doc(NULL),
m_refreshed(false),
m_infoQueue(),
- m_thumbnailQueue()
+ m_thumbnailQueue(),
+ m_abortAllProxies(false)
{
QVBoxLayout *layout = new QVBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
ProjectList::~ProjectList()
{
+ m_abortAllProxies = true;
delete m_menu;
m_listView->blockSignals(true);
m_listView->clear();
kDebug() << "/// Cannot find clip to delete";
return;
}
+ if (item->isProxyRunning()) m_abortProxy.append(item->referencedClip()->getProperty("proxy"));
m_listView->blockSignals(true);
QTreeWidgetItem *newSelectedItem = m_listView->itemAbove(item);
if (!newSelectedItem)
newSelectedItem = m_listView->itemBelow(item);
delete item;
+ // Pause playing to prevent crash while deleting clip
+ slotPauseMonitor();
m_doc->clipManager()->deleteClip(clipId);
m_listView->blockSignals(false);
if (newSelectedItem) {
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)));
+ 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_mutex.lock();
m_infoQueue.insert(clip->getId(), e);
+ m_mutex.unlock();
}
else if (item->hasProxy() && !item->isProxyRunning()) {
slotCreateProxy(clip->getId());
updateButtons();
}
- if (getProperties && m_processingClips.isEmpty())
- m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ //if (getProperties && m_processingClips.isEmpty())
+ //m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ if (getProperties)
+ QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
void ProjectList::slotGotProxy(const QString &proxyPath)
{
- if (proxyPath.isEmpty()) return;
+ if (proxyPath.isEmpty() || !m_refreshed || m_abortAllProxies) return;
QTreeWidgetItemIterator it(m_listView);
ProjectItem *item;
void ProjectList::slotGotProxy(ProjectItem *item)
{
- if (item == NULL) return;
+ if (item == NULL || !m_refreshed) return;
DocClipBase *clip = item->referencedClip();
// Proxy clip successfully created
QDomElement e = clip->toXML().cloneNode().toElement();
}
}
e.setAttribute("replace", 1);
+ m_mutex.lock();
m_infoQueue.insert(clip->getId(), e);
- if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ m_mutex.unlock();
+ //if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
void ProjectList::slotResetProjectList()
{
+ m_abortAllProxies = true;
+ m_proxyThreads.waitForFinished();
+ m_proxyThreads.clearFutures();
m_listView->clear();
emit clipSelected(NULL);
m_thumbnailQueue.clear();
m_infoQueue.clear();
m_refreshed = false;
-}
-
-void ProjectList::requestClipInfo(const QDomElement xml, const QString id)
-{
- m_infoQueue.insert(id, xml);
- //if (m_infoQueue.count() == 1 || ) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
+ m_abortAllProxies = false;
}
void ProjectList::slotProcessNextClipInQueue()
emit processNextThumbnail();
return;
}
-
+ QMutexLocker locker(&m_mutex);
QMap<QString, QDomElement>::const_iterator j = m_infoQueue.constBegin();
if (j != m_infoQueue.constEnd()) {
QDomElement dom = j.value().cloneNode().toElement();
const QString id = j.key();
m_infoQueue.remove(id);
m_processingClips.append(id);
+ locker.unlock();
bool replace;
if (dom.hasAttribute("replace")) {
// Proxy action was enabled / disabled and we want to replace current producer
QPainter p(&missingPixmap);
p.drawPixmap(3, 3, icon.pixmap(width - 6, height - 6));
p.end();
-
+ kDebug()<<"//////////////7 UPDATE ALL CLPS";
while (*it) {
if ((*it)->type() == PROJECTSUBCLIPTYPE) {
// subitem
xml.removeAttribute("file_hash");
xml.removeAttribute("proxy_out");
}
- requestClipInfo(xml, clip->getId());
+ m_mutex.lock();
+ m_infoQueue.insert(clip->getId(), xml);
+ m_mutex.unlock();
+ QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
else {
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
++it;
}
- if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ //if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ //QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ /*while (!m_infoQueue.isEmpty()) {
+ QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ }*/
+
if (m_listView->isEnabled())
monitorItemEditing(true);
m_listView->setSortingEnabled(true);
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 (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
if (item) {
const QString path = item->referencedClip()->fileURL().path();
if (item->referencedClip()->isPlaceHolder()) replace = false;
}
m_processingClips.removeAll(id);
m_thumbnailQueue.removeAll(id);
- if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ //if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
void ProjectList::slotAddColorClip()
void ProjectList::setDocument(KdenliveDoc *doc)
{
m_listView->blockSignals(true);
+ m_abortAllProxies = true;
+ m_proxyThreads.waitForFinished();
+ m_proxyThreads.clearFutures();
m_listView->clear();
m_processingClips.clear();
m_listView->setSortingEnabled(false);
m_timecode = doc->timecode();
m_commandStack = doc->commandStack();
m_doc = doc;
+ m_abortAllProxies = false;
QMap <QString, QString> flist = doc->clipManager()->documentFolderList();
QStringList openedFolders = doc->getExpandedFolders();
}
QList <DocClipBase*> list = doc->clipManager()->documentClipList();
+ if (list.isEmpty()) m_refreshed = true;
for (int i = 0; i < list.count(); i++)
slotAddClip(list.at(i), false);
void ProjectList::slotCheckForEmptyQueue()
{
- if (!m_refreshed && m_processingClips.isEmpty() && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) {
- m_refreshed = true;
- emit loadingIsOver();
- emit displayMessage(QString(), -1);
+ if (m_processingClips.isEmpty() && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) {
+ if (!m_refreshed) {
+ emit loadingIsOver();
+ emit displayMessage(QString(), -1);
+ m_refreshed = true;
+ }
m_listView->blockSignals(false);
m_listView->setEnabled(true);
updateButtons();
}
QPixmap pix;
int height = m_listView->iconSize().height();
- int width = (int)(height * m_render->dar());
+ int swidth = (int)(height * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5);
+ int dwidth = (int)(height * m_render->dar() + 0.5);
if (clip->clipType() == AUDIO)
- pix = KIcon("audio-x-generic").pixmap(QSize(width, height));
+ pix = KIcon("audio-x-generic").pixmap(QSize(dwidth, height));
else if (clip->clipType() == IMAGE)
- pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->producer(), 0, width, height));
+ pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->producer(), 0, swidth, dwidth, height));
else
- pix = item->referencedClip()->extractImage(frame, width, height);
+ pix = item->referencedClip()->extractImage(frame, dwidth, height);
if (!pix.isNull()) {
monitorItemEditing(false);
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
toReload = clipId;
}
+ clip->setProducer(producer, replace);
+ clip->askForAudioThumbs();
// Proxy stuff
QString size = properties.value("frame_size");
if (!useProxy() && clip->getProperty("proxy").isEmpty()) setProxyStatus(item, NOPROXY);
}
}
}
- clip->setProducer(producer, replace);
- clip->askForAudioThumbs();
if (!replace && item->data(0, Qt::DecorationRole).isNull())
requestClipThumbnail(clipId);
monitorItemEditing(true);
} else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS...";
if (selectClip && m_infoQueue.isEmpty()) {
- if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty()) {
+ if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty() && m_processingClips.isEmpty()) {
m_listView->setCurrentItem(item);
bool updatedProfile = false;
if (item->parent()) {
// this is the first clip loaded in project, check if we want to adjust project settings to the clip
updatedProfile = adjustProjectProfileToItem(item);
}
- if (updatedProfile == false) emit clipSelected(item->referencedClip());
+ if (updatedProfile == false) {
+ emit clipSelected(item->referencedClip());
+ }
} else {
int max = m_doc->clipManager()->clipsCount();
emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max));
if (!toReload.isEmpty())
emit clipNeedsReload(toReload, true);
- if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ //if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)
return;
}
m_processingProxy.append(path);
- QtConcurrent::run(this, &ProjectList::slotGenerateProxy, path, item->clipUrl().path(), item->clipType(), QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt());
+
+ PROXYINFO info;
+ info.dest = path;
+ info.src = item->clipUrl().path();
+ info.type = item->clipType();
+ info.exif = QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt();
+ m_proxyList.append(info);
+ m_proxyThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotGenerateProxy));
}
void ProjectList::slotAbortProxy(const QString id, const QString path)
}
}
-void ProjectList::slotGenerateProxy(const QString destPath, const QString sourcePath, int clipType, int exif_orientation)
+void ProjectList::slotGenerateProxy()
{
+ if (m_proxyList.isEmpty() || m_abortAllProxies) return;
emit projectModified();
+ PROXYINFO info = m_proxyList.takeFirst();
+ if (m_abortProxy.contains(info.dest)) {
+ m_abortProxy.removeAll(info.dest);
+ return;
+ }
+
// Make sure proxy path is writable
- QFile file(destPath);
- if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
- setProxyStatus(destPath, PROXYCRASHED);
+ QFile file(info.dest);
+ if (!file.open(QIODevice::WriteOnly)) {
+ setProxyStatus(info.dest, PROXYCRASHED);
+ m_processingProxy.removeAll(info.dest);
return;
}
file.close();
- QFile::remove(destPath);
+ QFile::remove(info.dest);
- setProxyStatus(destPath, CREATINGPROXY);
+ setProxyStatus(info.dest, CREATINGPROXY);
// Special case: playlist clips (.mlt or .kdenlive project files)
- if (clipType == PLAYLIST) {
+ if (info.type == PLAYLIST) {
// change FFmpeg params to MLT format
QStringList parameters;
- parameters << sourcePath;
- parameters << "-consumer" << "avformat:" + destPath;
+ parameters << info.src;
+ parameters << "-consumer" << "avformat:" + info.dest;
QStringList params = m_doc->getDocumentProperty("proxyparams").simplified().split('-', QString::SkipEmptyParts);
foreach(QString s, params) {
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);
+ double display_ratio = KdenliveDoc::getDisplayRatio(info.src);
parameters << "aspect=" + QString::number(display_ratio);
//kDebug()<<"TRANSCOD: "<<parameters;
int result = -1;
while (myProcess.state() != QProcess::NotRunning) {
// building proxy file
- if (m_abortProxy.contains(destPath)) {
+ if (m_abortProxy.contains(info.dest) || m_abortAllProxies) {
myProcess.close();
myProcess.waitForFinished();
- m_abortProxy.removeAll(destPath);
- m_processingProxy.removeAll(destPath);
- QFile::remove(destPath);
- setProxyStatus(destPath, NOPROXY);
+ QFile::remove(info.dest);
+ m_abortProxy.removeAll(info.dest);
+ m_processingProxy.removeAll(info.dest);
+ setProxyStatus(info.dest, NOPROXY);
result = -2;
}
myProcess.waitForFinished(500);
}
myProcess.waitForFinished();
- m_processingProxy.removeAll(destPath);
+ m_processingProxy.removeAll(info.dest);
if (result == -1) result = myProcess.exitStatus();
if (result == 0) {
// proxy successfully created
- setProxyStatus(destPath, PROXYDONE);
- slotGotProxy(destPath);
+ setProxyStatus(info.dest, PROXYDONE);
+ slotGotProxy(info.dest);
}
else if (result == 1) {
// Proxy process crashed
- QFile::remove(destPath);
- setProxyStatus(destPath, PROXYCRASHED);
+ QFile::remove(info.dest);
+ setProxyStatus(info.dest, PROXYCRASHED);
}
}
- if (clipType == IMAGE) {
+ if (info.type == IMAGE) {
// Image proxy
- QImage i(sourcePath);
+ QImage i(info.src);
if (i.isNull()) {
// Cannot load image
- setProxyStatus(destPath, PROXYCRASHED);
+ setProxyStatus(info.dest, PROXYCRASHED);
return;
}
QImage proxy;
//TODO: Make it be configurable?
if (i.width() > i.height()) proxy = i.scaledToWidth(m_render->frameRenderWidth());
else proxy = i.scaledToHeight(m_render->renderHeight());
- if (exif_orientation > 1) {
+ if (info.exif > 1) {
// Rotate image according to exif data
QImage processed;
QMatrix matrix;
- switch ( exif_orientation ) {
+ switch ( info.exif ) {
case 2:
matrix.scale( -1, 1 );
break;
break;
}
processed = proxy.transformed( matrix );
- processed.save(destPath);
+ processed.save(info.dest);
}
- else proxy.save(destPath);
- setProxyStatus(destPath, PROXYDONE);
- slotGotProxy(destPath);
- m_abortProxy.removeAll(destPath);
- m_processingProxy.removeAll(destPath);
+ else proxy.save(info.dest);
+ setProxyStatus(info.dest, PROXYDONE);
+ slotGotProxy(info.dest);
+ m_abortProxy.removeAll(info.dest);
+ m_processingProxy.removeAll(info.dest);
return;
}
QStringList parameters;
- parameters << "-i" << sourcePath;
+ parameters << "-i" << info.src;
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;
+ parameters << info.dest;
kDebug()<<"// STARTING PROXY GEN: "<<parameters;
QProcess myProcess;
myProcess.start("ffmpeg", parameters);
int result = -1;
while (myProcess.state() != QProcess::NotRunning) {
// building proxy file
- if (m_abortProxy.contains(destPath)) {
+ if (m_abortProxy.contains(info.dest) || m_abortAllProxies) {
myProcess.close();
myProcess.waitForFinished();
- m_abortProxy.removeAll(destPath);
- m_processingProxy.removeAll(destPath);
- QFile::remove(destPath);
- setProxyStatus(destPath, NOPROXY);
+ m_abortProxy.removeAll(info.dest);
+ m_processingProxy.removeAll(info.dest);
+ QFile::remove(info.dest);
+ setProxyStatus(info.dest, NOPROXY);
result = -2;
}
if (result == -1) result = myProcess.exitStatus();
if (result == 0) {
// proxy successfully created
- setProxyStatus(destPath, PROXYDONE);
- slotGotProxy(destPath);
+ setProxyStatus(info.dest, PROXYDONE);
+ slotGotProxy(info.dest);
}
else if (result == 1) {
// Proxy process crashed
- QFile::remove(destPath);
- setProxyStatus(destPath, PROXYCRASHED);
+ QFile::remove(info.dest);
+ setProxyStatus(info.dest, PROXYCRASHED);
}
- m_abortProxy.removeAll(destPath);
- m_processingProxy.removeAll(destPath);
+ m_abortProxy.removeAll(info.dest);
+ m_processingProxy.removeAll(info.dest);
}
void ProjectList::updateProxyConfig()
}
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);
+ //if (!m_infoQueue.isEmpty() && !m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
void ProjectList::slotProxyCurrentItem(bool doProxy)
}
else delete command;
//if (!m_infoQueue.isEmpty() && !m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
+ if (!m_infoQueue.isEmpty()) QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue);
}
void ProjectList::setProxyStatus(const QString proxyPath, PROXYSTATUS status)
{
- if (proxyPath.isEmpty()) return;
+ if (proxyPath.isEmpty() || m_abortAllProxies) return;
QTreeWidgetItemIterator it(m_listView);
ProjectItem *item;
while (*it) {