X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=cbd94d7e1c11d68359bb4405d8b543bf855036b9;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=a35ff711ed9149f958b92fa51d3f1c8f16c29123;hpb=b94d740d404a3528c7d93a5ea2c734d9a092d78a;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index a35ff711..cbd94d7e 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -41,27 +42,29 @@ #include #include #include +#include #define SEEK_INACTIVE (-1) Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profile, QWidget *parent) : - AbstractMonitor(id, manager, parent), - render(NULL), - m_currentClip(NULL), - m_overlay(NULL), - m_scale(1), - m_length(2), - m_dragStarted(false), - m_contextMenu(NULL), - m_effectWidget(NULL), - m_selectedClip(NULL), - m_loopClipTransition(true), + AbstractMonitor(id, manager, parent) + , render(NULL) + , m_currentClip(NULL) + , m_overlay(NULL) + , m_scale(1) + , m_length(2) + , m_dragStarted(false) + , m_loopClipAction(NULL) + , m_contextMenu(NULL) + , m_effectWidget(NULL) + , m_selectedClip(NULL) + , m_loopClipTransition(true) #ifdef USE_OPENGL - m_glWidget(NULL), + , m_glWidget(NULL) #endif - m_editMarker(NULL) + , m_editMarker(NULL) { QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); @@ -118,7 +121,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil m_markerMenu = new QMenu(i18n("Go to marker..."), this); m_markerMenu->setEnabled(false); m_configMenu->addMenu(m_markerMenu); - connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *))); + connect(m_markerMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotGoToMarker(QAction*))); } m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne())); m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo())); @@ -146,7 +149,8 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil setLayout(layout); setMinimumHeight(200); - if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + if (profile.isEmpty()) + profile = KdenliveSettings::current_profile(); bool monitorCreated = false; #ifdef Q_WS_MAC @@ -173,7 +177,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil #endif // Monitor ruler - m_ruler = new SmallRuler(m_monitorManager, render); + m_ruler = new SmallRuler(this, render); if (id == Kdenlive::dvdMonitor) m_ruler->setZone(-3, -2); layout->addWidget(m_ruler); @@ -194,7 +198,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil if (id == Kdenlive::projectMonitor) { m_effectWidget = new MonitorEditWidget(render, videoBox); - connect(m_effectWidget, SIGNAL(showEdit(bool, bool)), this, SLOT(slotShowEffectScene(bool, bool))); + connect(m_effectWidget, SIGNAL(showEdit(bool,bool)), this, SLOT(slotShowEffectScene(bool,bool))); m_toolbar->addAction(m_effectWidget->getVisibilityAction()); videoBox->layout()->addWidget(m_effectWidget); m_effectWidget->hide(); @@ -206,7 +210,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this); m_toolbar->addWidget(m_timePos); connect(m_timePos, SIGNAL(timeCodeEditingFinished()), this, SLOT(slotSeek())); - m_toolbar->setMaximumHeight(s * 1.5); + m_toolbar->setMaximumHeight(m_timePos->height()); layout->addWidget(m_toolbar); } @@ -226,7 +230,7 @@ QWidget *Monitor::container() } #ifdef USE_OPENGL -bool Monitor::createOpenGlWidget(QWidget *parent, const QString profile) +bool Monitor::createOpenGlWidget(QWidget *parent, const QString &profile) { render = new Render(id(), 0, profile, this); m_glWidget = new VideoGLWidget(parent); @@ -250,7 +254,7 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe if (markerMenu) { m_contextMenu->addMenu(markerMenu); QList list = markerMenu->actions(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->data().toString() == "edit_marker") { m_editMarker = list.at(i); break; @@ -293,10 +297,9 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe dropFrames->setCheckable(true); dropFrames->setChecked(true); connect(dropFrames, SIGNAL(toggled(bool)), this, SLOT(slotSwitchDropFrames(bool))); - + m_configMenu->addAction(showTips); m_configMenu->addAction(dropFrames); - } void Monitor::slotGoToMarker(QAction *action) @@ -350,6 +353,16 @@ void Monitor::resetSize() videoBox->setMinimumSize(0, 0); } +QString Monitor::getTimecodeFromFrames(int pos) +{ + return m_monitorManager->timecode().getTimecodeFromFrames(pos); +} + +double Monitor::fps() const +{ + return m_monitorManager->timecode().fps(); +} + DocClipBase *Monitor::activeClip() { return m_currentClip; @@ -362,7 +375,7 @@ void Monitor::updateMarkers(DocClipBase *source) QList markers = m_currentClip->commentedSnapMarkers(); if (!markers.isEmpty()) { QList marks; - for (int i = 0; i < markers.count(); i++) { + for (int i = 0; i < markers.count(); ++i) { int pos = (int) markers.at(i).time().frames(m_monitorManager->timecode().fps()); marks.append(pos); QString position = m_monitorManager->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment(); @@ -375,6 +388,11 @@ void Monitor::updateMarkers(DocClipBase *source) } } +void Monitor::setMarkers(const QList &markers) +{ + m_ruler->setMarkers(markers); +} + void Monitor::slotSeekToPreviousSnap() { if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps())); @@ -443,6 +461,7 @@ void Monitor::slotSetZoneEnd() // virtual void Monitor::mousePressEvent(QMouseEvent * event) { + if (render) render->setActiveMonitor(); if (event->button() != Qt::RightButton) { if (videoBox->geometry().contains(event->pos()) && (!m_overlay || !m_overlay->underMouse())) { m_dragStarted = true; @@ -593,13 +612,13 @@ void Monitor::slotExtractCurrentFrame() fs->setMode(KFile::File); fs->setConfirmOverwrite(true); fs->setKeepLocation(true); - fs->exec(); - QString path; - if (fs) path = fs->selectedFile(); - delete fs; - if (!path.isEmpty()) { - frame.save(path); + if (fs->exec()) { + QString path = fs->selectedFile(); + if (!path.isEmpty()) { + frame.save(path); + } } + delete fs; } void Monitor::setTimePos(const QString &pos) @@ -855,7 +874,7 @@ void Monitor::slotLoopClip() void Monitor::updateClipProducer(Mlt::Producer *prod) { if (render == NULL) return; - render->setProducer(prod, render->seekFramePosition()); + render->setProducer(prod, render->seekFramePosition()); } void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpdate, int position) @@ -863,7 +882,6 @@ void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpda if (render == NULL) return; if (clip == NULL && m_currentClip != NULL) { m_currentClip->lastSeekPosition = render->seekFramePosition(); - kDebug()<<"// SETTING NULL CLIP MONITOR"; m_currentClip = NULL; m_length = -1; render->setProducer(NULL, -1); @@ -880,12 +898,17 @@ void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpda if (render->setProducer(prod, position) == -1) { // MLT CONSUMER is broken kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; - } + } else start(); } else { if (m_currentClip) { slotActivateMonitor(); if (position == -1) position = render->seekFramePosition(); render->seek(position); + if (zone.isNull()) { + zone = m_currentClip->zone(); + m_ruler->setZone(zone.x(), zone.y()); + return; + } } } if (!zone.isNull()) { @@ -929,7 +952,7 @@ void Monitor::resetProfile(const QString &profile) if (!render->hasProfile(profile)) { slotActivateMonitor(); render->resetProfile(profile); -#ifdef USE_OPENGL +#ifdef USE_OPENGL if (m_glWidget) m_glWidget->setImageAspectRatio(render->dar()); #endif } @@ -937,7 +960,7 @@ void Monitor::resetProfile(const QString &profile) m_effectWidget->resetProfile(render); } -void Monitor::saveSceneList(QString path, QDomElement info) +void Monitor::saveSceneList(const QString &path, const QDomElement &info) { if (render == NULL) return; render->saveSceneList(path, info); @@ -949,7 +972,7 @@ const QString Monitor::sceneList() return render->sceneList(); } -void Monitor::setClipZone(QPoint pos) +void Monitor::setClipZone(const QPoint &pos) { if (m_currentClip == NULL) return; m_currentClip->setZone(pos); @@ -1017,10 +1040,10 @@ QStringList Monitor::getZoneInfo() const void Monitor::slotSetSelectedClip(AbstractClipItem* item) { if (item) { - m_loopClipAction->setEnabled(true); + if (m_loopClipAction) m_loopClipAction->setEnabled(true); m_selectedClip = item; } else { - m_loopClipAction->setEnabled(false); + if (m_loopClipAction) m_loopClipAction->setEnabled(false); } } @@ -1128,6 +1151,16 @@ void Monitor::reloadProducer(const QString &id) slotSetClipProducer(m_currentClip, m_currentClip->zone(), true); } +QString Monitor::getMarkerThumb(GenTime pos) +{ + if (!m_currentClip) return QString(); + if (!m_currentClip->getClipHash().isEmpty()) { + QString url = m_monitorManager->getProjectFolder() + "thumbs/" + m_currentClip->getClipHash() + '#' + QString::number((int) pos.frames(m_monitorManager->timecode().fps())) + ".png"; + if (QFile::exists(url)) return url; + } + return QString(); +} + void Monitor::setPalette ( const QPalette & p) { QWidget::setPalette(p);