X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=905cad4a4403c14009328b156095eec9352e3204;hb=87e34435cbb42c67c699b0539b5b0d93a4f9ebf9;hp=4cf150df7ac76e303fc5b3e396d39c669bb67c82;hpb=fefb8e4376d675868a11c438f18c1a059d0cfced;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 4cf150df..905cad4a 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -59,7 +59,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget m_selectedClip(NULL), m_loopClipTransition(true), m_editMarker(NULL) - { QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); @@ -156,7 +155,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget createOpenGlWidget(m_videoBox, profile); monitorCreated = true; //m_glWidget->setFixedSize(width, height); -#elif defined (USE_OPEN_GL) +#elif defined(USE_OPENGL) if (KdenliveSettings::openglmonitors()) { monitorCreated = createOpenGlWidget(m_videoBox, profile); } @@ -170,7 +169,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget render = new Render(m_name, (int) m_monitorRefresh->winId(), profile, this); m_monitorRefresh->setRenderer(render); } -#if defined (USE_OPEN_GL) +#ifdef USE_OPENGL else if (m_glWidget) { lay->addWidget(m_glWidget); m_videoBox->setLayout(lay); @@ -230,7 +229,7 @@ const QString Monitor::name() const return m_name; } -#if defined(Q_WS_MAC) || defined(USE_OPEN_GL) +#ifdef USE_OPENGL bool Monitor::createOpenGlWidget(QWidget *parent, const QString profile) { render = new Render(m_name, 0, profile, this); @@ -429,7 +428,7 @@ void Monitor::slotZoneMoved(int start, int end) void Monitor::slotSetZoneStart() { - m_ruler->setZone(render->seekFramePosition(), -1); + m_ruler->setZone(m_ruler->position(), -1); emit zoneUpdated(m_ruler->zone()); checkOverlay(); setClipZone(m_ruler->zone()); @@ -437,7 +436,7 @@ void Monitor::slotSetZoneStart() void Monitor::slotSetZoneEnd() { - m_ruler->setZone(-1, render->seekFramePosition()); + m_ruler->setZone(-1, m_ruler->position()); emit zoneUpdated(m_ruler->zone()); checkOverlay(); setClipZone(m_ruler->zone()); @@ -456,6 +455,13 @@ void Monitor::mousePressEvent(QMouseEvent * event) } } +void Monitor::resizeEvent(QResizeEvent *event) +{ + Q_UNUSED(event); + if (render && isVisible() && isActive()) render->doRefresh(); +} + + void Monitor::slotSwitchFullScreen() { m_videoBox->switchFullScreen(); @@ -543,7 +549,7 @@ void Monitor::slotMouseSeek(int eventDelta, bool fast) if (fast) { int delta = m_monitorManager->timecode().fps(); if (eventDelta > 0) delta = 0 - delta; - slotSeek(render->seekFramePosition() - delta); + slotSeek(m_ruler->position() - delta); } else { if (eventDelta >= 0) slotForwardOneFrame(); else slotRewindOneFrame(); @@ -588,9 +594,9 @@ bool Monitor::isActive() const return m_monitorManager->isActive(m_name); } -void Monitor::activateMonitor() +bool Monitor::activateMonitor() { - m_monitorManager->activateMonitor(m_name); + return m_monitorManager->activateMonitor(m_name); } void Monitor::setTimePos(const QString &pos) @@ -606,15 +612,15 @@ void Monitor::slotSeek() void Monitor::slotSeek(int pos) { - //activateMonitor(); if (render == NULL) return; + activateMonitor(); render->seekToFrame(pos); } void Monitor::checkOverlay() { if (m_overlay == NULL) return; - int pos = render->seekFramePosition(); + int pos = m_ruler->position(); QPoint zone = m_ruler->zone(); if (pos == zone.x()) m_overlay->setOverlayText(i18n("In Point")); @@ -712,9 +718,6 @@ void Monitor::rendererStopped(int pos) checkOverlay(); m_timePos->setValue(pos); } - disconnect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); - //m_playAction->setChecked(false); - connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); m_playAction->setIcon(m_playIcon); } @@ -736,6 +739,7 @@ void Monitor::stop() void Monitor::start() { + if (!isVisible()) return; if (render) render->start(); connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); } @@ -743,8 +747,10 @@ void Monitor::start() void Monitor::refreshMonitor(bool visible) { if (visible && render) { - activateMonitor(); - render->doRefresh(); //askForRefresh(); + if (!activateMonitor()) { + // the monitor was already active, simply refreshClipThumbnail + render->doRefresh(); + } } } @@ -768,12 +774,10 @@ void Monitor::slotPlay() { if (render == NULL) return; activateMonitor(); - if (render->playSpeed() == 0) { - //m_playAction->setChecked(true); + if (render->playSpeed() == 0.0) { m_playAction->setIcon(m_pauseIcon); render->switchPlay(true); } else { - //m_playAction->setChecked(false); m_playAction->setIcon(m_playIcon); render->switchPlay(false); } @@ -809,24 +813,40 @@ void Monitor::slotLoopClip() m_playAction->setIcon(m_pauseIcon); } -void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position) +void Monitor::updateClipProducer(Mlt::Producer *prod) +{ + if (render == NULL) return; + render->setProducer(prod, render->seekFramePosition()); +} + +void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, int position) { if (render == NULL) return; if (clip == NULL && m_currentClip != NULL) { + kDebug()<<"// SETTING NULL CLIP MONITOR"; m_currentClip = NULL; m_length = -1; render->setProducer(NULL, -1); return; } - if (m_currentClip != NULL || clip != NULL) activateMonitor(); + if (clip != m_currentClip) { m_currentClip = clip; + if (m_currentClip) activateMonitor(); updateMarkers(clip); - if (render->setProducer(clip->producer(), position) == -1) { + Mlt::Producer *prod = NULL; + if (clip) prod = clip->getCloneProducer(); + if (render->setProducer(prod, position) == -1) { // MLT CONSUMER is broken kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; } - } else if (position != -1) render->seek(position); + } else { + if (m_currentClip) { + activateMonitor(); + if (position == -1) position = render->seekFramePosition(); + render->seek(position); + } + } if (!zone.isNull()) { m_ruler->setZone(zone.x(), zone.y()); render->seek(zone.x()); @@ -850,12 +870,12 @@ void Monitor::slotOpenFile(const QString &file) void Monitor::slotSaveZone() { if (render == NULL) return; - emit saveZone(render, m_ruler->zone()); + emit saveZone(render, m_ruler->zone(), m_currentClip); //render->setSceneList(doc, 0); } -void Monitor::resetProfile(const QString profile) +void Monitor::resetProfile(const QString &profile) { m_timePos->updateTimeCode(m_monitorManager->timecode()); if (render == NULL) return; @@ -894,7 +914,7 @@ void Monitor::slotSwitchMonitorInfo(bool show) if (m_overlay) return; if (m_monitorRefresh == NULL) { // Using OpenGL display -#if defined(Q_WS_MAC) || defined(USE_OPEN_GL) +#ifdef USE_OPENGL if (m_glWidget->layout()) delete m_glWidget->layout(); m_overlay = new Overlay(); connect(m_overlay, SIGNAL(editMarker()), this, SLOT(slotEditMarker())); @@ -974,7 +994,7 @@ void Monitor::slotEffectScene(bool show) if (m_monitorRefresh) { m_monitorRefresh->setVisible(!show); } else { -#if defined(Q_WS_MAC) || defined(USE_OPEN_GL) +#ifdef USE_OPENGL m_glWidget->setVisible(!show); #endif } @@ -1041,11 +1061,6 @@ void MonitorRefresh::setRenderer(Render* render) m_renderer = render; } -void MonitorRefresh::paintEvent(QPaintEvent *event) -{ - Q_UNUSED(event) - if (m_renderer) m_renderer->doRefresh(); -} Overlay::Overlay(QWidget* parent) : QLabel(parent)