X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmarkerdialog.cpp;h=87e3f43ae03e00327eae103bf7138afdd43e4ce6;hb=548782dfe8b4ec1edc0c15f0062f5a976f1c6ee3;hp=e036720b1a2d8af5ccab4ae1c1536fa4896ed05f;hpb=5c822c42a9a536c8d25d1e42e439efaca13dbba3;p=kdenlive

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index e036720b..87e3f43a 100644
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -18,98 +18,108 @@
  ***************************************************************************/
 
 
-#include <KDebug>
-
 #include "markerdialog.h"
 #include "kthumb.h"
 #include "kdenlivesettings.h"
 
-MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_marker(t) {
+#include <QWheelEvent>
+#include <KDebug>
+
+
+MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent) :
+        QDialog(parent),
+        m_producer(NULL),
+        m_profile(NULL),
+        m_clip(clip)
+{
     setFont(KGlobalSettings::toolBarFont());
-    m_fps = m_tc.fps();
-    m_view.setupUi(this);
+    setupUi(this);
+    setWindowTitle(caption);
+
+    m_in = new TimecodeDisplay(tc, this);
+    inputLayout->addWidget(m_in);
+    m_in->setValue(t.time());
 
     m_previewTimer = new QTimer(this);
-    m_previewTimer->setInterval(500);
-    connect(m_previewTimer, SIGNAL(timeout()), this, SLOT(slotUpdateThumb()));
-
-    m_profile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data());
-    m_dar = m_profile->dar();
-    QDomDocument doc;
-    QDomElement westley = doc.createElement("westley");
-    QDomElement play = doc.createElement("playlist");
-    doc.appendChild(westley);
-    westley.appendChild(play);
-    play.appendChild(doc.importNode(clip->toXML(), true));
-    //char *tmp = doc.toString().toUtf8().data();
-    m_producer = new Mlt::Producer(*m_profile, "westley-xml", doc.toString().toUtf8().data());
-    //delete[] tmp;
-
-    m_view.marker_position->setText(tc.getTimecode(t.time(), m_fps));
-    m_view.marker_comment->setText(t.comment());
-    connect(m_view.position_up, SIGNAL(clicked()), this, SLOT(slotTimeUp()));
-    connect(m_view.position_down, SIGNAL(clicked()), this, SLOT(slotTimeDown()));
-
-    m_view.marker_comment->selectAll();
-    m_view.marker_comment->setFocus();
-    QPixmap p((int)(100 * m_dar), 100);
-    QString colour = clip->getProperty("colour");
-    switch (m_clip->clipType()) {
-    case VIDEO:
-    case AV:
-    case SLIDESHOW:
-    case PLAYLIST:
-        connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start()));
-    case IMAGE:
-    case TEXT:
-        p = KThumb::getFrame(*m_producer, t.time().frames(m_fps), (int)(100 * m_dar), 100);
-        break;
-    case COLOR:
-        colour = colour.replace(0, 2, "#");
-        p.fill(QColor(colour.left(7)));
-        break;
-    default:
-        p.fill(Qt::black);
-    }
-    if (!p.isNull()) {
-        m_view.clip_thumb->setFixedWidth(p.width());
-        m_view.clip_thumb->setFixedHeight(p.height());
-        m_view.clip_thumb->setPixmap(p);
+
+    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());
+        m_dar = m_profile->dar();
+        QDomDocument doc;
+        QDomElement mlt = doc.createElement("mlt");
+        QDomElement play = doc.createElement("mlt");
+        doc.appendChild(mlt);
+        mlt.appendChild(play);
+        play.appendChild(doc.importNode(clip->toXML(), true));
+        //char *tmp = doc.toString().toUtf8().data();
+        m_producer = new Mlt::Producer(*m_profile, "xml-string", doc.toString().toUtf8().data());
+        //delete[] tmp;
+        int width = 100.0 * m_dar;
+        if (width % 2 == 1) width++;
+        QPixmap p(width, 100);
+        QString colour = clip->getProperty("colour");
+
+        switch (m_clip->clipType()) {
+        case VIDEO:
+        case AV:
+        case SLIDESHOW:
+        case PLAYLIST:
+            connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start()));
+        case IMAGE:
+        case TEXT:
+            p = QPixmap::fromImage(KThumb::getFrame(m_producer, m_in->getValue(), width, 100));
+            break;
+        case COLOR:
+            colour = colour.replace(0, 2, "#");
+            p.fill(QColor(colour.left(7)));
+            break;
+        default:
+            p.fill(Qt::black);
+        }
+
+        if (!p.isNull()) {
+            clip_thumb->setFixedWidth(p.width());
+            clip_thumb->setFixedHeight(p.height());
+            clip_thumb->setPixmap(p);
+        }
+        connect(m_in, SIGNAL(editingFinished()), this, SIGNAL(updateThumb()));
+    } else {
+        clip_thumb->setHidden(true);
     }
-    connect(m_view.marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
+
+    marker_comment->setText(t.comment());
+    marker_comment->selectAll();
+    marker_comment->setFocus();
+
     adjustSize();
 }
 
-MarkerDialog::~MarkerDialog() {
+MarkerDialog::~MarkerDialog()
+{
     delete m_previewTimer;
-    if (m_producer) delete m_producer;
-    if (m_profile) delete m_profile;
+    delete m_producer;
+    delete m_profile;
 }
 
-void MarkerDialog::slotUpdateThumb() {
+void MarkerDialog::slotUpdateThumb()
+{
     m_previewTimer->stop();
-    int pos = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
-    QPixmap p = KThumb::getFrame(*m_producer, pos, (int)(100 * m_dar), 100);
-    if (!p.isNull()) m_view.clip_thumb->setPixmap(p);
-    else kDebug() << "!!!!!!!!!!!  ERROR CREATING THUMB";
-}
-
-void MarkerDialog::slotTimeUp() {
-    int duration = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
-    if (duration >= m_clip->duration().frames(m_fps)) return;
-    duration ++;
-    m_view.marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
-}
-
-void MarkerDialog::slotTimeDown() {
-    int duration = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
-    if (duration <= 0) return;
-    duration --;
-    m_view.marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
+    int pos = m_in->getValue();
+    int width = 100.0 * m_dar;
+    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";
 }
 
-CommentedTime MarkerDialog::newMarker() {
-    return CommentedTime(GenTime(m_tc.getFrameCount(m_view.marker_position->text(), m_fps), m_fps), m_view.marker_comment->text());
+CommentedTime MarkerDialog::newMarker()
+{
+    return CommentedTime(m_in->gentime(), marker_comment->text());
 }
 
 #include "markerdialog.moc"