[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src/project: Revert "fix importing a 50fps project into a 25fps (#3320)"
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-08-31 19:29:22
Message-ID: E1XOAoU-00011H-Hd () scm ! kde ! org
[Download RAW message or body]

Git commit a93dc90366af77688d0cc3b842c5b1daf493c935 by Vincent PINON.
Committed on 31/08/2014 at 19:17.
Pushed by vpinon into branch 'master'.

Revert "fix importing a 50fps project into a 25fps (#3320)"

This reverts commit 777d0baa971434201ec7f3bac2e2ccff60219bf2.

M  +2    -2    src/project/projectitem.cpp

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

diff --git a/src/project/projectitem.cpp b/src/project/projectitem.cpp
index e842a4e..fe8a4bd 100644
--- a/src/project/projectitem.cpp
+++ b/src/project/projectitem.cpp
@@ -225,12 +225,12 @@ void ProjectItem::setProperties(const QMap < QString, QString > \
&attributes, con  else if (attributes.contains("frame_size")) slotSetToolTip();
     
     if (attributes.contains("duration")) {
-        GenTime duration = GenTime(attributes.value("duration").toInt(), \
attributes.value("fps").toInt()); +        GenTime duration = \
GenTime(attributes.value("duration").toInt(), KdenliveSettings::project_fps());  \
                QString itemdata = data(0, DurationRole).toString();
         if (itemdata.contains('/')) itemdata = itemdata.section('/', 0, 0) + "/ ";
         else itemdata.clear();
         if (prefix.isEmpty()) prefix = itemdata;
-	setData(0, DurationRole, prefix + Timecode::getEasyTimecode(duration, \
attributes.value("fps").toInt())); +        setData(0, DurationRole, prefix + \
Timecode::getEasyTimecode(duration, KdenliveSettings::project_fps()));  \
m_clip->setDuration(duration);  } else  {
         // No duration known, use an arbitrary one until it is.


[prev in list] [next in list] [prev in thread] [next in thread]