[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src/timeline: Avoid relying on xml to clone a clip.
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2017-03-06 7:14:08
Message-ID: E1ckmqO-0001cP-6c () code ! kde ! org
[Download RAW message or body]

Git commit dc80cd7352e01fd7e4b29aa3953f8f577b702a86 by Jean-Baptiste Mardelle, on \
behalf of Nicolas Carion. Committed on 06/03/2017 at 07:13.
Pushed by mardelle into branch 'Applications/16.12'.

Avoid relying on xml to clone a clip.

CCBUG: 377255

M  +9    -3    src/timeline/clip.cpp

https://commits.kde.org/kdenlive/dc80cd7352e01fd7e4b29aa3953f8f577b702a86

diff --git a/src/timeline/clip.cpp b/src/timeline/clip.cpp
index d609e21d3..11d25acc4 100644
--- a/src/timeline/clip.cpp
+++ b/src/timeline/clip.cpp
@@ -175,9 +175,15 @@ const QByteArray Clip::xml()
     return c.get("string");
 }
 
-Mlt::Producer *Clip::clone() {
-    Mlt::Producer *prod = new Mlt::Producer(*m_producer.profile(), "xml-string", \
                xml().constData());
-    return prod;
+Mlt::Producer *Clip::clone()
+{
+    QString service = QString::fromLatin1(m_producer.get("mlt_service"));
+    QString resource = QString::fromLatin1(m_producer.get("resource"));
+    Mlt::Producer *clone = new Mlt::Producer(*m_producer.profile(), \
service.toUtf8().constData(), resource.toUtf8().constData()); +    Mlt::Properties \
original(m_producer.get_properties()); +    Mlt::Properties \
cloneProps(clone->get_properties()); +    cloneProps.inherit(original);
+    return clone;
 }
 
 Mlt::Producer *Clip::softClone(const char*list) {


[prev in list] [next in list] [prev in thread] [next in thread]