Fix dropframe timecode, patch from John T. Mertz

[kdenlive] / src / clipdurationdialog.cpp

diff --git a/src/clipdurationdialog.cpp b/src/clipdurationdialog.cpp
index 5f144bdc512a361a4b53683e1d778fb6506f0f19..91ced7ca7da5205cdf1e8c18194ea7118bbed7ba 100644 (file)
--- a/src/clipdurationdialog.cpp
+++ b/src/clipdurationdialog.cpp
@@ -23,13 +23,17 @@
 #include "kdenlivesettings.h"
 
 #include <KDebug>
+#include <KMessageBox>
 
 #include <QWheelEvent>
 
-ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, QWidget * parent):
+ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, GenTime min, GenTime max, QWidget * parent):
         QDialog(parent),
         m_clip(clip),
-        m_tc(tc)
+        m_tc(tc),
+        m_min(min),
+        m_max(max),
+        m_framesDisplay(KdenliveSettings::frametimecode())
 {
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();
@@ -47,18 +51,47 @@ ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, QWid
         m_view.crop_down->hide();
         m_view.crop_position->hide();
         m_view.crop_label->hide();
+        m_view.end_up->hide();
+        m_view.end_down->hide();
+        m_view.end_position->hide();
+        m_view.end_label->hide();
     }
 
-    m_view.clip_position->setText(tc.getTimecode(m_clip->startPos(), m_fps));
-    m_view.crop_position->setText(tc.getTimecode(m_clip->cropStart(), m_fps));
-    m_view.clip_duration->setText(tc.getTimecode(m_clip->duration(), m_fps));
+    m_crop = m_clip->cropStart().frames(m_fps);
+
+    if (m_framesDisplay) {
+        QValidator *valid = new QIntValidator(this);
+        m_view.clip_position->setInputMask("");
+        m_view.clip_position->setValidator(valid);
+        m_view.crop_position->setInputMask("");
+        m_view.clip_position->setValidator(valid);
+        m_view.clip_duration->setInputMask("");
+        m_view.clip_position->setValidator(valid);
+        m_view.end_position->setInputMask("");
+        m_view.clip_position->setValidator(valid);
+    } else {
+        m_view.clip_position->setInputMask(m_tc.inputMask());
+        m_view.crop_position->setInputMask(m_tc.inputMask());
+        m_view.clip_duration->setInputMask(m_tc.inputMask());
+        m_view.end_position->setInputMask(m_tc.inputMask());
+    }
+    m_view.clip_position->setText(tc.getDisplayTimecode(m_clip->startPos(), m_framesDisplay));
+    m_view.crop_position->setText(tc.getDisplayTimecode(m_clip->cropStart(), m_framesDisplay));
+    m_view.clip_duration->setText(tc.getDisplayTimecode(m_clip->cropDuration(), m_framesDisplay));
+    m_view.end_position->setText(tc.getDisplayTimecode(m_clip->maxDuration() - m_clip->cropDuration() - m_clip->cropStart(), m_framesDisplay));
+
     connect(m_view.position_up, SIGNAL(clicked()), this, SLOT(slotPosUp()));
     connect(m_view.position_down, SIGNAL(clicked()), this, SLOT(slotPosDown()));
     connect(m_view.crop_up, SIGNAL(clicked()), this, SLOT(slotCropUp()));
     connect(m_view.crop_down, SIGNAL(clicked()), this, SLOT(slotCropDown()));
     connect(m_view.duration_up, SIGNAL(clicked()), this, SLOT(slotDurUp()));
     connect(m_view.duration_down, SIGNAL(clicked()), this, SLOT(slotDurDown()));
+    connect(m_view.end_up, SIGNAL(clicked()), this, SLOT(slotEndUp()));
+    connect(m_view.end_down, SIGNAL(clicked()), this, SLOT(slotEndDown()));
     connect(m_view.crop_position, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckCrop()));
+    connect(m_view.clip_duration, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckDuration()));
+    connect(m_view.clip_position, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckStart()));
+    connect(m_view.end_position, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckEnd()));
     adjustSize();
 }
 
@@ -66,116 +99,169 @@ ClipDurationDialog::~ClipDurationDialog()
 {
 }
 
