X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmarkerdialog.cpp;h=a0f62d58c11771938db229029436db54ac5a6352;hb=fec4b6aba639dac658d35475512c6f232c8aebe3;hp=143fa737c580df5b41524a3f6f6e391c8e82fccf;hpb=95265b50de041c51b5111bc397709fe3ce83b1fc;p=kdenlive

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index 143fa737..a0f62d58 100644
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -18,17 +18,25 @@
  ***************************************************************************/
 
 
-#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), m_producer(NULL), m_profile(NULL) {
+#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),
+        m_tc(tc)
+{
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();
-    m_view.setupUi(this);
-
+    setupUi(this);
+    setWindowTitle(caption);
     m_previewTimer = new QTimer(this);
 
     if (m_clip != NULL) {
@@ -37,16 +45,17 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWid
         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);
+        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, "westley-xml", doc.toString().toUtf8().data());
+        m_producer = new Mlt::Producer(*m_profile, "xml-string", doc.toString().toUtf8().data());
         //delete[] tmp;
-
-        QPixmap p((int)(100 * m_dar), 100);
+        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:
@@ -56,7 +65,7 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWid
             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);
+            p = QPixmap::fromImage(KThumb::getFrame(m_producer, t.time().frames(m_fps), width, 100));
             break;
         case COLOR:
             colour = colour.replace(0, 2, "#");
@@ -66,54 +75,72 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWid
             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);
+            clip_thumb->setFixedWidth(p.width());
+            clip_thumb->setFixedHeight(p.height());
+            clip_thumb->setPixmap(p);
         }
-        connect(m_view.marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
-    } else m_view.clip_thumb->setHidden(true);
+        connect(marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
+    } else clip_thumb->setHidden(true);
+
+    marker_position->setText(tc.getTimecode(t.time()));
 
-    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()));
+    marker_comment->setText(t.comment());
+    marker_comment->selectAll();
+    marker_comment->setFocus();
 
-    m_view.marker_comment->selectAll();
-    m_view.marker_comment->setFocus();
+    connect(position_up, SIGNAL(clicked()), this, SLOT(slotTimeUp()));
+    connect(position_down, SIGNAL(clicked()), this, SLOT(slotTimeDown()));
 
     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);
+    int pos = m_tc.getFrameCount(marker_position->text());
+    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";
 }
 
-void MarkerDialog::slotTimeUp() {
-    int duration = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
-    if (duration >= m_clip->duration().frames(m_fps)) return;
+void MarkerDialog::slotTimeUp()
+{
+    int duration = m_tc.getFrameCount(marker_position->text());
+    if (m_clip && duration >= m_clip->duration().frames(m_fps)) return;
     duration ++;
-    m_view.marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
+    marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
 }
 
-void MarkerDialog::slotTimeDown() {
-    int duration = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
+void MarkerDialog::slotTimeDown()
+{
+    int duration = m_tc.getFrameCount(marker_position->text());
     if (duration <= 0) return;
     duration --;
-    m_view.marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
+    marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
+}
+
+CommentedTime MarkerDialog::newMarker()
+{
+    return CommentedTime(GenTime(m_tc.getFrameCount(marker_position->text()), m_fps), marker_comment->text());
 }
 
-CommentedTime MarkerDialog::newMarker() {
-    return CommentedTime(GenTime(m_tc.getFrameCount(m_view.marker_position->text(), m_fps), m_fps), m_view.marker_comment->text());
+void MarkerDialog::wheelEvent(QWheelEvent * event)
+{
+    if (marker_position->underMouse() || clip_thumb->underMouse()) {
+        if (event->delta() > 0)
+            slotTimeUp();
+        else
+            slotTimeDown();
+    }
 }
 
 #include "markerdialog.moc"