X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmarkerdialog.cpp;h=1eb48042acb6d621f2ec2de653b21c9f8f4c9218;hb=c24658bd34221d735f0641c924b890e1a6be7101;hp=8b7516b7fddb5a45df8a15f3681d11ea221055d7;hpb=a67e3b0ffffda4c6c6098cd7cb1b889a29f15d3d;p=kdenlive diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp index 8b7516b7..1eb48042 100644 --- a/src/markerdialog.cpp +++ b/src/markerdialog.cpp @@ -18,101 +18,132 @@ ***************************************************************************/ -#include - #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 +#include + + +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); - 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; - 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 = QPixmap(m_view.clip_thumb->width(), m_view.clip_thumb->height()); - p.fill(QColor(colour.left(7))); - break; - default: - p = QPixmap(m_view.clip_thumb->width(), m_view.clip_thumb->height()); - p.fill(Qt::black); + // 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); } - if (!p.isNull()) { - m_view.clip_thumb->setFixedWidth(p.width()); - m_view.clip_thumb->setFixedHeight(p.height()); - m_view.clip_thumb->setPixmap(p); + 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 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 = 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: + case SlideShow: + case Playlist: + connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start())); + break; + case Image: + case Text: + 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, "#"); + p.fill(QColor(colour.left(7))); + break; + //UNKNOWN, AUDIO, VIRTUAL: + 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(timeCodeEditingFinished()), this, SIGNAL(updateThumb())); + } else { + clip_thumb->setHidden(true); + label_category->setHidden(true); + marker_type->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); - kDebug() << "// getting thumb for: " << pos; - 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)); + 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::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)); +QImage MarkerDialog::markerImage() const +{ + return m_image; } -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() +{ + KdenliveSettings::setDefault_marker_type(marker_type->currentIndex()); + return CommentedTime(m_in->gentime(), marker_comment->text(), marker_type->currentIndex()); } #include "markerdialog.moc"