X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.cpp;h=ad18f93f4e3d19b6e29522d8a43ff05dfb45546b;hb=6e7889fa8c3e7239a727a1c9295744c0aa5ce583;hp=67691ff2fbfd6a24d3e3848137c5d44de7043b44;hpb=d9df79256acce77ddf748676bc95d159cd4ea75f;p=kdenlive

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 67691ff2..ad18f93f 100644
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 #include <KDebug>
 #include <KFileDialog>
+#include <kio/netaccess.h>
 
 #include "addclipcommand.h"
 #include "kdenlivesettings.h"
@@ -25,9 +26,8 @@
 #include "docclipbase.h"
 #include "kdenlivedoc.h"
 
-ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc) {
+ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc), m_audioThumbsEnabled(false), m_audioThumbsQueue(QList <QString> ()), m_generatingAudioId(QString()) {
     m_clipIdCounter = 1;
-    m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
 }
 
 ClipManager::~ClipManager() {
@@ -38,9 +38,54 @@ void ClipManager::checkAudioThumbs() {
     if (m_audioThumbsEnabled == KdenliveSettings::audiothumbnails()) return;
     m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
     for (int i = 0; i < m_clipList.count(); i++) {
-        if (m_audioThumbsEnabled) m_clipList.at(i)->slotRequestAudioThumbs();
+        if (m_audioThumbsEnabled) m_audioThumbsQueue.append(m_clipList.at(i)->getId());
         else m_clipList.at(i)->slotClearAudioCache();
     }
+    if (m_audioThumbsEnabled) {
+        if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
+    } else {
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
+    }
+}
+
+void ClipManager::askForAudioThumb(const QString &id) {
+    DocClipBase *clip = getClipById(id);
+    if (clip && KdenliveSettings::audiothumbnails()) {
+        m_audioThumbsQueue.append(id);
+        if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
+    }
+}
+
+void ClipManager::startAudioThumbsGeneration() {
+    if (!KdenliveSettings::audiothumbnails()) {
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
+        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 = QString();
+    }
+}
+
+void ClipManager::endAudioThumbsGeneration(const QString &requestedId) {
+    if (!KdenliveSettings::audiothumbnails()) {
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
+        return;
+    }
+    if (!m_audioThumbsQueue.isEmpty()) {
+        if (m_generatingAudioId == requestedId) {
+            startAudioThumbsGeneration();
+        }
+    } else {
+        m_generatingAudioId = QString();
+    }
 }
 
 void ClipManager::setThumbsProgress(const QString &message, int progress) {
@@ -53,11 +98,11 @@ QList <DocClipBase*> ClipManager::documentClipList() {
 
 void ClipManager::addClip(DocClipBase *clip) {
     m_clipList.append(clip);
-    int id = clip->getId();
-    if (id >= m_clipIdCounter) m_clipIdCounter = id + 1;
+    const QString id = clip->getId();
+    if (id.toInt() >= m_clipIdCounter) m_clipIdCounter = id.toInt() + 1;
 }
 
-void ClipManager::slotDeleteClip(uint clipId) {
+void ClipManager::slotDeleteClip(const QString &clipId) {
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->getId() == clipId) {
             AddClipCommand *command = new AddClipCommand(m_doc, m_clipList.at(i)->toXML(), clipId, false);
@@ -67,7 +112,7 @@ void ClipManager::slotDeleteClip(uint clipId) {
     }
 }
 
-void ClipManager::deleteClip(uint clipId) {
+void ClipManager::deleteClip(const QString &clipId) {
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->getId() == clipId) {
             m_clipList.removeAt(i);
@@ -80,7 +125,7 @@ DocClipBase *ClipManager::getClipAt(int pos) {
     return m_clipList.at(pos);
 }
 
-DocClipBase *ClipManager::getClipById(int clipId) {
+DocClipBase *ClipManager::getClipById(const QString &clipId) {
     //kDebug() << "++++  CLIP MAN, LOOKING FOR CLIP ID: " << clipId;
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->getId() == clipId) {
@@ -91,7 +136,34 @@ DocClipBase *ClipManager::getClipById(int clipId) {
     return NULL;
 }
 
-void ClipManager::slotAddClipFile(const KUrl url, const QString group, const int groupId) {
+void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId) {
+    QUndoCommand *addClips = new QUndoCommand();
+    addClips->setText(i18n("Add clips"));
+
+    foreach(const KUrl file, urls) {
+        if (KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
+            QDomDocument doc;
+            QDomElement prod = doc.createElement("producer");
+            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);
+            }
+            new AddClipCommand(m_doc, prod, QString::number(id), true, addClips);
+        }
+    }
+    m_doc->commandStack()->push(addClips);
+}
+
+void ClipManager::slotAddClipFile(const KUrl url, const QString group, const QString &groupId) {
     kDebug() << "/////  CLIP MANAGER, ADDING CLIP: " << url;
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
@@ -106,13 +178,13 @@ void ClipManager::slotAddClipFile(const KUrl url, const QString group, const int
     if (type->name().startsWith("image/")) {
         prod.setAttribute("type", (int) IMAGE);
         prod.setAttribute("in", "0");
-        prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()));
+        prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
     }
-    AddClipCommand *command = new AddClipCommand(m_doc, prod, id, true);
+    AddClipCommand *command = new AddClipCommand(m_doc, prod, QString::number(id), true);
     m_doc->commandStack()->push(command);
 }
 
-void ClipManager::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const int 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");
     prod.setAttribute("mlt_service", "colour");
@@ -121,17 +193,17 @@ void ClipManager::slotAddColorClipFile(const QString name, const QString color,
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
     prod.setAttribute("in", "0");
-    prod.setAttribute("out", m_doc->getFramePos(duration));
+    prod.setAttribute("out", m_doc->getFramePos(duration) - 1);
     prod.setAttribute("name", name);
     if (!group.isEmpty()) {
         prod.setAttribute("groupname", group);
         prod.setAttribute("groupid", groupId);
     }
-    AddClipCommand *command = new AddClipCommand(m_doc, prod, id, true);
+    AddClipCommand *command = new AddClipCommand(m_doc, prod, QString::number(id), true);
     m_doc->commandStack()->push(command);
 }
 
-void ClipManager::slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, QString group, const int groupId) {
+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) {
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
     prod.setAttribute("resource", path);
@@ -139,26 +211,29 @@ void ClipManager::slotAddSlideshowClipFile(const QString name, const QString pat
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
     prod.setAttribute("in", "0");
-    prod.setAttribute("out", m_doc->getFramePos(duration) * count);
+    prod.setAttribute("out", m_doc->getFramePos(duration) * count - 1);
     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("fade", fade);
+    prod.setAttribute("softness", QString::number(softness));
+    prod.setAttribute("luma_file", luma_file);
     if (!group.isEmpty()) {
         prod.setAttribute("groupname", group);
         prod.setAttribute("groupid", groupId);
     }
-    AddClipCommand *command = new AddClipCommand(m_doc, prod, id, true);
+    AddClipCommand *command = new AddClipCommand(m_doc, prod, QString::number(id), true);
     m_doc->commandStack()->push(command);
 }
 
 
 
-void ClipManager::slotAddTextClipFile(const QString path, const QString xml, const QString group, const int groupId) {
-    kDebug() << "/////  CLIP MANAGER, ADDING CLIP: " << path;
+void ClipManager::slotAddTextClipFile(const QString titleName, const QString imagePath, const QString xml, const QString group, const QString &groupId) {
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
-    prod.setAttribute("resource", path + ".png");
-    prod.setAttribute("xml", path);
+    prod.setAttribute("resource", imagePath);
+    prod.setAttribute("titlename", titleName);
     prod.setAttribute("xmldata", xml);
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
@@ -167,9 +242,10 @@ void ClipManager::slotAddTextClipFile(const QString path, const QString xml, con
         prod.setAttribute("groupid", groupId);
     }
     prod.setAttribute("type", (int) TEXT);
+    prod.setAttribute("transparency", "1");
     prod.setAttribute("in", "0");
-    prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()));
-    AddClipCommand *command = new AddClipCommand(m_doc, prod, id, true);
+    prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+    AddClipCommand *command = new AddClipCommand(m_doc, prod, QString::number(id), true);
     m_doc->commandStack()->push(command);
 }
 
@@ -177,4 +253,8 @@ int ClipManager::getFreeClipId() {
     return m_clipIdCounter++;
 }
 
+int ClipManager::lastClipId() const {
+    return m_clipIdCounter - 1;
+}
+