Fix one frame error in clips duration

[kdenlive] / src / clipmanager.cpp

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 57f1066bee03ac48d41f047764251137e5ca8631..c5494d25757e4bed312e84ee3e84fd9589f290e0 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -23,27 +23,43 @@
 #include "kdenlivesettings.h"
 #include "clipmanager.h"
 #include "docclipbase.h"
+#include "kdenlivedoc.h"
 
 ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc) {
     m_clipIdCounter = 1;
+    m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
 }
 
 ClipManager::~ClipManager() {
+    qDeleteAll(m_clipList);
 }
 
-void ClipManager::setThumbsProgress(KUrl url, int progress) {
-    m_doc->setThumbsProgress(url, progress);
+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();
+        else m_clipList.at(i)->slotClearAudioCache();
+    }
 }
 
+void ClipManager::setThumbsProgress(const QString &message, int progress) {
+    m_doc->setThumbsProgress(message, progress);
+}
+
+QList <DocClipBase*> ClipManager::documentClipList() {
+    return m_clipList;
+}
 
 void ClipManager::addClip(DocClipBase *clip) {
     m_clipList.append(clip);
+    int id = clip->getId();
+    if (id >= m_clipIdCounter) m_clipIdCounter = id + 1;
 }
 
 void ClipManager::slotDeleteClip(uint clipId) {
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->getId() == clipId) {
-            //m_clipList.removeAt(i);
             AddClipCommand *command = new AddClipCommand(m_doc, m_clipList.at(i)->toXML(), clipId, false);
             m_doc->commandStack()->push(command);
             break;
@@ -65,35 +81,38 @@ DocClipBase *ClipManager::getClipAt(int pos) {
 }
 
 DocClipBase *ClipManager::getClipById(int clipId) {
-    kDebug() << "++++  CLIP MAN, LOOKING FOR CLIP ID: " << 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) {
-            kDebug() << "++++  CLIP MAN, FOUND FOR CLIP ID: " << clipId;
+            //kDebug() << "++++  CLIP MAN, FOUND FOR CLIP ID: " << clipId;
             return m_clipList.at(i);
         }
     }
     return NULL;
 }
 
-void ClipManager::slotAddClipFile(const KUrl url, const QString group) {
+void ClipManager::slotAddClipFile(const KUrl url, const QString group, const int groupId) {
     kDebug() << "/////  CLIP MANAGER, ADDING CLIP: " << url;
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
     prod.setAttribute("resource", url.path());
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
-    if (!group.isEmpty()) prod.setAttribute("group", group);
+    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()));
+        prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
     }
     AddClipCommand *command = new AddClipCommand(m_doc, prod, id, true);
     m_doc->commandStack()->push(command);
 }
 
-void ClipManager::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group) {
+void ClipManager::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const int groupId) {
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
     prod.setAttribute("mlt_service", "colour");
@@ -102,9 +121,64 @@ 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);
     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 int groupId) {
+    QDomDocument doc;
+    QDomElement prod = doc.createElement("producer");
+    prod.setAttribute("resource", path);
+    prod.setAttribute("type", (int) SLIDESHOW);
+    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("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);
+    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;
+    QDomDocument doc;
+    QDomElement prod = doc.createElement("producer");
+    prod.setAttribute("resource", path + ".png");
+    prod.setAttribute("xml", path);
+    prod.setAttribute("xmldata", xml);
+    uint id = m_clipIdCounter++;
+    prod.setAttribute("id", QString::number(id));
+    if (!group.isEmpty()) {
+        prod.setAttribute("groupname", group);
+        prod.setAttribute("groupid", groupId);
+    }
+    prod.setAttribute("type", (int) TEXT);
+    prod.setAttribute("in", "0");
+    prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+    AddClipCommand *command = new AddClipCommand(m_doc, prod, id, true);
+    m_doc->commandStack()->push(command);
+}
+
+int ClipManager::getFreeClipId() {
+    return m_clipIdCounter++;
+}
+
+