X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmarkerdialog.cpp;h=f86de6a7eb7dd1f891f554046e7899d173ca93fa;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=de34f80c55e8279d5cd3fc3e9839d83265d7f9ae;hpb=12ec352602795fa2970c71fccab4bad309d817ea;p=kdenlive

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index de34f80c..f86de6a7 100644
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -17,37 +17,60 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QWheelEvent>
-#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, const CommentedTime &t, const Timecode &tc, const QString &caption, QWidget * parent)
+    : QDialog(parent)
+    , m_producer(NULL)
+    , m_profile(NULL)
+    , m_clip(clip)
+    , m_dar(4.0 / 3.0)
+{
     setFont(KGlobalSettings::toolBarFont());
-    m_fps = m_tc.fps();
-    m_view.setupUi(this);
+    setupUi(this);
+    setWindowTitle(caption);
+
+    // Set  up categories
+    for (int i = 0; i < 5; ++i) {
+        marker_type->insertItem(i, i18n("Category %1", i));
+        marker_type->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole);
+    }
+    marker_type->setCurrentIndex(t.markerType());
+
+    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());
         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 = Kdenlive::DefaultThumbHeight * m_dar;
+        if (width % 2 == 1) width++;
+        QPixmap p(width, 100);
         QString colour = clip->getProperty("colour");
+        int swidth = (int) (Kdenlive::DefaultThumbHeight * m_profile->width() / m_profile->height() + 0.5);
+
         switch (m_clip->clipType()) {
         case VIDEO:
         case AV:
@@ -56,7 +79,8 @@ 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);
+            m_image = KThumb::getFrame(m_producer, m_in->getValue(), swidth, width, Kdenlive::DefaultThumbHeight);
+            p = QPixmap::fromImage(m_image);
             break;
         case COLOR:
             colour = colour.replace(0, 2, "#");
@@ -65,64 +89,59 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, QWid
         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);
+            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);
-
-    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()));
+        connect(m_in, SIGNAL(timeCodeEditingFinished()), this, SIGNAL(updateThumb()));
+    } else {
+        clip_thumb->setHidden(true);
+        label_category->setHidden(true);
+        marker_type->setHidden(true);
+    }
 
-    m_view.marker_comment->selectAll();
-    m_view.marker_comment->setFocus();
+    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";
+    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++;
+
+    m_image = KThumb::getFrame(m_producer, pos, swidth, width, 100);
+    const QPixmap p = QPixmap::fromImage(m_image);
+    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 (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));
+QImage MarkerDialog::markerImage() const
+{
+    return m_image;
 }
 
-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));
-}
-
-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 (m_view.marker_position->underMouse() || m_view.clip_thumb->underMouse()) {
-        if (event->delta() > 0)
-            slotTimeUp();
-        else
-            slotTimeDown();
-    }
+CommentedTime MarkerDialog::newMarker()
+{
+    KdenliveSettings::setDefault_marker_type(marker_type->currentIndex());
+    return CommentedTime(m_in->gentime(), marker_comment->text(), marker_type->currentIndex());
 }
 
 #include "markerdialog.moc"