From 0f603b7df733080c553510ce33d0e68b59def8a1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 16 Feb 2013 20:07:56 +0100 Subject: [PATCH] Try to avoid locale errors when converting double --- src/clipitem.cpp | 12 ++++++------ src/monitor.cpp | 2 +- src/projectlist.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 54b64071..0e5dd9dc 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -261,7 +261,7 @@ void ClipItem::initEffect(QDomElement effect, int diff, int offset) if (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") { if (e.attribute("keyframes").isEmpty()) { // Effect has a keyframe type parameter, we need to set the values - e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default")); + e.setAttribute("keyframes", QString::number((int) cropStart().frames(m_fps)) + ':' + e.attribute("default")); } else if (offset != 0) { // adjust keyframes to this clip @@ -272,8 +272,8 @@ void ClipItem::initEffect(QDomElement effect, int diff, int offset) if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { // Effects with a geometry parameter need to sync in / out with parent clip - effect.setAttribute("in", QString::number(cropStart().frames(m_fps))); - effect.setAttribute("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1)); + effect.setAttribute("in", QString::number((int) cropStart().frames(m_fps))); + effect.setAttribute("out", QString::number((int) (cropStart() + cropDuration()).frames(m_fps) - 1)); effect.setAttribute("_sync_in_out", "1"); } } @@ -1659,8 +1659,8 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/) } } if (needInOutSync) { - parameters.addParam("in", QString::number(cropStart().frames(m_fps))); - parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1)); + parameters.addParam("in", QString::number((int) cropStart().frames(m_fps))); + parameters.addParam("out", QString::number((int) (cropStart() + cropDuration()).frames(m_fps) - 1)); parameters.addParam("_sync_in_out", "1"); } m_effectNames = m_effectList.effectNames().join(" / "); @@ -2002,7 +2002,7 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, if (in < cropStart().frames(m_fps)) { if (!effects.contains(i)) effects[i] = effect.cloneNode().toElement(); - EffectsList::setParameter(effect, "in", QString::number(cropStart().frames(m_fps))); + EffectsList::setParameter(effect, "in", QString::number((int) cropStart().frames(m_fps))); } if (effects.contains(i)) setFadeOut(out - in); diff --git a/src/monitor.cpp b/src/monitor.cpp index 9763f6ae..33155581 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -1154,7 +1154,7 @@ QString Monitor::getMarkerThumb(GenTime pos) { if (!m_currentClip) return QString(); if (!m_currentClip->getClipHash().isEmpty()) { - QString url = m_monitorManager->getProjectFolder() + "thumbs/" + m_currentClip->getClipHash() + '#' + QString::number(pos.frames(m_monitorManager->timecode().fps())) + ".png"; + QString url = m_monitorManager->getProjectFolder() + "thumbs/" + m_currentClip->getClipHash() + '#' + QString::number((int) pos.frames(m_monitorManager->timecode().fps())) + ".png"; if (QFile::exists(url)) return url; } return QString(); diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 181cb96d..881e1949 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -3567,8 +3567,8 @@ void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QStr ProjectItem *item = getItemById(id); if (!item) return; QStringList jobParams; - jobParams << QString::number(info.cropStart.frames(m_fps)) << QString::number((info.cropStart + info.cropDuration).frames(m_fps)); - jobParams << QString() << filterName << filterParams << consumer << consumerParams << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track); + jobParams << QString::number((int) info.cropStart.frames(m_fps)) << QString::number((int) (info.cropStart + info.cropDuration).frames(m_fps)); + jobParams << QString() << filterName << filterParams << consumer << consumerParams << QString::number((int) info.startPos.frames(m_fps)) << QString::number(info.track); MeltJob *job = new MeltJob(item->clipType(), id, jobParams, extraParams); if (job->isExclusive() && hasPendingJob(item, job->jobType)) { delete job; -- 2.39.2