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

List:       kde-commits
Subject:    [kdenlive] src/project: Revert "fix non-video clips duration after commit 777d0b"
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-08-31 19:29:21
Message-ID: E1XOAoT-00011H-Ug () scm ! kde ! org
[Download RAW message or body]

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

Revert "fix non-video clips duration after commit 777d0b"

This reverts commit 1fd38cab78cfe835b1c129878c3cb9fe1e2d7f8b.

M  +3    -9    src/project/projectitem.cpp

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

diff --git a/src/project/projectitem.cpp b/src/project/projectitem.cpp
index 980b898..e842a4e 100644
--- a/src/project/projectitem.cpp
+++ b/src/project/projectitem.cpp
@@ -225,19 +225,13 @@ 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());  QString itemdata = data(0, \
                DurationRole).toString();
         if (itemdata.contains('/')) itemdata = itemdata.section('/', 0, 0) + "/ ";
         else itemdata.clear();
         if (prefix.isEmpty()) prefix = itemdata;
-        if (attributes.contains("fps") && attributes.value("fps").toInt() >= 1) {
-            GenTime duration = GenTime(attributes.value("duration").toInt(), \
                attributes.value("fps").toInt());
-            setData(0, DurationRole, prefix + Timecode::getEasyTimecode(duration, \
                attributes.value("fps").toInt()));
-            m_clip->setDuration(duration);
-        } else {
-            GenTime duration = GenTime(attributes.value("duration").toInt(), \
                KdenliveSettings::project_fps());
-            setData(0, DurationRole, prefix + Timecode::getEasyTimecode(duration, \
                KdenliveSettings::project_fps()));
-            m_clip->setDuration(duration);
-        }
+	setData(0, DurationRole, prefix + Timecode::getEasyTimecode(duration, \
attributes.value("fps").toInt())); +        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]