X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.cpp;h=c43b583d25660d12d6251d4068c5c81139ab50f1;hb=8e514e8841c1a6dfd0f5ae42188f5612035d0d90;hp=d3b8453ac7ad944f2bf87fdf4946556a89b83a00;hpb=890932ce1fb3c925b54b7e486575380f2d6e67e0;p=kdenlive

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index d3b8453a..c43b583d 100644
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -16,28 +16,42 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
-#include <KDebug>
-#include <KFileDialog>
-#include <kio/netaccess.h>
 
+
+#include "clipmanager.h"
 #include "addclipcommand.h"
 #include "kdenlivesettings.h"
-#include "clipmanager.h"
 #include "docclipbase.h"
 #include "kdenlivedoc.h"
+#include "abstractclipitem.h"
+#include "abstractgroupitem.h"
 
 #include <mlt++/Mlt.h>
 
-ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc), m_audioThumbsEnabled(false), m_audioThumbsQueue(QList <QString> ()), m_generatingAudioId(QString()) {
+#include <KDebug>
+#include <KFileDialog>
+#include <kio/netaccess.h>
+
+#include <QGraphicsItemGroup>
+
+ClipManager::ClipManager(KdenliveDoc *doc) :
+        QObject(),
+        m_audioThumbsQueue(),
+        m_doc(doc),
+        m_audioThumbsEnabled(false),
+        m_generatingAudioId()
+{
     m_clipIdCounter = 1;
     m_folderIdCounter = 1;
 }
 
-ClipManager::~ClipManager() {
+ClipManager::~ClipManager()
+{
     qDeleteAll(m_clipList);
 }
 
-void ClipManager::clear() {
+void ClipManager::clear()
+{
     qDeleteAll(m_clipList);
     m_clipList.clear();
     m_clipIdCounter = 1;
@@ -46,7 +60,8 @@ void ClipManager::clear() {
     m_audioThumbsQueue.clear();
 }
 
-void ClipManager::checkAudioThumbs() {
+void ClipManager::checkAudioThumbs()
+{
     if (m_audioThumbsEnabled == KdenliveSettings::audiothumbnails()) return;
     m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
     for (int i = 0; i < m_clipList.count(); i++) {
@@ -57,11 +72,12 @@ void ClipManager::checkAudioThumbs() {
         if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
     } else {
         m_audioThumbsQueue.clear();
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
     }
 }
 
-void ClipManager::askForAudioThumb(const QString &id) {
+void ClipManager::askForAudioThumb(const QString &id)
+{
     DocClipBase *clip = getClipById(id);
     if (clip && KdenliveSettings::audiothumbnails()) {
         m_audioThumbsQueue.append(id);
@@ -69,10 +85,11 @@ void ClipManager::askForAudioThumb(const QString &id) {
     }
 }
 
-void ClipManager::startAudioThumbsGeneration() {
+void ClipManager::startAudioThumbsGeneration()
+{
     if (!KdenliveSettings::audiothumbnails()) {
         m_audioThumbsQueue.clear();
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
         return;
     }
     if (!m_audioThumbsQueue.isEmpty()) {
@@ -81,14 +98,15 @@ void ClipManager::startAudioThumbsGeneration() {
         if (!clip || !clip->slotGetAudioThumbs())
             endAudioThumbsGeneration(m_generatingAudioId);
     } else {
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
     }
 }
 
-void ClipManager::endAudioThumbsGeneration(const QString &requestedId) {
+void ClipManager::endAudioThumbsGeneration(const QString &requestedId)
+{
     if (!KdenliveSettings::audiothumbnails()) {
         m_audioThumbsQueue.clear();
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
         return;
     }
     if (!m_audioThumbsQueue.isEmpty()) {
@@ -96,23 +114,27 @@ void ClipManager::endAudioThumbsGeneration(const QString &requestedId) {
             startAudioThumbsGeneration();
         }
     } else {
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
     }
 }
 
-void ClipManager::setThumbsProgress(const QString &message, int progress) {
+void ClipManager::setThumbsProgress(const QString &message, int progress)
+{
     m_doc->setThumbsProgress(message, progress);
 }
 
-QList <DocClipBase*> ClipManager::documentClipList() const {
+QList <DocClipBase*> ClipManager::documentClipList() const
+{
     return m_clipList;
 }
 
-QMap <QString, QString> ClipManager::documentFolderList() const {
+QMap <QString, QString> ClipManager::documentFolderList() const
+{
     return m_folderList;
 }
 
-void ClipManager::addClip(DocClipBase *clip) {
+void ClipManager::addClip(DocClipBase *clip)
+{
     m_clipList.append(clip);
     const QString id = clip->getId();
     if (id.toInt() >= m_clipIdCounter) m_clipIdCounter = id.toInt() + 1;
@@ -120,7 +142,8 @@ void ClipManager::addClip(DocClipBase *clip) {
     if (!gid.isEmpty() && gid.toInt() >= m_folderIdCounter) m_folderIdCounter = gid.toInt() + 1;
 }
 
-void ClipManager::slotDeleteClip(const QString &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);
@@ -130,7 +153,8 @@ void ClipManager::slotDeleteClip(const QString &clipId) {
     }
 }
 
-void ClipManager::deleteClip(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) {
             DocClipBase *clip = m_clipList.takeAt(i);
@@ -141,11 +165,13 @@ void ClipManager::deleteClip(const QString &clipId) {
     }
 }
 
-DocClipBase *ClipManager::getClipAt(int pos) {
+DocClipBase *ClipManager::getClipAt(int pos)
+{
     return m_clipList.at(pos);
 }
 
-DocClipBase *ClipManager::getClipById(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++) {
@@ -157,7 +183,8 @@ DocClipBase *ClipManager::getClipById(QString clipId) {
     return NULL;
 }
 
-DocClipBase *ClipManager::getClipByResource(QString resource) {
+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);
@@ -166,7 +193,8 @@ DocClipBase *ClipManager::getClipByResource(QString resource) {
     return NULL;
 }
 
-void ClipManager::updatePreviewSettings() {
+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) {
@@ -182,7 +210,8 @@ void ClipManager::updatePreviewSettings() {
     }
 }
 
-void ClipManager::resetProducersList(QList <Mlt::Producer *> prods) {
+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();
@@ -200,14 +229,16 @@ void ClipManager::resetProducersList(QList <Mlt::Producer *> prods) {
     }
 }
 
-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)
+{
     QUndoCommand *addClips = new QUndoCommand();
     addClips->setText(i18n("Add clips"));
 
-    foreach(const KUrl file, urls) {
+    foreach(const KUrl &file, urls) {
         if (KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
             QDomDocument doc;
             QDomElement prod = doc.createElement("producer");
+            doc.appendChild(prod);
             if (!group.isEmpty()) {
                 prod.setAttribute("groupname", group);
                 prod.setAttribute("groupid", groupId);
@@ -221,16 +252,18 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, co
                 prod.setAttribute("in", "0");
                 prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
             }
-            new AddClipCommand(m_doc, prod, QString::number(id), true, addClips);
+            new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true, 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)
+{
     kDebug() << "/////  CLIP MANAGER, ADDING CLIP: " << url;
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
+    doc.appendChild(prod);
     prod.setAttribute("resource", url.path());
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
@@ -244,13 +277,15 @@ void ClipManager::slotAddClipFile(const KUrl url, const QString group, const QSt
         prod.setAttribute("in", "0");
         prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
     }
-    AddClipCommand *command = new AddClipCommand(m_doc, prod, QString::number(id), true);
+    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");
+    doc.appendChild(prod);
     prod.setAttribute("mlt_service", "colour");
     prod.setAttribute("colour", color);
     prod.setAttribute("type", (int) COLOR);
@@ -263,13 +298,15 @@ void ClipManager::slotAddColorClipFile(const QString name, const QString color,
         prod.setAttribute("groupname", group);
         prod.setAttribute("groupid", groupId);
     }
-    AddClipCommand *command = new AddClipCommand(m_doc, prod, QString::number(id), true);
+    AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), 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, 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 fade, const QString &luma_duration, const QString &luma_file, const int softness, QString group, const QString &groupId)
+{
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
+    doc.appendChild(prod);
     prod.setAttribute("resource", path);
     prod.setAttribute("type", (int) SLIDESHOW);
     uint id = m_clipIdCounter++;
@@ -287,17 +324,19 @@ void ClipManager::slotAddSlideshowClipFile(const QString name, const QString pat
         prod.setAttribute("groupname", group);
         prod.setAttribute("groupid", groupId);
     }
-    AddClipCommand *command = new AddClipCommand(m_doc, prod, QString::number(id), true);
+    AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
     m_doc->commandStack()->push(command);
 }
 
 
 
-void ClipManager::slotAddTextClipFile(const QString titleName, const QString imagePath, const QString xml, const QString group, const QString &groupId) {
+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");
+    doc.appendChild(prod);
     prod.setAttribute("resource", imagePath);
-    prod.setAttribute("titlename", titleName);
+    prod.setAttribute("name", titleName);
     prod.setAttribute("xmldata", xml);
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
@@ -309,30 +348,78 @@ void ClipManager::slotAddTextClipFile(const QString titleName, const QString ima
     prod.setAttribute("transparency", "1");
     prod.setAttribute("in", "0");
     prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
-    AddClipCommand *command = new AddClipCommand(m_doc, prod, QString::number(id), true);
+    AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
     m_doc->commandStack()->push(command);
 }
 
-int ClipManager::getFreeClipId() {
+int ClipManager::getFreeClipId()
+{
     return m_clipIdCounter++;
 }
 
-int ClipManager::getFreeFolderId() {
+int ClipManager::getFreeFolderId()
+{
     return m_folderIdCounter++;
 }
 
-int ClipManager::lastClipId() const {
+int ClipManager::lastClipId() const
+{
     return m_clipIdCounter - 1;
 }
 
-QString ClipManager::projectFolder() const {
+QString ClipManager::projectFolder() const
+{
     return m_doc->projectFolder().path();
 }
 
-void ClipManager::addFolder(const QString &id, const QString &name) {
+void ClipManager::addFolder(const QString &id, const QString &name)
+{
     m_folderList.insert(id, name);
 }
 
-void ClipManager::deleteFolder(const QString &id) {
+void ClipManager::deleteFolder(const QString &id)
+{
     m_folderList.remove(id);
-}
\ No newline at end of file
+}
+
+AbstractGroupItem *ClipManager::createGroup()
+{
+    AbstractGroupItem *group = new AbstractGroupItem(m_doc->fps());
+    m_groupsList.append(group);
+    return group;
+}
+
+void ClipManager::removeGroup(AbstractGroupItem *group)
+{
+    m_groupsList.removeAll(group);
+}
+
+QDomElement ClipManager::groupsXml() const
+{
+    QDomDocument doc;
+    QDomElement groups = doc.createElement("groups");
+    doc.appendChild(groups);
+    for (int i = 0; i < m_groupsList.count(); i++) {
+        QDomElement group = doc.createElement("group");
+        groups.appendChild(group);
+        QList <QGraphicsItem *> children = m_groupsList.at(i)->childItems();
+        for (int j = 0; j < children.count(); j++) {
+            if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) {
+                AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(j));
+                ItemInfo info = item->info();
+                if (item->type() == AVWIDGET) {
+                    QDomElement clip = doc.createElement("clipitem");
+                    clip.setAttribute("track", info.track);
+                    clip.setAttribute("position", info.startPos.frames(m_doc->fps()));
+                    group.appendChild(clip);
+                } else if (item->type() == TRANSITIONWIDGET) {
+                    QDomElement clip = doc.createElement("transitionitem");
+                    clip.setAttribute("track", info.track);
+                    clip.setAttribute("position", info.startPos.frames(m_doc->fps()));
+                    group.appendChild(clip);
+                }
+            }
+        }
+    }
+    return doc.documentElement();
+}