From bf15a1644edd2386110caafe609a8d3319c06f05 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 3 Mar 2009 18:47:44 +0000 Subject: [PATCH] Fix crash when using clip with special characters in path: http://www.kdenlive.org/mantis/view.php?id=699 svn path=/branches/KDE4/; revision=3094 --- src/renderer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/renderer.cpp b/src/renderer.cpp index 97fcd3c1..d5f23306 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -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); } -- 2.39.5