]> git.sesse.net Git - kdenlive/commitdiff
Fix crash when using clip with special characters in path:
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 3 Mar 2009 18:47:44 +0000 (18:47 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 3 Mar 2009 18:47:44 +0000 (18:47 +0000)
http://www.kdenlive.org/mantis/view.php?id=699

svn path=/branches/KDE4/; revision=3094

src/renderer.cpp

index 97fcd3c1a3e0c76bd88fb65b7e6ba44d2ef67825..d5f23306cf2480f0ac8f249b9fc61cc9f33bdcbb 100644 (file)
@@ -1323,7 +1323,7 @@ void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pr
     if (element.attribute("speed", "1.0").toDouble() != 1.0) {
         // We want a slowmotion producer
         double speed = element.attribute("speed", "1.0").toDouble();
-        QString url = prod->get("resource");
+        QString url = QString::fromUtf8(prod->get("resource"));
         url.append('?' + QString::number(speed));
         Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
         if (!slowprod || slowprod->get_producer() == NULL) {
@@ -1662,7 +1662,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt
     //kDebug() << "CLIP SERVICE: " << serv;
     if (serv == "avformat" && speed != 1.0) {
         mlt_service_lock(service.get_service());
-        QString url = clipparent.get("resource");
+        QString url = QString::fromUtf8(clipparent.get("resource"));
         url.append('?' + QString::number(speed));
         Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
         if (!slowprod || slowprod->get_producer() == NULL) {
@@ -1713,7 +1713,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt
 
     } else if (serv == "framebuffer") {
         mlt_service_lock(service.get_service());
-        QString url = clipparent.get("resource");
+        QString url = QString::fromUtf8(clipparent.get("resource"));
         url = url.section('?', 0, 0);
         url.append('?' + QString::number(speed));
         Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
@@ -2790,7 +2790,7 @@ void Render::fillSlowMotionProducers() {
                 QString id = nprod->get("id");
                 if (id.startsWith("slowmotion:")) {
                     // this is a slowmotion producer, add it to the list
-                    QString url = nprod->get("resource");
+                   QString url = QString::fromUtf8(nprod->get("resource"));
                     if (!m_slowmotionProducers.contains(url)) {
                         m_slowmotionProducers.insert(url, nprod);
                     }