#include "clipmanager.h"
-#include "addclipcommand.h"
+#include "commands/addclipcommand.h"
#include "kdenlivesettings.h"
#include "docclipbase.h"
#include "kdenlivedoc.h"
#include "abstractclipitem.h"
#include "abstractgroupitem.h"
+#include "titledocument.h"
+#include "kthumb.h"
#include <mlt++/Mlt.h>
#include <KDebug>
+#include <KMessageBox>
#include <KFileDialog>
+#include <KApplication>
#include <kio/netaccess.h>
#include <QGraphicsItemGroup>
+#include <QtConcurrentRun>
+
+#include <KFileMetaInfo>
ClipManager::ClipManager(KdenliveDoc *doc) :
- QObject(),
- m_audioThumbsQueue(),
- m_doc(doc),
- m_audioThumbsEnabled(false),
- m_generatingAudioId()
+ QObject(),
+ m_audioThumbsQueue(),
+ m_doc(doc),
+ m_abortThumb(false),
+ m_closing(false),
+ m_abortAudioThumb(false)
{
m_clipIdCounter = 1;
m_folderIdCounter = 1;
+ m_modifiedTimer.setInterval(1500);
connect(&m_fileWatcher, SIGNAL(dirty(const QString &)), this, SLOT(slotClipModified(const QString &)));
+ connect(&m_fileWatcher, SIGNAL(deleted(const QString &)), this, SLOT(slotClipMissing(const QString &)));
+ connect(&m_fileWatcher, SIGNAL(created(const QString &)), this, SLOT(slotClipAvailable(const QString &)));
+ connect(&m_modifiedTimer, SIGNAL(timeout()), this, SLOT(slotProcessModifiedClips()));
+
+#if KDE_IS_VERSION(4,5,0)
+ KImageCache::deleteCache("kdenlive-thumbs");
+ pixmapCache = new KImageCache("kdenlive-thumbs", 1000000);
+ pixmapCache->setEvictionPolicy(KSharedDataCache::EvictOldest);
+#endif
}
ClipManager::~ClipManager()
{
- kDebug() << "\n\n 2222222222222222222222222 CLOSE CM 22222222222";
+ m_closing = true;
+ m_abortThumb = true;
+ m_abortAudioThumb = true;
+ m_thumbsThread.waitForFinished();
+ m_audioThumbsThread.waitForFinished();
+ m_thumbsMutex.lock();
+ m_requestedThumbs.clear();
+ m_audioThumbsQueue.clear();
+ m_thumbsMutex.unlock();
+
qDeleteAll(m_clipList);
+ m_clipList.clear();
+#if KDE_IS_VERSION(4,5,0)
+ delete pixmapCache;
+#endif
}
void ClipManager::clear()
{
+ m_abortThumb = true;
+ m_abortAudioThumb = true;
+ m_thumbsThread.waitForFinished();
+ m_audioThumbsThread.waitForFinished();
+ m_thumbsMutex.lock();
+ m_requestedThumbs.clear();
+ m_audioThumbsQueue.clear();
+ m_thumbsMutex.unlock();
+ m_abortThumb = false;
+ m_abortAudioThumb = false;
+ m_folderList.clear();
+ m_modifiedClips.clear();
qDeleteAll(m_clipList);
m_clipList.clear();
m_clipIdCounter = 1;
m_folderIdCounter = 1;
- m_folderList.clear();
- m_audioThumbsQueue.clear();
+#if KDE_IS_VERSION(4,5,0)
+ pixmapCache->clear();
+#endif
}
-void ClipManager::checkAudioThumbs()
+void ClipManager::clearCache()
{
- if (m_audioThumbsEnabled == KdenliveSettings::audiothumbnails()) return;
- m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
- for (int i = 0; i < m_clipList.count(); i++) {
- if (m_audioThumbsEnabled) m_audioThumbsQueue.append(m_clipList.at(i)->getId());
- else m_clipList.at(i)->slotClearAudioCache();
+#if KDE_IS_VERSION(4,5,0)
+ pixmapCache->clear();
+#endif
+}
+
+void ClipManager::requestThumbs(const QString id, QList <int> frames)
+{
+ m_thumbsMutex.lock();
+ foreach (int frame, frames) {
+ m_requestedThumbs.insertMulti(id, frame);
}
- if (m_audioThumbsEnabled) {
- if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
- } else {
- m_audioThumbsQueue.clear();
- m_generatingAudioId.clear();
+ m_thumbsMutex.unlock();
+ if (!m_thumbsThread.isRunning() && !m_abortThumb) {
+ m_thumbsThread = QtConcurrent::run(this, &ClipManager::slotGetThumbs);
}
}
-void ClipManager::askForAudioThumb(const QString &id)
+void ClipManager::stopThumbs(const QString &id)
{
- DocClipBase *clip = getClipById(id);
- if (clip && KdenliveSettings::audiothumbnails()) {
- m_audioThumbsQueue.append(id);
- if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
+ if (m_closing || (m_requestedThumbs.isEmpty() && m_processingThumbId != id && m_audioThumbsQueue.isEmpty() && m_processingAudioThumbId != id)) return;
+ // Abort video thumbs for this clip
+ m_abortThumb = true;
+ m_thumbsThread.waitForFinished();
+ m_thumbsMutex.lock();
+ m_requestedThumbs.remove(id);
+ m_audioThumbsQueue.removeAll(id);
+ m_thumbsMutex.unlock();
+ m_abortThumb = false;
+
+ // Abort audio thumbs for this clip
+ if (m_processingAudioThumbId == id) {
+ m_abortAudioThumb = true;
+ m_audioThumbsThread.waitForFinished();
+ m_abortAudioThumb = false;
+ }
+
+ if (!m_thumbsThread.isRunning() && !m_requestedThumbs.isEmpty()) {
+ m_thumbsThread = QtConcurrent::run(this, &ClipManager::slotGetThumbs);
+ }
+
+ if (!m_audioThumbsThread.isRunning() && !m_audioThumbsQueue.isEmpty()) {
+ m_audioThumbsThread = QtConcurrent::run(this, &ClipManager::slotGetAudioThumbs);
}
}
-void ClipManager::startAudioThumbsGeneration()
+void ClipManager::slotGetThumbs()
+{
+ QMap<QString, int>::const_iterator i;
+ int max;
+ int done = 0;
+ while (!m_requestedThumbs.isEmpty() && !m_abortThumb) {
+ m_thumbsMutex.lock();
+ i = m_requestedThumbs.constBegin();
+ m_processingThumbId = i.key();
+ QList<int> values = m_requestedThumbs.values(m_processingThumbId);
+ m_requestedThumbs.remove(m_processingThumbId);
+ m_thumbsMutex.unlock();
+ qSort(values);
+ DocClipBase *clip = getClipById(m_processingThumbId);
+ if (!clip) continue;
+ max = m_requestedThumbs.size() + values.count();
+ while (!values.isEmpty() && clip->thumbProducer() && !m_abortThumb) {
+ clip->thumbProducer()->getThumb(values.takeFirst());
+ done++;
+ if (max > 3) emit displayMessage(i18n("Loading thumbnails"), 100 * done / max);
+ }
+ }
+ m_processingThumbId.clear();
+ emit displayMessage(QString(), -1);
+}
+
+void ClipManager::checkAudioThumbs()
{
if (!KdenliveSettings::audiothumbnails()) {
- m_audioThumbsQueue.clear();
- m_generatingAudioId.clear();
+ if (m_audioThumbsThread.isRunning()) {
+ m_abortAudioThumb = true;
+ m_thumbsMutex.lock();
+ m_audioThumbsQueue.clear();
+ m_thumbsMutex.unlock();
+ m_audioThumbsThread.waitForFinished();
+ m_abortAudioThumb = false;
+ }
return;
}
- if (!m_audioThumbsQueue.isEmpty()) {
- m_generatingAudioId = m_audioThumbsQueue.takeFirst();
- DocClipBase *clip = getClipById(m_generatingAudioId);
- if (!clip || !clip->slotGetAudioThumbs())
- endAudioThumbsGeneration(m_generatingAudioId);
- } else {
- m_generatingAudioId.clear();
+
+ m_thumbsMutex.lock();
+ for (int i = 0; i < m_clipList.count(); i++) {
+ DocClipBase *clip = m_clipList.at(i);
+ if (clip->hasAudioThumb() && !clip->audioThumbCreated())
+ m_audioThumbsQueue.append(m_clipList.at(i)->getId());
+ }
+ m_thumbsMutex.unlock();
+ if (!m_audioThumbsThread.isRunning() && !m_audioThumbsQueue.isEmpty()) {
+ m_audioThumbsThread = QtConcurrent::run(this, &ClipManager::slotGetAudioThumbs);
}
}
-void ClipManager::endAudioThumbsGeneration(const QString &requestedId)
+void ClipManager::askForAudioThumb(const QString &id)
{
- if (!KdenliveSettings::audiothumbnails()) {
- m_audioThumbsQueue.clear();
- m_generatingAudioId.clear();
- return;
+ DocClipBase *clip = getClipById(id);
+ if (clip && KdenliveSettings::audiothumbnails() && (clip->hasAudioThumb())) {
+ m_thumbsMutex.lock();
+ if (!m_audioThumbsQueue.contains(id)) m_audioThumbsQueue.append(id);
+ m_thumbsMutex.unlock();
+ if (!m_audioThumbsThread.isRunning()) m_audioThumbsThread = QtConcurrent::run(this, &ClipManager::slotGetAudioThumbs);
}
- if (!m_audioThumbsQueue.isEmpty()) {
- if (m_generatingAudioId == requestedId) {
- startAudioThumbsGeneration();
+}
+
+void ClipManager::slotGetAudioThumbs()
+{
+ Mlt::Profile prof((char*) KdenliveSettings::current_profile().toUtf8().constData());
+ mlt_audio_format audioFormat = mlt_audio_pcm;
+ while (!m_abortAudioThumb && !m_audioThumbsQueue.isEmpty()) {
+ m_thumbsMutex.lock();
+ m_processingAudioThumbId = m_audioThumbsQueue.takeFirst();
+ m_thumbsMutex.unlock();
+ DocClipBase *clip = getClipById(m_processingAudioThumbId);
+ if (!clip || clip->audioThumbCreated()) continue;
+ KUrl url = clip->fileURL();
+ QString hash = clip->getClipHash();
+ if (hash.isEmpty()) continue;
+ QString audioPath = projectFolder() + "/thumbs/" + hash + ".thumb";
+ double lengthInFrames = clip->duration().frames(m_doc->fps());
+ //FIXME: should this be hardcoded??
+ int channels = 2;
+ int frequency = 48000;
+ int arrayWidth = 20;
+ double frame = 0.0;
+ audioByteArray storeIn;
+ QFile f(audioPath);
+ if (QFileInfo(audioPath).size() > 0 && f.open(QIODevice::ReadOnly)) {
+ const QByteArray channelarray = f.readAll();
+ f.close();
+ if (channelarray.size() != arrayWidth*(frame + lengthInFrames) * channels) {
+ kDebug() << "--- BROKEN THUMB FOR: " << url.fileName() << " ---------------------- ";
+ f.remove();
+ continue;
+ }
+ kDebug() << "reading audio thumbs from file";
+
+ int h1 = arrayWidth * channels;
+ int h2 = (int) frame * h1;
+ int h3;
+ for (int z = (int) frame; z < (int)(frame + lengthInFrames) && !m_abortAudioThumb; z++) {
+ h3 = 0;
+ for (int c = 0; c < channels; c++) {
+ QByteArray audioArray(arrayWidth, '\x00');
+ for (int i = 0; i < arrayWidth; i++) {
+ audioArray[i] = channelarray.at(h2 + h3 + i);
+ }
+ h3 += arrayWidth;
+ storeIn[z][c] = audioArray;
+ }
+ h2 += h1;
+ }
+ if (!m_abortAudioThumb) clip->updateAudioThumbnail(storeIn);
+ continue;
+ }
+
+ if (!f.open(QIODevice::WriteOnly)) {
+ kDebug() << "++++++++ ERROR WRITING TO FILE: " << audioPath;
+ kDebug() << "++++++++ DISABLING AUDIO THUMBS";
+ m_thumbsMutex.lock();
+ m_audioThumbsQueue.clear();
+ m_thumbsMutex.unlock();
+ KdenliveSettings::setAudiothumbnails(false);
+ break;
+ }
+
+ Mlt::Producer producer(prof, url.path().toUtf8().constData());
+ if (!producer.is_valid()) {
+ kDebug() << "++++++++ INVALID CLIP: " << url.path();
+ continue;
+ }
+
+ producer.set("video_index", "-1");
+
+ if (KdenliveSettings::normaliseaudiothumbs()) {
+ Mlt::Filter m_convert(prof, "volume");
+ m_convert.set("gain", "normalise");
+ producer.attach(m_convert);
+ }
+
+ int last_val = 0;
+ int val = 0;
+ double framesPerSecond = mlt_producer_get_fps(producer.get_producer());
+ Mlt::Frame *mlt_frame;
+
+ for (int z = (int) frame; z < (int)(frame + lengthInFrames) && producer.is_valid() && !m_abortAudioThumb; z++) {
+ val = (int)((z - frame) / (frame + lengthInFrames) * 100.0);
+ if (last_val != val && val > 1) {
+ setThumbsProgress(i18n("Creating audio thumbnail for %1", url.fileName()), val);
+ last_val = val;
+ }
+ producer.seek(z);
+ mlt_frame = producer.get_frame();
+ if (mlt_frame && mlt_frame->is_valid()) {
+ int samples = mlt_sample_calculator(framesPerSecond, frequency, mlt_frame_get_position(mlt_frame->get_frame()));
+ qint16* pcm = static_cast<qint16*>(mlt_frame->get_audio(audioFormat, frequency, channels, samples));
+ for (int c = 0; c < channels; c++) {
+ QByteArray audioArray;
+ audioArray.resize(arrayWidth);
+ for (int i = 0; i < audioArray.size(); i++) {
+ audioArray[i] = ((*(pcm + c + i * samples / audioArray.size())) >> 9) + 127 / 2 ;
+ }
+ f.write(audioArray);
+ storeIn[z][c] = audioArray;
+ }
+ } else {
+ f.write(QByteArray(arrayWidth, '\x00'));
+ }
+ delete mlt_frame;
+ }
+ f.close();
+ setThumbsProgress(i18n("Creating audio thumbnail for %1", url.fileName()), -1);
+ if (m_abortAudioThumb) {
+ f.remove();
+ } else {
+ clip->updateAudioThumbnail(storeIn);
}
- } else {
- m_generatingAudioId.clear();
}
+ m_processingAudioThumbId.clear();
}
void ClipManager::setThumbsProgress(const QString &message, int progress)
void ClipManager::addClip(DocClipBase *clip)
{
m_clipList.append(clip);
- if (clip->clipType() == IMAGE || clip->clipType() == AUDIO) {
+ if (clip->clipType() != COLOR && clip->clipType() != SLIDESHOW && !clip->fileURL().isEmpty()) {
// listen for file change
+ //kDebug() << "// LISTEN FOR: " << clip->fileURL().path();
m_fileWatcher.addFile(clip->fileURL().path());
}
const QString id = clip->getId();
if (!gid.isEmpty() && gid.toInt() >= m_folderIdCounter) m_folderIdCounter = gid.toInt() + 1;
}
-void ClipManager::slotDeleteClip(const QString &clipId)
+void ClipManager::slotDeleteClips(QStringList ids)
{
- DocClipBase *clip = getClipById(clipId);
- if (clip) {
- AddClipCommand *command = new AddClipCommand(m_doc, clip->toXML(), clipId, false);
- m_doc->commandStack()->push(command);
+ QUndoCommand *delClips = new QUndoCommand();
+ delClips->setText(i18np("Delete clip", "Delete clips", ids.size()));
+
+ for (int i = 0; i < ids.size(); i++) {
+ DocClipBase *clip = getClipById(ids.at(i));
+ if (clip) {
+ new AddClipCommand(m_doc, clip->toXML(), ids.at(i), false, delClips);
+ }
}
+ m_doc->commandStack()->push(delClips);
}
void ClipManager::deleteClip(const QString &clipId)
{
for (int i = 0; i < m_clipList.count(); i++) {
if (m_clipList.at(i)->getId() == clipId) {
- if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO) {
+ if (m_clipList.at(i)->clipType() != COLOR && m_clipList.at(i)->clipType() != SLIDESHOW && !m_clipList.at(i)->fileURL().isEmpty()) {
+ //if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO || (m_clipList.at(i)->clipType() == TEXT && !m_clipList.at(i)->fileURL().isEmpty())) {
// listen for file change
m_fileWatcher.removeFile(m_clipList.at(i)->fileURL().path());
}
- delete m_clipList.takeAt(i);
+ DocClipBase *clip = m_clipList.takeAt(i);
+ delete clip;
+ clip = NULL;
break;
}
}
return NULL;
}
-DocClipBase *ClipManager::getClipByResource(QString resource)
+const QList <DocClipBase *> ClipManager::getClipByResource(QString resource)
{
+ QList <DocClipBase *> list;
QString clipResource;
+ QString proxyResource;
for (int i = 0; i < m_clipList.count(); i++) {
clipResource = m_clipList.at(i)->getProperty("resource");
+ proxyResource = m_clipList.at(i)->getProperty("proxy");
if (clipResource.isEmpty()) clipResource = m_clipList.at(i)->getProperty("colour");
- if (clipResource == resource) {
- return m_clipList.at(i);
+ if (clipResource == resource || proxyResource == resource) {
+ list.append(m_clipList.at(i));
}
}
- return NULL;
+ return list;
}
-void ClipManager::updatePreviewSettings()
+
+void ClipManager::clearUnusedProducers()
{
for (int i = 0; i < m_clipList.count(); i++) {
- if (m_clipList.at(i)->clipType() == AV || m_clipList.at(i)->clipType() == VIDEO) {
- if (m_clipList.at(i)->producerProperty("meta.media.0.codec.name") && strcmp(m_clipList.at(i)->producerProperty("meta.media.0.codec.name"), "h264") == 0) {
- if (KdenliveSettings::dropbframes()) {
- m_clipList[i]->setProducerProperty("skip_loop_filter", "all");
- m_clipList[i]->setProducerProperty("skip_frame", "bidir");
- } else {
- m_clipList[i]->setProducerProperty("skip_loop_filter", "");
- m_clipList[i]->setProducerProperty("skip_frame", "");
- }
- }
- }
+ if (m_clipList.at(i)->numReferences() == 0) m_clipList.at(i)->deleteProducers();
}
}
-void ClipManager::resetProducersList(QList <Mlt::Producer *> prods)
+void ClipManager::resetProducersList(const QList <Mlt::Producer *> prods, bool displayRatioChanged, bool fpsChanged)
{
for (int i = 0; i < m_clipList.count(); i++) {
- if (m_clipList.at(i)->numReferences() > 0) {
+ if (m_clipList.at(i)->numReferences() > 0 || displayRatioChanged || fpsChanged) {
m_clipList.at(i)->deleteProducers();
}
}
QString id;
+ Mlt::Producer *prod;
+ QStringList brokenClips;
for (int i = 0; i < prods.count(); i++) {
- id = prods.at(i)->get("id");
+ prod = prods.at(i);
+ id = prod->get("id");
if (id.contains('_')) id = id.section('_', 0, 0);
DocClipBase *clip = getClipById(id);
- if (clip) {
- clip->setProducer(prods.at(i));
- kDebug() << "// // // REPLACE CLIP: " << id;
+ QString markup = prod->get("markup");
+ if (prod->is_blank() || !prod->is_valid() || !markup.isEmpty()) {
+ // The clip is broken (missing proxy or source clip)
+ kDebug()<<"// WARNING, CLIP "<<id<<" Cannot be loaded";
+ brokenClips << id;
+ }
+ else if (clip) {
+ clip->setProducer(prod, false, true);
}
}
+ emit checkAllClips(displayRatioChanged, fpsChanged, brokenClips);
}
-void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId)
+void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId, const QString &comment)
{
QUndoCommand *addClips = new QUndoCommand();
- addClips->setText(i18n("Add clips"));
-
- foreach(const KUrl &file, urls) {
- if (KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
+ foreach(const KUrl & file, urls) {
+ if (QFile::exists(file.path())) {//KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
+ if (!getClipByResource(file.path()).empty()) {
+ if (KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br />already exists in project, what do you want to do?", file.path()), i18n("Clip already exists")) == KMessageBox::Cancel)
+ continue;
+ }
+ kDebug() << "Adding clip: " << file.path();
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
doc.appendChild(prod);
+ prod.setAttribute("resource", file.path());
+ uint id = m_clipIdCounter++;
+ prod.setAttribute("id", QString::number(id));
+ if (!comment.isEmpty()) prod.setAttribute("description", comment);
if (!group.isEmpty()) {
prod.setAttribute("groupname", group);
prod.setAttribute("groupid", groupId);
}
- prod.setAttribute("resource", file.path());
- uint id = m_clipIdCounter++;
- prod.setAttribute("id", QString::number(id));
KMimeType::Ptr type = KMimeType::findByUrl(file);
if (type->name().startsWith("image/")) {
prod.setAttribute("type", (int) IMAGE);
prod.setAttribute("in", 0);
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
- } else if (type->name() == "application/x-kdenlivetitle") {
+ prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()));
+ if (KdenliveSettings::autoimagetransparency()) prod.setAttribute("transparency", 1);
+ // Read EXIF metadata for JPEG
+ if (type->is("image/jpeg")) {
+ KFileMetaInfo metaInfo(file.path(), QString("image/jpeg"), KFileMetaInfo::TechnicalInfo);
+ const QHash<QString, KFileMetaInfoItem> metaInfoItems = metaInfo.items();
+ foreach(const KFileMetaInfoItem & metaInfoItem, metaInfoItems) {
+ prod.setAttribute("meta.attr." + metaInfoItem.name().section("#", 1), metaInfoItem.value().toString());
+ }
+ }
+ } else if (type->is("application/x-kdenlivetitle")) {
// opening a title file
QDomDocument txtdoc("titledocument");
QFile txtfile(file.path());
if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) {
txtfile.close();
prod.setAttribute("type", (int) TEXT);
- prod.setAttribute("resource", file.path());
- prod.setAttribute("xmldata", txtdoc.toString());
- GenTime outPos(txtdoc.documentElement().attribute("out").toDouble() / 1000.0);
+ // extract embeded images
+ QDomNodeList items = txtdoc.elementsByTagName("content");
+ for (int i = 0; i < items.count() ; i++) {
+ QDomElement content = items.item(i).toElement();
+ if (content.hasAttribute("base64")) {
+ QString titlesFolder = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
+ QString path = TitleDocument::extractBase64Image(titlesFolder, content.attribute("base64"));
+ if (!path.isEmpty()) {
+ content.setAttribute("url", path);
+ content.removeAttribute("base64");
+ }
+ }
+ }
+ QString titleData = txtdoc.toString();
+ prod.setAttribute("xmldata", titleData);
prod.setAttribute("transparency", 1);
prod.setAttribute("in", 0);
- int out = (int) outPos.frames(m_doc->fps());
- if (out > 0) prod.setAttribute("out", out);
- } else txtfile.close();
+ int out = txtdoc.documentElement().attribute("out").toInt();
+ if (out > 0)
+ prod.setAttribute("out", out);
+ else
+ prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()));
+ } else
+ txtfile.close();
}
new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true, addClips);
}
+ else kDebug()<<"// CANNOT READ FILE: "<<file;
+ }
+ if (addClips->childCount() > 0) {
+ addClips->setText(i18np("Add clip", "Add clips", addClips->childCount()));
+ m_doc->commandStack()->push(addClips);
}
- m_doc->commandStack()->push(addClips);
}
-void ClipManager::slotAddClipFile(const KUrl url, const QString group, const QString &groupId)
+void ClipManager::slotAddClipFile(const KUrl &url, const QString &group, const QString &groupId, const QString &comment)
+{
+ slotAddClipList(KUrl::List(url), group, groupId, comment);
+}
+
+void ClipManager::slotAddXmlClipFile(const QString &name, const QDomElement &xml, const QString &group, const QString &groupId)
{
- kDebug() << "///// CLIP MANAGER, ADDING CLIP: " << url;
QDomDocument doc;
- QDomElement prod = doc.createElement("producer");
- doc.appendChild(prod);
- prod.setAttribute("resource", url.path());
+ doc.appendChild(doc.importNode(xml, true));
+ QDomElement prod = doc.documentElement();
+ prod.setAttribute("type", (int) PLAYLIST);
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
+ prod.setAttribute("name", name);
if (!group.isEmpty()) {
prod.setAttribute("groupname", group);
prod.setAttribute("groupid", groupId);
}
- KMimeType::Ptr type = KMimeType::findByUrl(url);
- if (type->name().startsWith("image/")) {
- prod.setAttribute("type", (int) IMAGE);
- prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
- } else if (type->name() == "application/x-kdenlivetitle") {
- // opening a title file
- QDomDocument txtdoc("titledocument");
- QFile txtfile(url.path());
- if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) {
- txtfile.close();
- prod.setAttribute("type", (int) TEXT);
- prod.setAttribute("resource", QString());
- prod.setAttribute("xmldata", txtdoc.toString());
- GenTime outPos(txtdoc.documentElement().attribute("out").toDouble() / 1000.0);
- prod.setAttribute("transparency", 1);
- prod.setAttribute("in", 0);
- int out = (int) outPos.frames(m_doc->fps());
- if (out > 0) prod.setAttribute("out", out);
- } else txtfile.close();
- }
AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
m_doc->commandStack()->push(command);
}
-void ClipManager::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId)
+void ClipManager::slotAddColorClipFile(const QString &name, const QString &color, QString duration, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(duration) - 1);
+ prod.setAttribute("out", m_doc->getFramePos(duration));
prod.setAttribute("name", name);
if (!group.isEmpty()) {
prod.setAttribute("groupname", group);
m_doc->commandStack()->push(command);
}
-void ClipManager::slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, QString group, const QString &groupId)
+void ClipManager::slotAddSlideshowClipFile(const QString &name, const QString &path, int count, const QString &duration,
+ const bool loop, const bool crop, const bool fade,
+ const QString &luma_duration, const QString &luma_file, const int softness,
+ const QString &animation, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(duration) * count - 1);
+ prod.setAttribute("out", m_doc->getFramePos(duration) * count);
prod.setAttribute("ttl", m_doc->getFramePos(duration));
prod.setAttribute("luma_duration", m_doc->getFramePos(luma_duration));
prod.setAttribute("name", name);
prod.setAttribute("loop", loop);
+ prod.setAttribute("crop", crop);
prod.setAttribute("fade", fade);
prod.setAttribute("softness", QString::number(softness));
prod.setAttribute("luma_file", luma_file);
+ prod.setAttribute("animation", animation);
if (!group.isEmpty()) {
prod.setAttribute("groupname", group);
prod.setAttribute("groupid", groupId);
-void ClipManager::slotAddTextClipFile(const QString titleName, int out, const QString xml, const QString group, const QString &groupId)
+void ClipManager::slotAddTextClipFile(const QString &titleName, int out, const QString &xml, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
m_doc->commandStack()->push(command);
}
-void ClipManager::slotAddTextTemplateClip(QString titleName, const QString imagePath, const KUrl path, const QString group, const QString &groupId)
+void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl &path, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
doc.appendChild(prod);
- prod.setAttribute("resource", imagePath);
prod.setAttribute("name", titleName);
- prod.setAttribute("xmltemplate", path.path());
+ prod.setAttribute("resource", path.path());
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
if (!group.isEmpty()) {
prod.setAttribute("type", (int) TEXT);
prod.setAttribute("transparency", "1");
prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+
+ int out = 0;
+ QDomDocument titledoc;
+ QFile txtfile(path.path());
+ if (txtfile.open(QIODevice::ReadOnly) && titledoc.setContent(&txtfile)) {
+ txtfile.close();
+ out = titledoc.documentElement().attribute("out").toInt();
+ } else txtfile.close();
+
+ if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration());
+ prod.setAttribute("out", out);
+
AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
m_doc->commandStack()->push(command);
}
void ClipManager::slotClipModified(const QString &path)
{
- //kDebug()<<"// CLIP: "<<path<<" WAS MODIFIED";
- DocClipBase *clip = getClipByResource(path);
- if (clip == NULL) return;
- emit reloadClip(clip->getId());
-}
\ No newline at end of file
+ //kDebug() << "// CLIP: " << path << " WAS MODIFIED";
+ const QList <DocClipBase *> list = getClipByResource(path);
+ for (int i = 0; i < list.count(); i++) {
+ DocClipBase *clip = list.at(i);
+ if (clip != NULL) {
+ QString id = clip->getId();
+ if (!m_modifiedClips.contains(id))
+ emit modifiedClip(id);
+ m_modifiedClips[id] = QTime::currentTime();
+ }
+ }
+ if (!m_modifiedTimer.isActive()) m_modifiedTimer.start();
+}
+
+void ClipManager::slotProcessModifiedClips()
+{
+ if (!m_modifiedClips.isEmpty()) {
+ QMapIterator<QString, QTime> i(m_modifiedClips);
+ while (i.hasNext()) {
+ i.next();
+ if (QTime::currentTime().msecsTo(i.value()) <= -1500) {
+ emit reloadClip(i.key());
+ m_modifiedClips.remove(i.key());
+ break;
+ }
+ }
+ }
+ if (m_modifiedClips.isEmpty()) m_modifiedTimer.stop();
+}
+
+void ClipManager::slotClipMissing(const QString &path)
+{
+ // kDebug() << "// CLIP: " << path << " WAS MISSING";
+ const QList <DocClipBase *> list = getClipByResource(path);
+ for (int i = 0; i < list.count(); i++) {
+ DocClipBase *clip = list.at(i);
+ if (clip != NULL) emit missingClip(clip->getId());
+ }
+}
+
+void ClipManager::slotClipAvailable(const QString &path)
+{
+ // kDebug() << "// CLIP: " << path << " WAS ADDED";
+ const QList <DocClipBase *> list = getClipByResource(path);
+ for (int i = 0; i < list.count(); i++) {
+ DocClipBase *clip = list.at(i);
+ if (clip != NULL) emit availableClip(clip->getId());
+ }
+}
+
+int ClipManager::clipsCount() const
+{
+ return m_clipList.count();
+}
+
+
projects / kdenlive / blobdiff