Fix dropframe timecode, patch from John T. Mertz

[kdenlive] / src / clipproperties.cpp

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 423a2814828349da2a40954ca0fb907d62f3963a..4b8c9dc509da218d68670de05030740a7383b93c 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -54,6 +54,9 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
     m_view.clip_description->setText(m_clip->description());
     QMap <QString, QString> props = m_clip->properties();
 
+    m_view.clip_force_out->setHidden(true);
+    m_view.clip_out->setHidden(true);
+
     if (props.contains("force_aspect_ratio") && props.value("force_aspect_ratio").toDouble() > 0) {
         m_view.clip_force_ar->setChecked(true);
         m_view.clip_ar->setEnabled(true);
@@ -255,8 +258,14 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         m_view.clip_thumb->setHidden(true);
     }
 
-    KFileItem f(KFileItem::Unknown, KFileItem::Unknown, url, true);
-    m_view.clip_filesize->setText(KIO::convertSize(f.size()));
+    if (t != SLIDESHOW && t != COLOR) {
+        KFileItem f(KFileItem::Unknown, KFileItem::Unknown, url, true);
+        m_view.clip_filesize->setText(KIO::convertSize(f.size()));
+    } else {
+        m_view.clip_filesize->setHidden(true);
+        m_view.label_size->setHidden(true);
+    }
+    m_view.clip_duration->setInputMask(tc.inputMask());
     m_view.clip_duration->setText(tc.getTimecode(m_clip->duration()));
     if (t != IMAGE && t != COLOR && t != TEXT) m_view.clip_duration->setReadOnly(true);
     else connect(m_view.clip_duration, SIGNAL(editingFinished()), this, SLOT(slotCheckMaxLength()));
@@ -280,9 +289,10 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
 
 
 // Used for multiple clips editing
-ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, QMap <QString, QString> commonproperties, QWidget * parent) :
+ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, Timecode tc, QMap <QString, QString> commonproperties, QWidget * parent) :
         QDialog(parent),
         m_clip(NULL),
+        m_tc(tc),
         m_fps(0),
         m_count(0),
         m_clipNeedsRefresh(false),
@@ -342,6 +352,7 @@ ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, QMap <QString, QSt
     connect(m_view.clip_force_threads, SIGNAL(toggled(bool)), m_view.clip_threads, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_vindex, SIGNAL(toggled(bool)), m_view.clip_vindex, SLOT(setEnabled(bool)));
     connect(m_view.clip_force_aindex, SIGNAL(toggled(bool)), m_view.clip_aindex, SLOT(setEnabled(bool)));
+    connect(m_view.clip_force_out, SIGNAL(toggled(bool)), m_view.clip_out, SLOT(setEnabled(bool)));
 
     m_view.tabWidget->removeTab(METATAB);
     m_view.tabWidget->removeTab(MARKERTAB);
@@ -354,13 +365,24 @@ ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, QMap <QString, QSt
     m_view.clip_path->setHidden(true);
     m_view.label_path->setHidden(true);
     m_view.label_description->setHidden(true);
-    m_view.label_duration->setHidden(true);
     m_view.label_size->setHidden(true);
     m_view.clip_filesize->setHidden(true);
     m_view.clip_filesize->setHidden(true);
-    m_view.clip_duration->setHidden(true);
     m_view.clip_path->setHidden(true);
     m_view.clip_description->setHidden(true);
+    m_view.clip_thumb->setHidden(true);
+    m_view.label_duration->setHidden(true);
+    m_view.clip_duration->setHidden(true);
+
+    if (commonproperties.contains("out")) {
+        if (commonproperties.value("out").toInt() > 0) {
+            m_view.clip_force_out->setChecked(true);
+            m_view.clip_out->setText(m_tc.getTimecodeFromFrames(commonproperties.value("out").toInt()));
+        } else m_view.clip_out->setText(KdenliveSettings::image_duration());
+    } else {
+        m_view.clip_force_out->setHidden(true);
+        m_view.clip_out->setHidden(true);
+    }
 }
 
 
@@ -441,7 +463,7 @@ const QString &ClipProperties::clipId() const
 QMap <QString, QString> ClipProperties::properties()
 {
     QMap <QString, QString> props;
-    CLIPTYPE t;
+    CLIPTYPE t = UNKNOWN;
     if (m_clip != NULL) {
         t = m_clip->clipType();
         m_old_props = m_clip->properties();
@@ -506,7 +528,15 @@ QMap <QString, QString> ClipProperties::properties()
     }
 
     // If we adjust several clips, return now
-    if (m_clip == NULL) return props;
+    if (m_clip == NULL) {
+        if (m_view.clip_out->isEnabled()) {
+            int duration = m_tc.getFrameCount(m_view.clip_out->text());
+            if (duration != m_old_props.value("out").toInt()) {
+                props["out"] = QString::number(duration - 1);
+            }
+        }
+        return props;
+    }
 
     if (m_old_props.value("description") != m_view.clip_description->text())
         props["description"] = m_view.clip_description->text();
@@ -519,7 +549,7 @@ QMap <QString, QString> ClipProperties::properties()
         }
         int duration = m_tc.getFrameCount(m_view.clip_duration->text());
         if (duration != m_clip->duration().frames(m_fps)) {
-            props["out"] = QString::number(duration);
+            props["out"] = QString::number(duration - 1);
         }
     } else if (t == IMAGE) {
         if ((int) m_view.image_transparency->isChecked() != m_old_props.value("transparency").toInt()) {
@@ -528,7 +558,7 @@ QMap <QString, QString> ClipProperties::properties()
         }
         int duration = m_tc.getFrameCount(m_view.clip_duration->text());
         if (duration != m_clip->duration().frames(m_fps)) {
-            props["out"] = QString::number(duration);
+            props["out"] = QString::number(duration - 1);
         }
     } else if (t == SLIDESHOW) {
         QString value = QString::number((int) m_view.slide_loop->isChecked());
@@ -555,9 +585,10 @@ QMap <QString, QString> ClipProperties::properties()
             props["ttl"] = QString::number(duration);
             props["out"] = QString::number(duration * m_count);
         }
-        if (duration * m_count != m_old_props.value("out").toInt()) {
+
+        if (duration * m_count - 1 != m_old_props.value("out").toInt()) {
             m_clipNeedsRefresh = true;
-            props["out"] = QString::number(duration * m_count);
+            props["out"] = QString::number(duration * m_count - 1);
         }
         if (m_view.slide_fade->isChecked()) {
             int luma_duration;