X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=3242e71eaa53bdd50d034c971279f90538085884;hb=2a899d6e8593fed7dfe4b42e55b3004dbc94bbdb;hp=18555e1ba54df7d6fa15b22bb5690d3e31bccc85;hpb=f41ee253ade9dfda45752f232ea0ff35e26dce95;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 18555e1b..3242e71e 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -43,11 +43,13 @@ #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_ruler(new SmallRuler(m_monitorManager)), m_overlay(NULL), m_scale(1), m_length(0), @@ -69,8 +71,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil // Get base size for icons int s = style()->pixelMetric(QStyle::PM_SmallIconSize); - // Monitor ruler - layout->addWidget(m_ruler); + // Tool bar buttons m_toolbar = new QToolBar(this); m_toolbar->setIconSize(QSize(s, s)); @@ -78,11 +79,10 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil m_playIcon = KIcon("media-playback-start"); m_pauseIcon = KIcon("media-playback-pause"); + if (id != Kdenlive::dvdMonitor) { m_toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart())); m_toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd())); - } else { - m_ruler->setZone(-3, -2); } m_toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind())); @@ -169,8 +169,12 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil } #endif + // Monitor ruler + m_ruler = new SmallRuler(m_monitorManager, render); + if (id == Kdenlive::dvdMonitor) m_ruler->setZone(-3, -2); + layout->addWidget(m_ruler); + connect(m_audioSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetVolume(int))); - connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int))); connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int))); connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int))); connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); @@ -187,7 +191,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)), this, SLOT(slotShowEffectScene(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(); @@ -198,7 +202,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil m_toolbar->addWidget(spacer); m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this); m_toolbar->addWidget(m_timePos); - connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); + connect(m_timePos, SIGNAL(timeCodeEditingFinished()), this, SLOT(slotSeek())); m_toolbar->setMaximumHeight(s * 1.5); layout->addWidget(m_toolbar); } @@ -222,6 +226,7 @@ QWidget *Monitor::container() bool Monitor::createOpenGlWidget(QWidget *parent, const QString profile) { render = new Render(id(), 0, profile, this); + kDebug()<<"+++++++++++++\nCREATED OPENGL WIDG\n++++++++++++++"; m_glWidget = new VideoGLWidget(parent); if (m_glWidget == NULL) { // Creation failed, we are in trouble... @@ -362,8 +367,8 @@ void Monitor::updateMarkers(DocClipBase *source) QAction *go = m_markerMenu->addAction(position); go->setData(pos); } - m_ruler->setMarkers(marks); - } else m_ruler->setMarkers(QList ()); + } + m_ruler->setMarkers(markers); m_markerMenu->setEnabled(!m_markerMenu->isEmpty()); } } @@ -419,7 +424,7 @@ void Monitor::slotZoneMoved(int start, int end) void Monitor::slotSetZoneStart() { - m_ruler->setZone(m_ruler->position(), -1); + m_ruler->setZoneStart(); emit zoneUpdated(m_ruler->zone()); checkOverlay(); setClipZone(m_ruler->zone()); @@ -427,7 +432,7 @@ void Monitor::slotSetZoneStart() void Monitor::slotSetZoneEnd() { - m_ruler->setZone(-1, m_ruler->position()); + m_ruler->setZoneEnd(); emit zoneUpdated(m_ruler->zone()); checkOverlay(); setClipZone(m_ruler->zone()); @@ -546,7 +551,9 @@ void Monitor::slotMouseSeek(int eventDelta, bool fast) if (fast) { int delta = m_monitorManager->timecode().fps(); if (eventDelta > 0) delta = 0 - delta; - slotSeek(m_ruler->position() - delta); + if (render->requestedSeekPosition != SEEK_INACTIVE) + slotSeek(render->requestedSeekPosition - delta); + else slotSeek(render->seekFramePosition() - delta); } else { if (eventDelta >= 0) slotForwardOneFrame(); else slotRewindOneFrame(); @@ -577,13 +584,14 @@ void Monitor::slotExtractCurrentFrame() frame = render->extractFrame(render->seekFramePosition(), m_currentClip->fileURL().path()); } else frame = render->extractFrame(render->seekFramePosition()); - KFileDialog *fs = new KFileDialog(KUrl(), "image/png", this); + QPointer fs = new KFileDialog(KUrl(), "image/png", this); fs->setOperationMode(KFileDialog::Saving); fs->setMode(KFile::File); fs->setConfirmOverwrite(true); fs->setKeepLocation(true); fs->exec(); - QString path = fs->selectedFile(); + QString path; + if (fs) path = fs->selectedFile(); delete fs; if (!path.isEmpty()) { frame.save(path); @@ -606,13 +614,14 @@ void Monitor::slotSeek(int pos) if (render == NULL) return; slotActivateMonitor(); render->seekToFrame(pos); + m_ruler->update(); } void Monitor::checkOverlay() { if (m_overlay == NULL) return; QString overlayText; - int pos = m_ruler->position(); + int pos = render->seekFramePosition(); QPoint zone = m_ruler->zone(); if (pos == zone.x()) overlayText = i18n("In Point"); @@ -664,8 +673,20 @@ void Monitor::slotRewind(double speed) slotActivateMonitor(); if (speed == 0) { double currentspeed = render->playSpeed(); - if (currentspeed >= 0) render->play(-2); - else render->play(currentspeed * 2); + if (currentspeed >= 0) render->play(-1); + else switch((int) currentspeed) { + case -1: + render->play(-2); + break; + case -2: + render->play(-3); + break; + case -3: + render->play(-5); + break; + default: + render->play(-8); + } } else render->play(speed); //m_playAction->setChecked(true); m_playAction->setIcon(m_pauseIcon); @@ -676,8 +697,20 @@ void Monitor::slotForward(double speed) slotActivateMonitor(); if (speed == 0) { double currentspeed = render->playSpeed(); - if (currentspeed <= 1) render->play(2); - else render->play(currentspeed * 2); + if (currentspeed <= 0) render->play(1); + else switch((int) currentspeed) { + case 1: + render->play(2); + break; + case 2: + render->play(3); + break; + case 3: + render->play(5); + break; + default: + render->play(8); + } } else render->play(speed); //m_playAction->setChecked(true); m_playAction->setIcon(m_pauseIcon); @@ -688,6 +721,7 @@ void Monitor::slotRewindOneFrame(int diff) slotActivateMonitor(); render->play(0); render->seekToFrameDiff(-diff); + m_ruler->update(); } void Monitor::slotForwardOneFrame(int diff) @@ -695,11 +729,11 @@ void Monitor::slotForwardOneFrame(int diff) slotActivateMonitor(); render->play(0); render->seekToFrameDiff(diff); + m_ruler->update(); } void Monitor::seekCursor(int pos) { - //slotActivateMonitor(); if (m_ruler->slotNewValue(pos)) { checkOverlay(); m_timePos->setValue(pos); @@ -733,7 +767,7 @@ void Monitor::stop() void Monitor::start() { if (!isVisible() || !isActive()) return; - if (render) render->doRefresh();// start(); + if (render) render->startConsumer(); } void Monitor::refreshMonitor(bool visible) @@ -777,6 +811,7 @@ void Monitor::slotPlay() m_playAction->setIcon(m_playIcon); render->switchPlay(false); } + m_ruler->refreshRuler(); } void Monitor::slotPlayZone() @@ -819,6 +854,7 @@ 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; @@ -827,8 +863,9 @@ void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpda } if (clip != m_currentClip || forceUpdate) { + if (m_currentClip) m_currentClip->lastSeekPosition = render->seekFramePosition(); m_currentClip = clip; - if (m_currentClip) slotActivateMonitor(); + if (position == -1) position = clip->lastSeekPosition; updateMarkers(clip); Mlt::Producer *prod = NULL; if (clip) prod = clip->getCloneProducer(); @@ -987,40 +1024,43 @@ void Monitor::slotSetSelectedClip(Transition* item) } -void Monitor::slotShowEffectScene(bool show) +void Monitor::slotShowEffectScene(bool show, bool manuallyTriggered) { if (m_id == Kdenlive::projectMonitor) { - if (!m_effectWidget->getVisibilityAction()->isChecked()) show = false; - if (m_effectWidget->isVisible() == show) return; - setUpdatesEnabled(false); - if (show) { - if (videoSurface) { - videoSurface->setVisible(!show); - // Preview is handeled internally through the Render::showFrame method - render->disablePreview(show); - } else { + if (!m_effectWidget->getVisibilityAction()->isChecked()) + show = false; + if (m_effectWidget->isVisible() == show) + return; + setUpdatesEnabled(false); + if (show) { + if (videoSurface) { + videoSurface->setVisible(false); + // Preview is handeled internally through the Render::showFrame method + render->disablePreview(true); #ifdef USE_OPENGL - m_glWidget->setVisible(!show); + } else { + m_glWidget->setVisible(false); #endif - } - m_effectWidget->setVisible(show); + } + m_effectWidget->setVisible(true); m_effectWidget->getScene()->slotZoomFit(); - emit requestFrameForAnalysis(show); - } - else { - m_effectWidget->setVisible(show); - emit requestFrameForAnalysis(show); - if (videoSurface) { - videoSurface->setVisible(!show); - // Preview is handeled internally through the Render::showFrame method - render->disablePreview(show); - } else { + emit requestFrameForAnalysis(true); + } else { + m_effectWidget->setVisible(false); + emit requestFrameForAnalysis(false); + if (videoSurface) { + videoSurface->setVisible(true); + // Preview is handeled internally through the Render::showFrame method + render->disablePreview(false); + #ifdef USE_OPENGL - m_glWidget->setVisible(!show); + } else { + m_glWidget->setVisible(true); #endif - } - } - m_effectWidget->showVisibilityButton(show); + } + } + if (!manuallyTriggered) + m_effectWidget->showVisibilityButton(show); setUpdatesEnabled(true); videoBox->setEnabled(show); //render->doRefresh();