X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmarkerdialog.cpp;h=a3935e5ad396d1d72224b465616c6caaa13f2b1b;hb=51a5213eaf67eb4d674c340f80e2fb8ac0bab8b2;hp=c437aa82d3505a0a88b98905999e795cea873ec7;hpb=a0dc08d2834e5112efba8ce7d2072791aed3d8b3;p=kdenlive

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index c437aa82..a3935e5a 100644
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -30,16 +30,20 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         QDialog(parent),
         m_producer(NULL),
         m_profile(NULL),
-        m_clip(clip),
-        m_tc(tc)
+        m_clip(clip)
 {
     setFont(KGlobalSettings::toolBarFont());
-    m_fps = m_tc.fps();
     setupUi(this);
     setWindowTitle(caption);
+
+    m_in = new TimecodeDisplay(tc, this);
+    inputLayout->addWidget(m_in);
+    m_in->setValue(t.time());
+
     m_previewTimer = new QTimer(this);
 
     if (m_clip != NULL) {
+        m_in->setRange(0, m_clip->duration().frames(tc.fps()));
         m_previewTimer->setInterval(500);
         connect(m_previewTimer, SIGNAL(timeout()), this, SLOT(slotUpdateThumb()));
         m_profile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data());
@@ -57,6 +61,8 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         if (width % 2 == 1) width++;
         QPixmap p(width, 100);
         QString colour = clip->getProperty("colour");
+        int swidth = (int) (100.0 * m_profile->width() / m_profile->height() + 0.5);
+
         switch (m_clip->clipType()) {
         case VIDEO:
         case AV:
@@ -65,7 +71,7 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
             connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start()));
         case IMAGE:
         case TEXT:
-            p = QPixmap::fromImage(KThumb::getFrame(m_producer, t.time().frames(m_fps), width, 100));
+            p = QPixmap::fromImage(KThumb::getFrame(m_producer, m_in->getValue(), swidth, width, 100));
             break;
         case COLOR:
             colour = colour.replace(0, 2, "#");
@@ -74,26 +80,21 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         default:
             p.fill(Qt::black);
         }
+
         if (!p.isNull()) {
             clip_thumb->setFixedWidth(p.width());
             clip_thumb->setFixedHeight(p.height());
             clip_thumb->setPixmap(p);
         }
-        connect(marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
-    } else clip_thumb->setHidden(true);
-
-    if (KdenliveSettings::frametimecode()) {
-        marker_position->setInputMask("000000000000");
-        marker_position->setText(QString::number((int) t.time().frames(m_fps)));
-    } else marker_position->setText(tc.getTimecode(t.time()));
+        connect(m_in, SIGNAL(editingFinished()), this, SIGNAL(updateThumb()));
+    } else {
+        clip_thumb->setHidden(true);
+    }
 
     marker_comment->setText(t.comment());
     marker_comment->selectAll();
     marker_comment->setFocus();
 
-    connect(position_up, SIGNAL(clicked()), this, SLOT(slotTimeUp()));
-    connect(position_down, SIGNAL(clicked()), this, SLOT(slotTimeDown()));
-
     adjustSize();
 }
 
@@ -107,52 +108,20 @@ 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_in->getValue();
     int width = 100.0 * m_dar;
+    int swidth = (int) (100.0 * m_profile->width() / m_profile->height() + 0.5);
     if (width % 2 == 1) width++;
-    QPixmap p = QPixmap::fromImage(KThumb::getFrame(m_producer, pos, width, 100));
-    if (!p.isNull()) clip_thumb->setPixmap(p);
-    else kDebug() << "!!!!!!!!!!!  ERROR CREATING THUMB";
-}
-
-void MarkerDialog::slotTimeUp()
-{
-    int duration;
-    if (KdenliveSettings::frametimecode()) duration = marker_position->text().toInt();
-    else duration = m_tc.getFrameCount(marker_position->text());
-    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)));
-}
-
-void MarkerDialog::slotTimeDown()
-{
-    int duration;
-    if (KdenliveSettings::frametimecode()) duration = marker_position->text().toInt();
-    else duration = m_tc.getFrameCount(marker_position->text());
-    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)));
+    QPixmap p = QPixmap::fromImage(KThumb::getFrame(m_producer, pos, swidth, width, 100));
+    if (!p.isNull())
+        clip_thumb->setPixmap(p);
+    else
+        kDebug() << "!!!!!!!!!!!  ERROR CREATING THUMB";
 }
 
 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());
-}
-
-void MarkerDialog::wheelEvent(QWheelEvent * event)
-{
-    if (marker_position->underMouse() || clip_thumb->underMouse()) {
-        if (event->delta() > 0)
-            slotTimeUp();
-        else
-            slotTimeDown();
-    }
+    return CommentedTime(m_in->gentime(), marker_comment->text());
 }
 
 #include "markerdialog.moc"