* Cleanup folder creation

[kdenlive] / src / clipmanager.cpp

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 2ecef0cb94cea52f0c418c959cc5bec82c5a1e61..f0f3a1fc25ace03f188c3bc3156fe534121bf4af 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -26,8 +26,11 @@
 #include "docclipbase.h"
 #include "kdenlivedoc.h"
 
+#include <mlt++/Mlt.h>
+
 ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc), m_audioThumbsEnabled(false), m_audioThumbsQueue(QList <QString> ()), m_generatingAudioId(QString()) {
     m_clipIdCounter = 1;
+    m_folderIdCounter = 1;
 }
 
 ClipManager::~ClipManager() {
@@ -42,11 +45,10 @@ void ClipManager::checkAudioThumbs() {
         else m_clipList.at(i)->slotClearAudioCache();
     }
     if (m_audioThumbsEnabled) {
-       if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
-    }
-    else {
-       m_audioThumbsQueue.clear();
-       m_generatingAudioId = QString();
+        if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
+    } else {
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
     }
 }
 
@@ -60,15 +62,15 @@ void ClipManager::askForAudioThumb(const QString &id) {
 
 void ClipManager::startAudioThumbsGeneration() {
     if (!KdenliveSettings::audiothumbnails()) {
-       m_audioThumbsQueue.clear();
-       m_generatingAudioId = QString();
-       return;
+        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);
+        m_generatingAudioId = m_audioThumbsQueue.takeFirst();
+        DocClipBase *clip = getClipById(m_generatingAudioId);
+        if (!clip || !clip->slotGetAudioThumbs())
+            endAudioThumbsGeneration(m_generatingAudioId);
     } else {
         m_generatingAudioId = QString();
     }
@@ -76,9 +78,9 @@ void ClipManager::startAudioThumbsGeneration() {
 
 void ClipManager::endAudioThumbsGeneration(const QString &requestedId) {
     if (!KdenliveSettings::audiothumbnails()) {
-       m_audioThumbsQueue.clear();
-       m_generatingAudioId = QString();
-       return;
+        m_audioThumbsQueue.clear();
+        m_generatingAudioId = QString();
+        return;
     }
     if (!m_audioThumbsQueue.isEmpty()) {
         if (m_generatingAudioId == requestedId) {
@@ -93,14 +95,20 @@ void ClipManager::setThumbsProgress(const QString &message, int progress) {
     m_doc->setThumbsProgress(message, progress);
 }
 
-QList <DocClipBase*> ClipManager::documentClipList() {
+QList <DocClipBase*> ClipManager::documentClipList() const {
     return m_clipList;
 }
 
+QMap <QString, QString> ClipManager::documentFolderList() const {
+    return m_folderList;
+}
+
 void ClipManager::addClip(DocClipBase *clip) {
     m_clipList.append(clip);
     const QString id = clip->getId();
     if (id.toInt() >= m_clipIdCounter) m_clipIdCounter = id.toInt() + 1;
+    const QString gid = clip->getProperty("groupid");
+    if (!gid.isEmpty() && gid.toInt() >= m_folderIdCounter) m_folderIdCounter = gid.toInt() + 1;
 }
 
 void ClipManager::slotDeleteClip(const QString &clipId) {
@@ -116,7 +124,9 @@ void ClipManager::slotDeleteClip(const QString &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);
+            DocClipBase *clip = m_clipList.takeAt(i);
+            delete clip;
+            clip = NULL;
             break;
         }
     }
@@ -126,8 +136,9 @@ DocClipBase *ClipManager::getClipAt(int pos) {
     return m_clipList.at(pos);
 }
 
-DocClipBase *ClipManager::getClipById(const QString &clipId) {
+DocClipBase *ClipManager::getClipById(QString clipId) {
     //kDebug() << "++++  CLIP MAN, LOOKING FOR CLIP ID: " << clipId;
+    clipId = clipId.section('_', 0, 0);
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->getId() == clipId) {
             //kDebug() << "++++  CLIP MAN, FOUND FOR CLIP ID: " << clipId;
@@ -137,6 +148,49 @@ DocClipBase *ClipManager::getClipById(const QString &clipId) {
     return NULL;
 }
 
+DocClipBase *ClipManager::getClipByResource(QString resource) {
+    for (int i = 0; i < m_clipList.count(); i++) {
+        if (m_clipList.at(i)->getProperty("resource") == resource) {
+            return m_clipList.at(i);
+        }
+    }
+    return NULL;
+}
+
+void ClipManager::updatePreviewSettings() {
+    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", "");
+                }
+            }
+        }
+    }
+}
+
+void ClipManager::resetProducersList(QList <Mlt::Producer *> prods) {
+    for (int i = 0; i < m_clipList.count(); i++) {
+        if (m_clipList.at(i)->numReferences() > 0) {
+            m_clipList.at(i)->deleteProducers();
+        }
+    }
+    QString id;
+    for (int i = 0; i < prods.count(); i++) {
+        id = prods.at(i)->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;
+        }
+    }
+}
+
 void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId) {
     QUndoCommand *addClips = new QUndoCommand();
     addClips->setText(i18n("Add clips"));
@@ -254,8 +308,22 @@ int ClipManager::getFreeClipId() {
     return m_clipIdCounter++;
 }
 
+int ClipManager::getFreeFolderId() {
+    return m_folderIdCounter++;
+}
+
 int ClipManager::lastClipId() const {
     return m_clipIdCounter - 1;
 }
 
+QString ClipManager::projectFolder() const {
+    return m_doc->projectFolder().path();
+}
+
+void ClipManager::addFolder(const QString &id, const QString &name) {
+    m_folderList.insert(id, name);
+}
 
+void ClipManager::deleteFolder(const QString &id) {
+    m_folderList.remove(id);
+}
\ No newline at end of file