From 73ed360c24e2d9d4cc00a46e4ed5b0fd7a2fd56e Mon Sep 17 00:00:00 2001 From: Till Theato Date: Tue, 9 Aug 2011 10:48:14 +0000 Subject: [PATCH] Fix speed effect if > 999: http://kdenlive.org/mantis/view.php?id=2275 The issue might need a more general aproach though. svn path=/trunk/kdenlive/; revision=5824 --- src/customtrackview.cpp | 7 +++++-- src/renderer.cpp | 2 +- src/trackview.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 32e2de5e..8dc02d45 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1620,7 +1620,8 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); return; } - double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + QLocale locale; + double speed = locale.toDouble(EffectsList::parameter(effect, "speed")) / 100.0; int strobe = EffectsList::parameter(effect, "strobe").toInt(); if (strobe == 0) strobe = 1; doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, 1.0, strobe, clip->baseClip()->getId()); @@ -1880,7 +1881,8 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE if (effect.attribute("disable") == "1") { doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId()); } else { - double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0; + QLocale locale; + double speed = locale.toDouble(EffectsList::parameter(effect, "speed")) / 100.0; int strobe = EffectsList::parameter(effect, "strobe").toInt(); if (strobe == 0) strobe = 1; doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), speed, clip->speed(), strobe, clip->baseClip()->getId()); @@ -3802,6 +3804,7 @@ void CustomTrackView::deleteSelectedClips() void CustomTrackView::changeClipSpeed() { + // TODO: remove after string freeze QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select clip to change speed"), ErrorMessage); diff --git a/src/renderer.cpp b/src/renderer.cpp index 19c836e9..2142f930 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -2119,7 +2119,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou kWarning() << "// TRACTOR PROBLEM"; return -1; } - + //kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1; Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(info.track)); diff --git a/src/trackview.cpp b/src/trackview.cpp index 62dd37b5..4dbd355d 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -609,7 +609,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod int strobe = 1; if (idString.startsWith("slowmotion")) { id = idString.section(':', 1, 1); - speed = idString.section(':', 2, 2).toDouble(); + speed = m_locale.toDouble(idString.section(':', 2, 2)); strobe = idString.section(':', 3, 3).toInt(); if (strobe == 0) strobe = 1; } -- 2.39.2