code cleanup

[kdenlive] / src / positionedit.cpp

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();