code cleanup

svn path=/trunk/kdenlive/; revision=4323

diff --git a/src/clipdurationdialog.cpp b/src/clipdurationdialog.cpp
index f77aa2e46e2b56b6f4279eeebc2486e0346d7b4c..a527c9fe8ecb20a5878f070eadaca1ad6c80a646 100644 (file)
--- a/src/clipdurationdialog.cpp
+++ b/src/clipdurationdialog.cpp
@@ -32,7 +32,8 @@ ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, GenT
         m_clip(clip),
         m_tc(tc),
         m_min(min),
-        m_max(max)
+        m_max(max),
+        m_framesDisplay(KdenliveSettings::frametimecode())
 {
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();
@@ -58,26 +59,22 @@ ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, GenT
 
     m_crop = m_clip->cropStart().frames(m_fps);
 
-    if (KdenliveSettings::frametimecode()) {
+    if (m_framesDisplay) {
         QValidator *valid = new QIntValidator();
         m_view.clip_position->setInputMask("");
         m_view.clip_position->setValidator(valid);
-        m_view.clip_position->setText(QString::number(m_clip->startPos().frames(m_fps)));
         m_view.crop_position->setInputMask("");
         m_view.clip_position->setValidator(valid);
-        m_view.crop_position->setText(QString::number(m_clip->cropStart().frames(m_fps)));
         m_view.clip_duration->setInputMask("");
         m_view.clip_position->setValidator(valid);
-        m_view.clip_duration->setText(QString::number(m_clip->cropDuration().frames(m_fps)));
         m_view.end_position->setInputMask("");
         m_view.clip_position->setValidator(valid);
-        m_view.end_position->setText(QString::number((m_clip->maxDuration() - m_clip->cropDuration() - m_clip->cropStart()).frames(m_fps)));
-    } else {
-        m_view.clip_position->setText(tc.getTimecode(m_clip->startPos()));
-        m_view.crop_position->setText(tc.getTimecode(m_clip->cropStart()));
-        m_view.clip_duration->setText(tc.getTimecode(m_clip->cropDuration()));
-        m_view.end_position->setText(tc.getTimecode(m_clip->maxDuration() - m_clip->cropDuration() - m_clip->cropStart()));
     }
+    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()));
@@ -99,41 +96,23 @@ ClipDurationDialog::~ClipDurationDialog()
 
 void ClipDurationDialog::slotCheckStart()
 {
-    int pos;
-    int dur;
-    if (KdenliveSettings::frametimecode()) {
-        pos = m_view.clip_position->text().toInt();
-        dur = m_view.clip_duration->text().toInt();
-    } else {
-        pos = m_tc.getFrameCount(m_view.clip_position->text());
-        dur = m_tc.getFrameCount(m_view.clip_duration->text());
-    }
+    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 (m_min != GenTime() && start < m_min) {
-        if (KdenliveSettings::frametimecode()) m_view.clip_position->setText(QString::number(m_min.frames(m_fps)));
-        else m_view.clip_position->setText(m_tc.getTimecode(m_min));
+        m_view.clip_position->setText(m_tc.getDisplayTimecode(m_min, m_framesDisplay));
     } else if (m_max != GenTime() && start + duration > m_max) {
-        if (KdenliveSettings::frametimecode()) m_view.clip_position->setText(QString::number((m_max - duration).frames(m_fps)));
-        else m_view.clip_position->setText(m_tc.getTimecode(m_max - duration));
+        m_view.clip_position->setText(m_tc.getDisplayTimecode(m_max - duration, m_framesDisplay));
     }
 }
 
 void ClipDurationDialog::slotCheckDuration()
 {
-    int pos;
-    int dur;
-    int crop;
-    if (KdenliveSettings::frametimecode()) {
-        pos = m_view.clip_position->text().toInt();
-        dur = m_view.clip_duration->text().toInt();
-        crop = m_view.crop_position->text().toInt();
-    } else {
-        pos = m_tc.getFrameCount(m_view.clip_position->text());
-        dur = m_tc.getFrameCount(m_view.clip_duration->text());
-        crop = m_tc.getFrameCount(m_view.crop_position->text());
-    }
+    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);
@@ -143,210 +122,141 @@ void ClipDurationDialog::slotCheckDuration()
     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);