-void ClipDurationDialog::setMargins(GenTime min, GenTime max)
-{
-    m_min = min;
-    m_max = max;
-    connect(m_view.clip_position, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckStart()));
-    connect(m_view.clip_duration, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckDuration()));
-}
-
 void ClipDurationDialog::slotCheckStart()
 {
-    int pos = m_tc.getFrameCount(m_view.clip_position->text(), m_fps);
-    int dur = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
+    int pos = m_tc.getDisplayFrameCount(m_view.clip_position->text(), m_framesDisplay);
+    int dur = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
+
     GenTime start(pos, m_fps);
     GenTime duration(dur, m_fps);
-    if (start < m_min) {
-        m_view.clip_position->setText(m_tc.getTimecode(m_min, m_fps));
-    } else if (start + duration > m_max) {
-        m_view.clip_position->setText(m_tc.getTimecode(m_max - duration, m_fps));
+    if (m_min != GenTime() && start < m_min) {
+        m_view.clip_position->setText(m_tc.getDisplayTimecode(m_min, m_framesDisplay));
+    } else if (m_max != GenTime() && start + duration > m_max) {
+        m_view.clip_position->setText(m_tc.getDisplayTimecode(m_max - duration, m_framesDisplay));
     }
 }
 
 void ClipDurationDialog::slotCheckDuration()
 {
-    int pos = m_tc.getFrameCount(m_view.clip_position->text(), m_fps);
-    int dur = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
+    int pos = m_tc.getDisplayFrameCount(m_view.clip_position->text(), m_framesDisplay);
+    int dur = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
+    int crop = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
+
     GenTime start(pos, m_fps);
     GenTime duration(dur, m_fps);
-    GenTime maxDuration = m_max == GenTime() ? start + m_clip->maxDuration() : qMin(m_max, start + m_clip->maxDuration());
-    if (start + duration > maxDuration) {
-        m_view.clip_duration->setText(m_tc.getTimecode(maxDuration - start, m_fps));
+    GenTime cropStart(crop, m_fps);
+    GenTime maxDuration;
+    if (m_clip->maxDuration() == GenTime()) maxDuration = m_max;
+    else maxDuration = m_max == GenTime() ? start + m_clip->maxDuration() - cropStart : qMin(m_max, start + m_clip->maxDuration() - cropStart);
+    if (maxDuration != GenTime() && start + duration > maxDuration) {
+        m_view.clip_duration->blockSignals(true);
+        m_view.clip_duration->setText(m_tc.getDisplayTimecode(maxDuration - start, m_framesDisplay));
+        m_view.clip_duration->blockSignals(false);
     }
+
+    dur = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
+    GenTime durationUp(dur, m_fps);
+    m_view.end_position->blockSignals(true);
+    m_view.end_position->setText(m_tc.getDisplayTimecode(m_clip->maxDuration() - durationUp - cropStart, m_framesDisplay));
+    m_view.end_position->blockSignals(false);
 }
 
 void ClipDurationDialog::slotCheckCrop()
 {
-    int dur = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
-    int crop = m_tc.getFrameCount(m_view.crop_position->text(), m_fps);
+    int dur = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
+    int crop = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
+
+    int diff = crop - m_crop;
+    if ((diff > 0 && diff < dur) || diff < 0) {
+        dur -= diff;
+    } else {
+        m_view.crop_position->setText(m_tc.getDisplayTimecode(GenTime(m_crop, m_fps), m_framesDisplay));
+        return;
+    }
     GenTime duration(dur, m_fps);
     GenTime cropStart(crop, m_fps);
     GenTime maxDuration = m_clip->maxDuration();
-    if (cropStart + duration > maxDuration) {
-        m_view.crop_position->setText(m_tc.getTimecode(maxDuration - duration, m_fps));
+    if (maxDuration != GenTime() && cropStart + duration > maxDuration) {
+        m_view.crop_position->setText(m_tc.getDisplayTimecode(GenTime(m_crop, m_fps), m_framesDisplay));
+    } else {
+        m_crop = crop;
+        m_view.clip_duration->blockSignals(true);
+        m_view.clip_duration->setText(m_tc.getDisplayTimecode(duration, m_framesDisplay));
+        m_view.clip_duration->blockSignals(false);
+    }
+}
+
+void ClipDurationDialog::slotCheckEnd()
+{
+    int crop = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
+    int end = m_tc.getDisplayFrameCount(m_view.end_position->text(), m_framesDisplay);
+    int dur = m_clip->maxDuration().frames(m_fps) - crop - end;
+
+    if (dur >= 0) {
+        m_view.clip_duration->setText(m_tc.getDisplayTimecode(GenTime(dur, m_fps), m_framesDisplay));
+    } else {
+        dur = m_tc.getFrameCount(m_view.clip_duration->text());
+        m_view.end_position->blockSignals(true);
+        m_view.end_position->setText(m_tc.getDisplayTimecode(m_clip->maxDuration() - GenTime(crop + dur, m_fps), m_framesDisplay));
+        m_view.end_position->blockSignals(false);
     }
 }
 
 void ClipDurationDialog::slotPosUp()
 {
-    int position = m_tc.getFrameCount(m_view.clip_position->text(), m_fps);
+    int position = m_tc.getDisplayFrameCount(m_view.clip_position->text(), m_framesDisplay);
     //if (duration >= m_clip->duration().frames(m_fps)) return;
     position ++;
-    m_view.clip_position->setText(m_tc.getTimecode(GenTime(position, m_fps), m_fps));
+    m_view.clip_position->setText(m_tc.getDisplayTimecode(GenTime(position, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotPosDown()
 {
-    int position = m_tc.getFrameCount(m_view.clip_position->text(), m_fps);
+    int position = m_tc.getDisplayFrameCount(m_view.clip_position->text(), m_framesDisplay);
     //if (duration >= m_clip->duration().frames(m_fps)) return;
     position --;
-    m_view.clip_position->setText(m_tc.getTimecode(GenTime(position, m_fps), m_fps));
+    m_view.clip_position->setText(m_tc.getDisplayTimecode(GenTime(position, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotDurUp()
 {
-    int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
-    int crop = m_tc.getFrameCount(m_view.crop_position->text(), m_fps);
-    if (duration + crop > m_clip->maxDuration().frames(m_fps)) return;
+    int duration = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
+    int crop = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
+
+    if (m_clip->maxDuration() != GenTime() && duration + crop > m_clip->maxDuration().frames(m_fps)) return;
     duration ++;
-    m_view.clip_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
+    m_view.clip_duration->setText(m_tc.getDisplayTimecode(GenTime(duration, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotDurDown()
 {
-    int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
+    int duration = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
     if (duration <= 0) return;
     duration --;
-    m_view.clip_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
+    m_view.clip_duration->setText(m_tc.getDisplayTimecode(GenTime(duration, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotCropUp()
 {
-    int crop = m_tc.getFrameCount(m_view.crop_position->text(), m_fps);
-    int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
-    if (duration + crop > m_clip->maxDuration().frames(m_fps)) return;
+    int duration = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
+    int crop = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
+
+    if (m_clip->maxDuration() != GenTime() && duration + crop > m_clip->maxDuration().frames(m_fps)) return;
     crop ++;
-    m_view.crop_position->setText(m_tc.getTimecode(GenTime(crop, m_fps), m_fps));
+    m_view.crop_position->setText(m_tc.getDisplayTimecode(GenTime(crop, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotCropDown()
 {
-    int crop = m_tc.getFrameCount(m_view.crop_position->text(), m_fps);
+    int crop = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
+
     if (crop <= 0) return;
     crop --;
-    m_view.crop_position->setText(m_tc.getTimecode(GenTime(crop, m_fps), m_fps));
+    m_view.crop_position->setText(m_tc.getDisplayTimecode(GenTime(crop, m_fps), m_framesDisplay));
+}
+
+void ClipDurationDialog::slotEndUp()
+{
+    int end = m_tc.getDisplayFrameCount(m_view.end_position->text(), m_framesDisplay);
+    end ++;
+    m_view.end_position->setText(m_tc.getDisplayTimecode(GenTime(end, m_fps), m_framesDisplay));
+}
+
+void ClipDurationDialog::slotEndDown()
+{
+    int end = m_tc.getDisplayFrameCount(m_view.end_position->text(), m_framesDisplay);
+    if (end <= 0) return;
+    end --;
+    m_view.end_position->setText(m_tc.getDisplayTimecode(GenTime(end, m_fps), m_framesDisplay));
 }
 
 GenTime ClipDurationDialog::startPos() const
 {
-    int pos = m_tc.getFrameCount(m_view.clip_position->text(), m_fps);
+    int pos = m_tc.getDisplayFrameCount(m_view.clip_position->text(), m_framesDisplay);
     return GenTime(pos, m_fps);
 }
 
 GenTime ClipDurationDialog::cropStart() const
 {
-    int pos = m_tc.getFrameCount(m_view.crop_position->text(), m_fps);
+    int pos = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
     return GenTime(pos, m_fps);
 }
 
 GenTime ClipDurationDialog::duration() const
 {
-    int pos = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
+    int pos = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
     return GenTime(pos, m_fps);
 }
 
@@ -196,6 +282,11 @@ void ClipDurationDialog::wheelEvent(QWheelEvent * event)
             slotCropUp();
         else
             slotCropDown();
+    } else if (m_view.end_position->underMouse()) {
+        if (event->delta() > 0)
+            slotEndUp();
+        else
+            slotEndDown();
     }
 }