X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=f61ba571a94801d07f59beebd0de59d141d2dffc;hb=ec00934b188e717301b9fe2477f9a0993f5fb982;hp=ba4e8f53d1e46849956fd727866a94d075f45be3;hpb=f20225e0078b03502709b4bee99563cd5593ee75;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index ba4e8f53..f61ba571 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -23,7 +23,10 @@ #include "monitormanager.h" #include "smallruler.h" #include "docclipbase.h" +#include "monitorscene.h" +#include "abstractclipitem.h" #include "kdenlivesettings.h" +#include "audiosignal.h" #include #include @@ -39,20 +42,27 @@ #include #include #include +#include +#include Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) : - QWidget(parent), - render(NULL), - m_name(name), - m_monitorManager(manager), - m_currentClip(NULL), - m_ruler(new SmallRuler(m_monitorManager)), - m_overlay(NULL), - m_isActive(false), - m_scale(1), - m_length(0), - m_dragStarted(false) + QWidget(parent), + render(NULL), + m_audiosignal(NULL), + m_name(name), + m_monitorManager(manager), + m_currentClip(NULL), + m_ruler(new SmallRuler(m_monitorManager)), + m_overlay(NULL), + m_isActive(false), + m_scale(1), + m_length(0), + m_dragStarted(false), + m_effectScene(NULL), + m_effectView(NULL), + m_selectedClip(NULL), + m_loopClipTransition(true) { m_ui.setupUi(this); QVBoxLayout *layout = new QVBoxLayout; @@ -71,10 +81,12 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget if (name != "chapter") { toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart())); toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd())); - } else m_ruler->setZone(-3, -2); + } else { + m_ruler->setZone(-3, -2); + } toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind())); - toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); + //toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); QToolButton *playButton = new QToolButton(toolbar); m_playMenu = new QMenu(i18n("Play..."), this); @@ -86,7 +98,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget playButton->setPopupMode(QToolButton::MenuButtonPopup); toolbar->addWidget(playButton); - toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame())); + //toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame())); toolbar->addAction(KIcon("media-seek-forward"), i18n("Forward"), this, SLOT(slotForward())); playButton->setDefaultAction(m_playAction); @@ -112,15 +124,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget QWidget *spacer = new QWidget(this); spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); toolbar->addWidget(spacer); - m_timePos = new KRestrictedLine(this); - m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); - m_frametimecode = KdenliveSettings::frametimecode(); - if (m_frametimecode) { - m_timePos->setInputMask(QString()); - m_timePos->setValidator(new QIntValidator(this)); - } else m_timePos->setInputMask("99:99:99:99"); + m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this); toolbar->addWidget(m_timePos); - connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); layout2->addWidget(toolbar); @@ -149,6 +154,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, profile, this); m_monitorRefresh->setRenderer(render); #endif + m_audiosignal= new AudioSignal(this); + rendererBox->addWidget(m_audiosignal); + connect(render, SIGNAL(showAudioSignal(QByteArray)), m_audiosignal, SLOT(showAudio(QByteArray))); connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int))); connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int))); @@ -166,6 +174,18 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget #ifndef Q_WS_MAC m_monitorRefresh->show(); #endif + + if (name == "project") { + m_effectScene = new MonitorScene(render); + m_effectView = new QGraphicsView(m_effectScene, m_ui.video_frame); + m_effectView->setRenderHints(QFlags()); + m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0); + rendererBox->addWidget(m_effectView); + m_effectView->setMouseTracking(true); + m_effectScene->setUp(); + m_effectView->hide(); + } + kDebug() << "/////// BUILDING MONITOR, ID: " << m_ui.video_frame->winId(); } @@ -174,6 +194,10 @@ Monitor::~Monitor() delete m_ruler; delete m_timePos; delete m_overlay; + if (m_name == "project") { + delete m_effectView; + delete m_effectScene; + } delete m_monitorRefresh; delete render; } @@ -183,15 +207,21 @@ QString Monitor::name() const return m_name; } -void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu) +void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu, QAction *loopClip) { m_contextMenu = new QMenu(this); m_contextMenu->addMenu(m_playMenu); - if (goMenu) m_contextMenu->addMenu(goMenu); - if (markerMenu) m_contextMenu->addMenu(markerMenu); + if (goMenu) + m_contextMenu->addMenu(goMenu); + if (markerMenu) + m_contextMenu->addMenu(markerMenu); m_playMenu->addAction(playZone); m_playMenu->addAction(loopZone); + if (loopClip) { + m_loopClipAction = loopClip; + m_playMenu->addAction(loopClip); + } //TODO: add save zone to timeline monitor when fixed if (m_name == "clip") { @@ -345,8 +375,6 @@ GenTime Monitor::getSnapForPos(bool previous) return GenTime(); } - - void Monitor::slotZoneMoved(int start, int end) { m_ruler->setZone(start, end); @@ -385,7 +413,7 @@ void Monitor::mousePressEvent(QMouseEvent * event) void Monitor::mouseReleaseEvent(QMouseEvent * event) { if (m_dragStarted) { - if (m_ui.video_frame->underMouse()) { + if (m_ui.video_frame->underMouse() && (!m_effectView || !m_effectView->isVisible())) { if (isActive()) slotPlay(); else activateMonitor(); } else QWidget::mouseReleaseEvent(event); @@ -393,7 +421,6 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) } } - // virtual void Monitor::mouseMoveEvent(QMouseEvent *event) { @@ -452,16 +479,7 @@ QStringList Monitor::mimeTypes() const return qstrList; } - // virtual -/** Move to other position on mousewheel - * - * Moves towards end of clip/timeline on mousewheel down/back, - * opposite for mousewheel up/forward. - * - * Ctrl+wheel moves single frame, without Ctrl moves a second. - * - * See also http://www.kdenlive.org/mantis/view.php?id=265 */ void Monitor::wheelEvent(QWheelEvent * event) { if (event->modifiers() == Qt::ControlModifier) { @@ -509,26 +527,19 @@ bool Monitor::isActive() const void Monitor::activateMonitor() { if (!m_isActive) { - m_monitorManager->slotSwitchMonitors(); + m_monitorManager->slotSwitchMonitors(m_name == "clip"); } } void Monitor::setTimePos(const QString &pos) { - if (m_frametimecode) { - int frames = m_monitorManager->timecode().getFrameCount(pos); - m_timePos->setText(QString::number(frames)); - } else m_timePos->setText(pos); + m_timePos->setValue(pos); slotSeek(); } void Monitor::slotSeek() { - int frames; - if (m_frametimecode) frames = m_timePos->text().toInt(); - else frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); - //kDebug() << "// / / SEEK TO: " << frames; - slotSeek(frames); + slotSeek(m_timePos->getValue()); } void Monitor::slotSeek(int pos) @@ -536,7 +547,6 @@ void Monitor::slotSeek(int pos) activateMonitor(); if (render == NULL) return; render->seekToFrame(pos); - emit renderPosition(render->seekFramePosition()); } void Monitor::checkOverlay() @@ -544,13 +554,17 @@ void Monitor::checkOverlay() if (m_overlay == NULL) return; int pos = render->seekFramePosition(); QPoint zone = m_ruler->zone(); - if (pos == zone.x()) m_overlay->setOverlayText(i18n("In Point")); - else if (pos == zone.y()) m_overlay->setOverlayText(i18n("Out Point")); + if (pos == zone.x()) + m_overlay->setOverlayText(i18n("In Point")); + else if (pos == zone.y()) + m_overlay->setOverlayText(i18n("Out Point")); else { if (m_currentClip) { QString markerComment = m_currentClip->markerComment(GenTime(pos, m_monitorManager->timecode().fps())); - if (markerComment.isEmpty()) m_overlay->setHidden(true); - else m_overlay->setOverlayText(markerComment, false); + if (markerComment.isEmpty()) + m_overlay->setHidden(true); + else + m_overlay->setOverlayText(markerComment, false); } else m_overlay->setHidden(true); } } @@ -560,7 +574,6 @@ void Monitor::slotStart() activateMonitor(); render->play(0); render->seekToFrame(0); - //emit renderPosition(0); } void Monitor::slotEnd() @@ -568,7 +581,6 @@ void Monitor::slotEnd() activateMonitor(); render->play(0); render->seekToFrame(render->getLength()); - //emit renderPosition(render->seekFramePosition()); } void Monitor::slotZoneStart() @@ -576,7 +588,6 @@ void Monitor::slotZoneStart() activateMonitor(); render->play(0); render->seekToFrame(m_ruler->zone().x()); - emit renderPosition(render->seekFramePosition()); } void Monitor::slotZoneEnd() @@ -584,7 +595,6 @@ void Monitor::slotZoneEnd() activateMonitor(); render->play(0); render->seekToFrame(m_ruler->zone().y()); - emit renderPosition(render->seekFramePosition()); } void Monitor::slotRewind(double speed) @@ -616,7 +626,6 @@ void Monitor::slotRewindOneFrame(int diff) activateMonitor(); render->play(0); render->seekToFrameDiff(-diff); - emit renderPosition(render->seekFramePosition()); } void Monitor::slotForwardOneFrame(int diff) @@ -624,7 +633,6 @@ void Monitor::slotForwardOneFrame(int diff) activateMonitor(); render->play(0); render->seekToFrameDiff(diff); - emit renderPosition(render->seekFramePosition()); } void Monitor::seekCursor(int pos) @@ -632,24 +640,15 @@ void Monitor::seekCursor(int pos) activateMonitor(); if (m_ruler->slotNewValue(pos)) { checkOverlay(); - if (m_frametimecode) m_timePos->setText(QString::number(pos)); - else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + m_timePos->setValue(pos); } } void Monitor::rendererStopped(int pos) { - if (m_currentClip != NULL && m_playAction->isChecked()) { - // Clip monitor - if (m_isActive && pos >= m_length - 1) { - slotStart(); - return; - } - } if (m_ruler->slotNewValue(pos)) { checkOverlay(); - if (m_frametimecode) m_timePos->setText(QString::number(pos)); - else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + m_timePos->setValue(pos); } disconnect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); m_playAction->setChecked(false); @@ -745,16 +744,26 @@ void Monitor::slotLoopZone() m_playAction->setIcon(m_pauseIcon); } +void Monitor::slotLoopClip() +{ + if (render == NULL || m_selectedClip == NULL) + return; + activateMonitor(); + render->loopZone(m_selectedClip->startPos(), m_selectedClip->endPos()); + m_playAction->setChecked(true); + m_playAction->setIcon(m_pauseIcon); +} + void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position) { if (render == NULL) return; if (clip == NULL && m_currentClip != NULL) { m_currentClip = NULL; - m_length = -1; + m_length = -1; render->setProducer(NULL, -1); return; } - if (m_currentClip != NULL) activateMonitor(); + if (m_currentClip != NULL || clip != NULL) activateMonitor(); if (clip != m_currentClip) { m_currentClip = clip; updateMarkers(clip); @@ -791,11 +800,15 @@ void Monitor::slotSaveZone() //render->setSceneList(doc, 0); } - void Monitor::resetProfile(const QString profile) { + m_timePos->updateTimeCode(m_monitorManager->timecode()); if (render == NULL) return; render->resetProfile(profile); + if (m_effectScene) { + m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0); + m_effectScene->resetProfile(); + } } void Monitor::saveSceneList(QString path, QDomElement info) @@ -810,7 +823,6 @@ const QString Monitor::sceneList() return render->sceneList(); } - void Monitor::setClipZone(QPoint pos) { if (m_currentClip == NULL) return; @@ -842,18 +854,7 @@ void Monitor::slotSwitchMonitorInfo(bool show) void Monitor::updateTimecodeFormat() { - m_frametimecode = KdenliveSettings::frametimecode(); - if (m_frametimecode) { - int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); - m_timePos->setValidator(new QIntValidator(this)); - m_timePos->setInputMask(QString()); - m_timePos->setText(QString::number(frames)); - } else { - int pos = m_timePos->text().toInt(); - m_timePos->setValidator(0); - m_timePos->setInputMask("99:99:99:99"); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); - } + m_timePos->slotUpdateTimeCodeFormat(); } QStringList Monitor::getZoneInfo() const @@ -866,10 +867,63 @@ QStringList Monitor::getZoneInfo() const return result; } +void Monitor::slotSetSelectedClip(AbstractClipItem* item) +{ + if (item) { + m_loopClipAction->setEnabled(true); + m_selectedClip = item; + } else { + m_loopClipAction->setEnabled(false); + } +} -MonitorRefresh::MonitorRefresh(QWidget* parent) : \ - QWidget(parent), - m_renderer(NULL) +void Monitor::slotSetSelectedClip(ClipItem* item) +{ + if (item || (!item && !m_loopClipTransition)) { + m_loopClipTransition = false; + slotSetSelectedClip((AbstractClipItem*)item); + } +} + +void Monitor::slotSetSelectedClip(Transition* item) +{ + if (item || (!item && m_loopClipTransition)) { + m_loopClipTransition = true; + slotSetSelectedClip((AbstractClipItem*)item); + } +} + + +void Monitor::slotEffectScene(bool show) +{ + if (m_name == "project") { +#ifdef Q_WS_MAC + m_glWidget->setVisible(!show); +#else + m_monitorRefresh->setVisible(!show); +#endif + m_effectView->setVisible(show); + emit requestFrameForAnalysis(show); + if (show) { + render->doRefresh(); + m_effectScene->slotZoomFit(); + } + } +} + +MonitorScene * Monitor::getEffectScene() +{ + return m_effectScene; +} + +bool Monitor::effectSceneDisplayed() +{ + return m_effectView->isVisible(); +} + +MonitorRefresh::MonitorRefresh(QWidget* parent) : + QWidget(parent), + m_renderer(NULL) { setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_OpaquePaintEvent); @@ -881,38 +935,31 @@ void MonitorRefresh::setRenderer(Render* render) m_renderer = render; } -void MonitorRefresh::paintEvent(QPaintEvent * /*event*/) +void MonitorRefresh::paintEvent(QPaintEvent *event) { + Q_UNUSED(event); if (m_renderer) m_renderer->doRefresh(); } - Overlay::Overlay(QWidget* parent) : - QLabel(parent) + QLabel(parent) { setAttribute(Qt::WA_TransparentForMouseEvents); - setAttribute(Qt::WA_OpaquePaintEvent); + //setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); - setAutoFillBackground(false); + setAutoFillBackground(true); + setBackgroundRole(QPalette::Base); } -void Overlay::paintEvent(QPaintEvent * /*event*/) -{ - QPainter painter(this); - QColor col; - painter.setPen(Qt::white); - if (m_isZone) col = QColor(200, 0, 0); - else col = QColor(0, 0, 200); - painter.fillRect(rect(), col); - painter.drawText(rect(), Qt::AlignCenter, text()); -} - - - void Overlay::setOverlayText(const QString &text, bool isZone) { setHidden(true); m_isZone = isZone; + QPalette p; + p.setColor(QPalette::Text, Qt::white); + if (m_isZone) p.setColor(QPalette::Base, QColor(200, 0, 0)); + else p.setColor(QPalette::Base, QColor(0, 0, 200)); + setPalette(p); setText(' ' + text + ' '); setHidden(false); update();