-        if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number((maxDuration - start).frames(m_fps)));
-        else m_view.clip_duration->setText(m_tc.getTimecode(maxDuration - start));
+        m_view.clip_duration->setText(m_tc.getDisplayTimecode(maxDuration - start, m_framesDisplay));
         m_view.clip_duration->blockSignals(false);
     }
 
-    if (KdenliveSettings::frametimecode()) dur = m_view.clip_duration->text().toInt();
-    else dur = m_tc.getFrameCount(m_view.clip_duration->text());
+    dur = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
     GenTime durationUp(dur, m_fps);
     m_view.end_position->blockSignals(true);
-    if (KdenliveSettings::frametimecode()) m_view.end_position->setText(QString::number((m_clip->maxDuration() - durationUp - cropStart).frames(m_fps)));
-    else m_view.end_position->setText(m_tc.getTimecode(m_clip->maxDuration() - durationUp - cropStart));
+    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;
-    int crop;
-    if (KdenliveSettings::frametimecode()) {
-        dur = m_view.clip_duration->text().toInt();
-        crop = m_view.crop_position->text().toInt();
-    } else {
-        dur = m_tc.getFrameCount(m_view.clip_duration->text());
-        crop = m_tc.getFrameCount(m_view.crop_position->text());
-    }
+    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 {
-        if (KdenliveSettings::frametimecode()) m_view.crop_position->setText(QString::number(m_crop));
-        else m_view.crop_position->setText(m_tc.getTimecode(GenTime(m_crop, m_fps)));
+        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 (maxDuration != GenTime() && cropStart + duration > maxDuration) {
-        if (KdenliveSettings::frametimecode()) m_view.crop_position->setText(QString::number(m_crop));
-        else m_view.crop_position->setText(m_tc.getTimecode(GenTime(m_crop, m_fps)));
+        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);
-        if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number(duration.frames(m_fps)));
-        else m_view.clip_duration->setText(m_tc.getTimecode(duration));
+        m_view.clip_duration->setText(m_tc.getDisplayTimecode(duration, m_framesDisplay));
         m_view.clip_duration->blockSignals(false);
     }
 }
 
 void ClipDurationDialog::slotCheckEnd()
 {
-    int crop;
-    int end;
-    int dur;
-    if (KdenliveSettings::frametimecode()) {
-        crop = m_view.crop_position->text().toInt();
-        end = m_view.end_position->text().toInt();
-        dur = m_clip->maxDuration().frames(m_fps) - crop - end;
-    } else {
-        crop = m_tc.getFrameCount(m_view.crop_position->text());
-        end = m_tc.getFrameCount(m_view.end_position->text());
-        dur = m_tc.getFrameCount(m_tc.getTimecode(m_clip->maxDuration())) - crop - end;
-    }
+    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) {
-        if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number(dur));
-        else m_view.clip_duration->setText(m_tc.getTimecode(GenTime(dur, m_fps)));
+        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);
-        if (KdenliveSettings::frametimecode()) m_view.end_position->setText(QString::number(m_clip->maxDuration().frames(m_fps) - (crop + dur)));
-        else m_view.end_position->setText(m_tc.getTimecode(m_clip->maxDuration() - GenTime(crop + dur, m_fps)));
+        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;
-    if (KdenliveSettings::frametimecode()) position = m_view.clip_position->text().toInt();
-    else position = m_tc.getFrameCount(m_view.clip_position->text());
+    int position = m_tc.getDisplayFrameCount(m_view.clip_position->text(), m_framesDisplay);
     //if (duration >= m_clip->duration().frames(m_fps)) return;
     position ++;
