[Kdenlive-svn] [kdenlive/v0.9] src: Try to avoid locale errors when converting double

[Jean-Baptiste M. <jb...@kd...>]

Git commit ed31bc0d0d41b4b9aa8aaf15a72c804dffbcc468 by Jean-Baptiste Mardelle.
Committed on 16/02/2013 at 20:07.
Pushed by mardelle into branch 'v0.9'.

Try to avoid locale errors when converting double

M  +6    -6    src/clipitem.cpp
M  +1    -1    src/monitor.cpp
M  +2    -2    src/projectlist.cpp

http://commits.kde.org/kdenlive/ed31bc0d0d41b4b9aa8aaf15a72c804dffbcc468

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 54b6407..0e5dd9d 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<int, QDomElement> 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 9763f6a..3315558 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 181cb96..881e194 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;