-    if (KdenliveSettings::frametimecode()) m_view.clip_position->setText(QString::number(position));
-    else m_view.clip_position->setText(m_tc.getTimecode(GenTime(position, m_fps)));
+    m_view.clip_position->setText(m_tc.getDisplayTimecode(GenTime(position, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotPosDown()
 {
-    int position;
-    if (KdenliveSettings::frametimecode()) position = m_view.clip_position->text().toInt();
-    else position = m_tc.getFrameCount(m_view.clip_position->text());
+    int position = m_tc.getDisplayFrameCount(m_view.clip_position->text(), m_framesDisplay);
     //if (duration >= m_clip->duration().frames(m_fps)) return;
     position --;
-    if (KdenliveSettings::frametimecode()) m_view.clip_position->setText(QString::number(position));
-    else m_view.clip_position->setText(m_tc.getTimecode(GenTime(position, m_fps)));
+    m_view.clip_position->setText(m_tc.getDisplayTimecode(GenTime(position, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotDurUp()
 {
-    int duration;
-    int crop;
-    if (KdenliveSettings::frametimecode()) {
-        duration = m_view.clip_duration->text().toInt();
-        crop = m_view.crop_position->text().toInt();
-    } else {
-        duration = m_tc.getFrameCount(m_view.clip_duration->text());
-        crop = m_tc.getFrameCount(m_view.crop_position->text());
-    }
+    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 ++;
-    if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number(duration));
-    else m_view.clip_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
+    m_view.clip_duration->setText(m_tc.getDisplayTimecode(GenTime(duration, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotDurDown()
 {
-    int duration;
-    if (KdenliveSettings::frametimecode()) {
-        duration = m_view.clip_duration->text().toInt();
-    } else {
-        duration = m_tc.getFrameCount(m_view.clip_duration->text());
-    }
+    int duration = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
     if (duration <= 0) return;
     duration --;
-    if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number(duration));
-    else m_view.clip_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
+    m_view.clip_duration->setText(m_tc.getDisplayTimecode(GenTime(duration, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotCropUp()
 {
-    int duration;
-    int crop;
-    if (KdenliveSettings::frametimecode()) {
-        duration = m_view.clip_duration->text().toInt();
-        crop = m_view.crop_position->text().toInt();
-    } else {
-        duration = m_tc.getFrameCount(m_view.clip_duration->text());
-        crop = m_tc.getFrameCount(m_view.crop_position->text());
-    }
+    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 ++;
-    if (KdenliveSettings::frametimecode()) m_view.crop_position->setText(QString::number(crop));
-    else m_view.crop_position->setText(m_tc.getTimecode(GenTime(crop, m_fps)));
+    m_view.crop_position->setText(m_tc.getDisplayTimecode(GenTime(crop, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotCropDown()
 {
-    int crop;
-    if (KdenliveSettings::frametimecode()) {
-        crop = m_view.crop_position->text().toInt();
-    } else {
-        crop = m_tc.getFrameCount(m_view.crop_position->text());
-    }
+    int crop = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
 
     if (crop <= 0) return;
     crop --;
-    if (KdenliveSettings::frametimecode()) m_view.crop_position->setText(QString::number(crop));
-    else m_view.crop_position->setText(m_tc.getTimecode(GenTime(crop, m_fps)));
+    m_view.crop_position->setText(m_tc.getDisplayTimecode(GenTime(crop, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotEndUp()
 {
-    int end;
-    if (KdenliveSettings::frametimecode()) end = m_view.end_position->text().toInt();
-    else end = m_tc.getFrameCount(m_view.end_position->text());
-    kDebug() << "/ / / / FIRST END: " << end;
+    int end = m_tc.getDisplayFrameCount(m_view.end_position->text(), m_framesDisplay);
     end ++;
-    if (KdenliveSettings::frametimecode()) m_view.end_position->setText(QString::number(end));
-    else m_view.end_position->setText(m_tc.getTimecode(GenTime(end, m_fps)));
-    kDebug() << "/ / / / SEC END: " << end;
+    m_view.end_position->setText(m_tc.getDisplayTimecode(GenTime(end, m_fps), m_framesDisplay));
 }
 
 void ClipDurationDialog::slotEndDown()
 {
-    int end;
-    if (KdenliveSettings::frametimecode()) end = m_view.end_position->text().toInt();
-    else end = m_tc.getFrameCount(m_view.end_position->text());
+    int end = m_tc.getDisplayFrameCount(m_view.end_position->text(), m_framesDisplay);
     if (end <= 0) return;
     end --;
-    if (KdenliveSettings::frametimecode()) m_view.end_position->setText(QString::number(end));
-    else m_view.end_position->setText(m_tc.getTimecode(GenTime(end, m_fps)));
+    m_view.end_position->setText(m_tc.getDisplayTimecode(GenTime(end, m_fps), m_framesDisplay));
 }
 
 GenTime ClipDurationDialog::startPos() const
 {
-    int pos;
-    if (KdenliveSettings::frametimecode()) pos = m_view.clip_position->text().toInt();
-    else pos = m_tc.getFrameCount(m_view.clip_position->text());
+    int pos = m_tc.getDisplayFrameCount(m_view.clip_position->text(), m_framesDisplay);
     return GenTime(pos, m_fps);
 }
 
 GenTime ClipDurationDialog::cropStart() const
 {
-    int pos;
-    if (KdenliveSettings::frametimecode()) pos = m_view.crop_position->text().toInt();
-    else pos = m_tc.getFrameCount(m_view.crop_position->text());
+    int pos = m_tc.getDisplayFrameCount(m_view.crop_position->text(), m_framesDisplay);
     return GenTime(pos, m_fps);
 }
 
 GenTime ClipDurationDialog::duration() const
 {
-    int pos;
-    if (KdenliveSettings::frametimecode()) pos = m_view.clip_duration->text().toInt();
-    else pos = m_tc.getFrameCount(m_view.clip_duration->text());
+    int pos = m_tc.getDisplayFrameCount(m_view.clip_duration->text(), m_framesDisplay);
     return GenTime(pos, m_fps);
 }
 

diff --git a/src/clipdurationdialog.h b/src/clipdurationdialog.h
index c53946041aad8474a67cc69a777f06af9813027a..fe8ae17824cfdbc74c14020d096c8e44978545d0 100644 (file)
--- a/src/clipdurationdialog.h
+++ b/src/clipdurationdialog.h
@@ -63,6 +63,7 @@ private:
     GenTime m_min;
     GenTime m_max;
     int m_crop;
+    bool m_framesDisplay;
 };
 
 

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index 01f922508b538786477ab8baa7d64d86b5f92910..48c6ad3c0841496c001864db9000ac274f87a239 100644 (file)
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -31,7 +31,8 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         m_producer(NULL),
         m_profile(NULL),
         m_clip(clip),
-        m_tc(tc)
+        m_tc(tc),
+        m_frameDisplay(KdenliveSettings::frametimecode())
 {
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();
@@ -82,12 +83,12 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         connect(marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
     } else clip_thumb->setHidden(true);
 
-    if (KdenliveSettings::frametimecode()) {
+    if (m_frameDisplay) {
         QValidator *valid = new QIntValidator();
         marker_position->setInputMask("");
         marker_position->setValidator(valid);
-        marker_position->setText(QString::number((int) t.time().frames(m_fps)));
-    } else marker_position->setText(tc.getTimecode(t.time()));
+    }
+    marker_position->setText(tc.getDisplayTimecode(t.time(), m_frameDisplay));
 
     marker_comment->setText(t.comment());
     marker_comment->selectAll();
@@ -109,9 +110,7 @@ MarkerDialog::~MarkerDialog()
 void MarkerDialog::slotUpdateThumb()
 {
     m_previewTimer->stop();
-    int pos;
-    if (KdenliveSettings::frametimecode()) pos = marker_position->text().toInt();
-    else pos = m_tc.getFrameCount(marker_position->text());
+    int pos = m_tc.getDisplayFrameCount(marker_position->text(), m_frameDisplay);
     int width = 100.0 * m_dar;
     if (width % 2 == 1) width++;
     QPixmap p = QPixmap::fromImage(KThumb::getFrame(m_producer, pos, width, 100));
@@ -121,30 +120,23 @@ void MarkerDialog::slotUpdateThumb()
 
 void MarkerDialog::slotTimeUp()
 {
-    int duration;
-    if (KdenliveSettings::frametimecode()) duration = marker_position->text().toInt();
-    else duration = m_tc.getFrameCount(marker_position->text());
+    int duration = m_tc.getDisplayFrameCount(marker_position->text(), m_frameDisplay);
     if (m_clip && duration >= m_clip->duration().frames(m_fps)) return;
     duration ++;
-    if (KdenliveSettings::frametimecode()) marker_position->setText(QString::number(duration));
-    else marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
+    marker_position->setText(m_tc.getDisplayTimecode(GenTime(duration, m_fps), m_frameDisplay));
 }
 
 void MarkerDialog::slotTimeDown()
 {
-    int duration;
-    if (KdenliveSettings::frametimecode()) duration = marker_position->text().toInt();
-    else duration = m_tc.getFrameCount(marker_position->text());
+    int duration = m_tc.getDisplayFrameCount(marker_position->text(), m_frameDisplay);
     if (duration <= 0) return;
     duration --;
-    if (KdenliveSettings::frametimecode()) marker_position->setText(QString::number(duration));
-    else marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
+    marker_position->setText(m_tc.getDisplayTimecode(GenTime(duration, m_fps), m_frameDisplay));
 }
 
 CommentedTime MarkerDialog::newMarker()
 {
-    if (KdenliveSettings::frametimecode()) return CommentedTime(GenTime(marker_position->text().toInt(), m_fps), marker_comment->text());
-    return CommentedTime(GenTime(m_tc.getFrameCount(marker_position->text()), m_fps), marker_comment->text());
+    return CommentedTime(GenTime(m_tc.getDisplayFrameCount(marker_position->text(), m_frameDisplay), m_fps), marker_comment->text());
 }
 
 void MarkerDialog::wheelEvent(QWheelEvent * event)

diff --git a/src/markerdialog.h b/src/markerdialog.h
index 5c6707c3d807726e7e62d3b3d494ce4ad146392e..a3867a2551de821d4835b9fce1c57da8dcb77b7c 100644 (file)
--- a/src/markerdialog.h
+++ b/src/markerdialog.h
@@ -57,6 +57,7 @@ private:
     double m_fps;
     double m_dar;
     QTimer *m_previewTimer;
+    bool m_frameDisplay;
 
 signals:
     void updateThumb();

diff --git a/src/positionedit.cpp b/src/positionedit.cpp
index 7c27845b93afaaee85e459d8caa6ffb651c3f9e2..38869c89ab4e79af4ce4c37a09ab2ea8d45317b5 100644 (file)
--- a/src/positionedit.cpp
+++ b/src/positionedit.cpp
@@ -22,7 +22,8 @@
 
 PositionEdit::PositionEdit(const QString name, int pos, int min, int max, const Timecode tc, QWidget* parent) :
         QWidget(parent),
-        m_tc(tc)
+        m_tc(tc),
+        m_frameDisplay(KdenliveSettings::frametimecode())
 {
     m_ui.setupUi(this);
     m_ui.label->setText(name);
@@ -30,12 +31,12 @@ PositionEdit::PositionEdit(const QString name, int pos, int min, int max, const
     connect(m_ui.horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateTimecode()));
     connect(m_ui.krestrictedline, SIGNAL(editingFinished()), this, SLOT(slotUpdatePosition()));
     m_ui.horizontalSlider->setValue(pos);
-    if (KdenliveSettings::frametimecode()) {
+    if (m_frameDisplay) {
         QValidator *valid = new QIntValidator();
         m_ui.krestrictedline->setInputMask("");
         m_ui.krestrictedline->setValidator(valid);
-        m_ui.krestrictedline->setText(QString::number(pos));
-    } else m_ui.krestrictedline->setText(m_tc.getTimecodeFromFrames(pos));
+    }
+    m_ui.krestrictedline->setText(m_tc.getDisplayTimecodeFromFrames(pos, m_frameDisplay));
 }
 
 int PositionEdit::getPosition() const
@@ -46,28 +47,23 @@ int PositionEdit::getPosition() const
 void PositionEdit::setPosition(int pos)
 {
     m_ui.horizontalSlider->setValue(pos);
-    if (KdenliveSettings::frametimecode()) m_ui.krestrictedline->setText(QString::number(pos));
-    else m_ui.krestrictedline->setText(m_tc.getTimecodeFromFrames(pos));
+    m_ui.krestrictedline->setText(m_tc.getDisplayTimecodeFromFrames(pos, m_frameDisplay));
 }
 
 void PositionEdit::slotUpdateTimecode()
 {
-    if (KdenliveSettings::frametimecode()) m_ui.krestrictedline->setText(QString::number(m_ui.horizontalSlider->value()));
-    else m_ui.krestrictedline->setText(m_tc.getTimecodeFromFrames(m_ui.horizontalSlider->value()));
+    m_ui.krestrictedline->setText(m_tc.getDisplayTimecodeFromFrames(m_ui.horizontalSlider->value(), m_frameDisplay));
     emit parameterChanged();
 }
 
 void PositionEdit::slotUpdatePosition()
 {
     m_ui.horizontalSlider->blockSignals(true);
-    int pos;
-    if (KdenliveSettings::frametimecode()) pos = m_ui.krestrictedline->text().toInt();
-    else pos = m_tc.getFrameCount(m_ui.krestrictedline->text());
+    int pos = m_tc.getDisplayFrameCount(m_ui.krestrictedline->text(), m_frameDisplay);
     m_ui.horizontalSlider->setValue(pos);
     if (pos != m_ui.horizontalSlider->value()) {
         // Value out of range
-        if (KdenliveSettings::frametimecode()) m_ui.krestrictedline->setText(QString::number(m_ui.horizontalSlider->value()));
-        else m_ui.krestrictedline->setText(m_tc.getTimecodeFromFrames(m_ui.horizontalSlider->value()));
+        m_ui.krestrictedline->setText(m_tc.getDisplayTimecodeFromFrames(m_ui.horizontalSlider->value(), m_frameDisplay));
     }
     m_ui.horizontalSlider->blockSignals(false);
     emit parameterChanged();

diff --git a/src/positionedit.h b/src/positionedit.h
index a2916b330c054ef4dea1662bf23af0ccfc39e114..e29d2c718c889572c368649c1c757d2c9563ce0c 100644 (file)
--- a/src/positionedit.h
+++ b/src/positionedit.h
@@ -36,6 +36,7 @@ public:
 private:
     Ui::Positionval_UI m_ui;
     Timecode m_tc;
+    bool m_frameDisplay;
 
 private slots:
     void slotUpdateTimecode();

diff --git a/src/timecode.cpp b/src/timecode.cpp
index 607a0af57625fd26e910fc915688da8cb2b6ffa2..1b25df21f13adaf5a5de50bd488ab890d36c4cab 100644 (file)
--- a/src/timecode.cpp
+++ b/src/timecode.cpp
@@ -37,6 +37,12 @@ double Timecode::fps() const
 }
 
 
+int Timecode::getDisplayFrameCount(const QString duration, bool frameDisplay) const
+{
+    if (frameDisplay) return duration.toInt();
+    return getFrameCount(duration);
+}
+
 int Timecode::getFrameCount(const QString duration) const
 {
     if (m_dropFrame) {
@@ -69,6 +75,12 @@ int Timecode::getFrameCount(const QString duration) const
     return (int)((duration.section(':', 0, 0).toInt()*3600.0 + duration.section(':', 1, 1).toInt()*60.0 + duration.section(':', 2, 2).toInt()) * m_realFps + duration.section(':', 3, 3).toInt());
 }
 
+QString Timecode::getDisplayTimecode(const GenTime & time, bool frameDisplay) const
+{
+    if (frameDisplay) return QString::number((int) time.frames(m_realFps));
+    return getTimecode(time);
+}
+
 QString Timecode::getTimecode(const GenTime & time) const
 {
     switch (m_format) {
@@ -92,6 +104,12 @@ QString Timecode::getTimecode(const GenTime & time) const
     }
 }
 
+const QString Timecode::getDisplayTimecodeFromFrames(int frames, bool frameDisplay) const
+{
+    if (frameDisplay) return QString::number(frames);
+    return getTimecodeHH_MM_SS_FF(frames);
+}
+
 const QString Timecode::getTimecodeFromFrames(int frames) const
 {
     return getTimecodeHH_MM_SS_FF(frames);

diff --git a/src/timecode.h b/src/timecode.h
index e17e4379e32bd15db7eda3560907a8d8bc22ba60..e10ae4af767ba4a10b8c55408113678f6a55c24c 100644 (file)
--- a/src/timecode.h
+++ b/src/timecode.h
@@ -49,10 +49,13 @@ public:
     ~Timecode();
 
     /** Returns the timecode for a given time */
+    QString getDisplayTimecode(const GenTime & time, bool frameDisplay) const;
     QString getTimecode(const GenTime & time) const;
+    int getDisplayFrameCount(const QString duration, bool frameDisplay) const;
     int getFrameCount(const QString duration) const;
     static QString getEasyTimecode(const GenTime & time, const double &fps);
     static QString getStringTimecode(int frames, const double &fps);
+    const QString getDisplayTimecodeFromFrames(int frames, bool frameDisplay) const;
     const QString getTimecodeFromFrames(int frames) const;
     double fps() const;