X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=aebf23cda1c4453c168b0c5c932be05c213878c9;hb=27e955932ababb52d18b9205b79d46e00abfc552;hp=bc75e18703f807d6ade021846c4be0ad0c32be4a;hpb=c25ab9b9c4e14e3d3e8b0cfb37868e87152ae8c9;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index bc75e187..aebf23cd 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -19,8 +19,6 @@ #include "monitor.h" -#include "renderer.h" -#include "monitormanager.h" #include "smallruler.h" #include "docclipbase.h" #include "abstractclipitem.h" @@ -45,33 +43,27 @@ #include -Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) : - QWidget(parent), +Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profile, QWidget *parent) : + AbstractMonitor(id, manager, 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), - m_monitorRefresh(NULL), + m_contextMenu(NULL), m_effectWidget(NULL), m_selectedClip(NULL), - m_loopClipTransition(true) - + m_loopClipTransition(true), + m_editMarker(NULL) { QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); // Video widget holder - m_videoBox = new VideoContainer(this); - m_videoBox->setContentsMargins(0, 0, 0, 0); - m_videoBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - layout->addWidget(m_videoBox, 10); + layout->addWidget(videoBox, 10); layout->addStretch(); // Get base size for icons @@ -80,13 +72,13 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget // Monitor ruler layout->addWidget(m_ruler); // Tool bar buttons - m_toolbar = new QToolBar(name, this); + m_toolbar = new QToolBar(this); m_toolbar->setIconSize(QSize(s, s)); m_playIcon = KIcon("media-playback-start"); m_pauseIcon = KIcon("media-playback-pause"); - if (name != "chapter") { + 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 { @@ -111,7 +103,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget playButton->setDefaultAction(m_playAction); - if (name != "chapter") { + if (id != Kdenlive::dvdMonitor) { QToolButton *configButton = new QToolButton(m_toolbar); m_configMenu = new QMenu(i18n("Misc..."), this); configButton->setIcon(KIcon("system-run")); @@ -119,7 +111,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget configButton->setPopupMode(QToolButton::QToolButton::InstantPopup); m_toolbar->addWidget(configButton); - if (name == "clip") { + if (id == Kdenlive::clipMonitor) { m_markerMenu = new QMenu(i18n("Go to marker..."), this); m_markerMenu->setEnabled(false); m_configMenu->addMenu(m_markerMenu); @@ -155,27 +147,25 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget bool monitorCreated = false; #ifdef Q_WS_MAC - createOpenGlWidget(m_videoBox, profile); + createOpenGlWidget(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); + monitorCreated = createOpenGlWidget(videoBox, profile); } #endif - QVBoxLayout *lay = new QVBoxLayout; - lay->setContentsMargins(0, 0, 0, 0); if (!monitorCreated) { - m_monitorRefresh = new MonitorRefresh; - lay->addWidget(m_monitorRefresh); - m_videoBox->setLayout(lay); - render = new Render(m_name, (int) m_monitorRefresh->winId(), profile, this); - m_monitorRefresh->setRenderer(render); + createVideoSurface(); + render = new Render(m_id, (int) videoSurface->winId(), profile, this); + connect(videoSurface, SIGNAL(refreshMonitor()), render, SLOT(doRefresh())); } -#if defined (USE_OPEN_GL) +#ifdef USE_OPENGL else if (m_glWidget) { + QVBoxLayout *lay = new QVBoxLayout; + lay->setContentsMargins(0, 0, 0, 0); lay->addWidget(m_glWidget); - m_videoBox->setLayout(lay); + videoBox->setLayout(lay); } #endif @@ -183,10 +173,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget 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))); - //render->createVideoXWindow(m_ui.video_frame->winId(), -1); - - if (name != "clip") { + if (id != Kdenlive::clipMonitor) { connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int))); connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int))); connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SIGNAL(zoneUpdated(QPoint))); @@ -194,17 +183,18 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SLOT(setClipZone(QPoint))); } - if (m_monitorRefresh) m_monitorRefresh->show(); + if (videoSurface) videoSurface->show(); - if (name == "project") { - m_effectWidget = new MonitorEditWidget(render, m_videoBox); + if (id == Kdenlive::projectMonitor) { + m_effectWidget = new MonitorEditWidget(render, videoBox); + connect(m_effectWidget, SIGNAL(showEdit(bool, bool)), this, SLOT(slotShowEffectScene(bool, bool))); m_toolbar->addAction(m_effectWidget->getVisibilityAction()); - lay->addWidget(m_effectWidget); + videoBox->layout()->addWidget(m_effectWidget); m_effectWidget->hide(); } QWidget *spacer = new QWidget(this); - spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); m_toolbar->addWidget(spacer); m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this); m_toolbar->addWidget(m_timePos); @@ -220,24 +210,18 @@ Monitor::~Monitor() delete m_overlay; if (m_effectWidget) delete m_effectWidget; - delete m_monitorRefresh; delete render; } QWidget *Monitor::container() { - return m_videoBox; -} - -QString Monitor::name() const -{ - return m_name; + return videoBox; } -#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); + render = new Render(id(), 0, profile, this); m_glWidget = new VideoGLWidget(parent); if (m_glWidget == NULL) { // Creation failed, we are in trouble... @@ -256,8 +240,16 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe m_contextMenu->addMenu(m_playMenu); if (goMenu) m_contextMenu->addMenu(goMenu); - if (markerMenu) + if (markerMenu) { m_contextMenu->addMenu(markerMenu); + QList list = markerMenu->actions(); + for (int i = 0; i < list.count(); i++) { + if (list.at(i)->data().toString() == "edit_marker") { + m_editMarker = list.at(i); + break; + } + } + } m_playMenu->addAction(playZone); m_playMenu->addAction(loopZone); @@ -267,14 +259,16 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe } //TODO: add save zone to timeline monitor when fixed - if (m_name == "clip") { + if (m_id == Kdenlive::clipMonitor) { m_contextMenu->addMenu(m_markerMenu); m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); + QAction *extractZone = m_configMenu->addAction(KIcon("document-new"), i18n("Extract Zone"), this, SLOT(slotExtractCurrentZone())); + m_contextMenu->addAction(extractZone); } QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame())); m_contextMenu->addAction(extractFrame); - if (m_name != "clip") { + if (m_id != Kdenlive::clipMonitor) { QAction *splitView = m_contextMenu->addAction(KIcon("view-split-left-right"), i18n("Split view"), render, SLOT(slotSplitView(bool))); splitView->setCheckable(true); m_configMenu->addAction(splitView); @@ -317,7 +311,7 @@ void Monitor::slotSetSizeOneToOne() height = height * 0.8; } kDebug() << "// MONITOR; set SIZE: " << width << ", " << height; - m_videoBox->setFixedSize(width, height); + videoBox->setFixedSize(width, height); updateGeometry(); adjustSize(); //m_ui.video_frame->setMinimumSize(0, 0); @@ -337,7 +331,7 @@ void Monitor::slotSetSizeOneToTwo() height = height * 0.8; } kDebug() << "// MONITOR; set SIZE: " << width << ", " << height; - m_videoBox->setFixedSize(width, height); + videoBox->setFixedSize(width, height); updateGeometry(); adjustSize(); //m_ui.video_frame->setMinimumSize(0, 0); @@ -346,7 +340,7 @@ void Monitor::slotSetSizeOneToTwo() void Monitor::resetSize() { - m_videoBox->setMinimumSize(0, 0); + videoBox->setMinimumSize(0, 0); } DocClipBase *Monitor::activeClip() @@ -425,7 +419,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()); @@ -433,7 +427,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()); @@ -443,26 +437,34 @@ void Monitor::slotSetZoneEnd() void Monitor::mousePressEvent(QMouseEvent * event) { if (event->button() != Qt::RightButton) { - if (m_videoBox->underMouse()) { + if (videoBox->geometry().contains(event->pos()) && (!m_overlay || !m_overlay->underMouse())) { m_dragStarted = true; m_DragStartPosition = event->pos(); } - } else m_contextMenu->popup(event->globalPos()); + } else if (m_contextMenu && (!m_effectWidget || !m_effectWidget->isVisible())) { + m_contextMenu->popup(event->globalPos()); + } +} + +void Monitor::resizeEvent(QResizeEvent *event) +{ + Q_UNUSED(event); + if (render && isVisible() && isActive()) render->doRefresh(); } void Monitor::slotSwitchFullScreen() { - m_videoBox->switchFullScreen(); + videoBox->switchFullScreen(); } // virtual void Monitor::mouseReleaseEvent(QMouseEvent * event) { - if (m_dragStarted) { - if (m_videoBox->underMouse() && (!m_effectWidget || !m_effectWidget->isVisible())) { + if (m_dragStarted && event->button() != Qt::RightButton) { + if (videoBox->geometry().contains(event->pos()) && (!m_effectWidget || !m_effectWidget->isVisible())) { if (isActive()) slotPlay(); - else activateMonitor(); - } else QWidget::mouseReleaseEvent(event); + else slotActivateMonitor(); + } //else event->ignore(); //QWidget::mouseReleaseEvent(event); m_dragStarted = false; } } @@ -470,7 +472,6 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) // virtual void Monitor::mouseMoveEvent(QMouseEvent *event) { - // kDebug() << "// DRAG STARTED, MOUSE MOVED: "; if (!m_dragStarted || m_currentClip == NULL) return; if ((event->pos() - m_DragStartPosition).manhattanLength() @@ -490,9 +491,9 @@ void Monitor::mouseMoveEvent(QMouseEvent *event) data.append(list.join(";").toUtf8()); mimeData->setData("kdenlive/clip", data); drag->setMimeData(mimeData); - QPixmap pix = m_currentClip->thumbnail(); + /*QPixmap pix = m_currentClip->thumbnail(); drag->setPixmap(pix); - drag->setHotSpot(QPoint(0, 50)); + drag->setHotSpot(QPoint(0, 50));*/ drag->start(Qt::MoveAction); //Qt::DropAction dropAction; @@ -532,12 +533,20 @@ void Monitor::wheelEvent(QWheelEvent * event) event->accept(); } +void Monitor::mouseDoubleClickEvent(QMouseEvent * event) +{ + if (!KdenliveSettings::openglmonitors()) { + videoBox->switchFullScreen(); + event->accept(); + } +} + 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(); @@ -550,18 +559,28 @@ void Monitor::slotSetThumbFrame() return; } m_currentClip->setClipThumbFrame((uint) render->seekFramePosition()); - emit refreshClipThumbnail(m_currentClip->getId()); + emit refreshClipThumbnail(m_currentClip->getId(), true); +} + +void Monitor::slotExtractCurrentZone() +{ + if (m_currentClip == NULL) return; + emit extractZone(m_currentClip->getId(), m_ruler->zone()); } void Monitor::slotExtractCurrentFrame() { - QImage frame = render->extractFrame(render->seekFramePosition()); + QImage frame; + // check if we are using a proxy + if (m_currentClip && !m_currentClip->getProperty("proxy").isEmpty() && m_currentClip->getProperty("proxy") != "-") { + // using proxy, use original clip url to get frame + frame = render->extractFrame(render->seekFramePosition(), m_currentClip->fileURL().path()); + } + else frame = render->extractFrame(render->seekFramePosition()); KFileDialog *fs = new KFileDialog(KUrl(), "image/png", this); fs->setOperationMode(KFileDialog::Saving); fs->setMode(KFile::File); -#if KDE_IS_VERSION(4,2,0) fs->setConfirmOverwrite(true); -#endif fs->setKeepLocation(true); fs->exec(); QString path = fs->selectedFile(); @@ -571,18 +590,6 @@ void Monitor::slotExtractCurrentFrame() } } -bool Monitor::isActive() const -{ - return m_isActive; -} - -void Monitor::activateMonitor() -{ - if (!m_isActive) { - m_monitorManager->slotSwitchMonitors(m_name == "clip"); - } -} - void Monitor::setTimePos(const QString &pos) { m_timePos->setValue(pos); @@ -596,62 +603,65 @@ void Monitor::slotSeek() void Monitor::slotSeek(int pos) { - activateMonitor(); if (render == NULL) return; + slotActivateMonitor(); render->seekToFrame(pos); } void Monitor::checkOverlay() { if (m_overlay == NULL) return; - int pos = render->seekFramePosition(); + QString overlayText; + int pos = m_ruler->position(); QPoint zone = m_ruler->zone(); if (pos == zone.x()) - m_overlay->setOverlayText(i18n("In Point")); + overlayText = i18n("In Point"); else if (pos == zone.y()) - m_overlay->setOverlayText(i18n("Out Point")); + overlayText = 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); - } else m_overlay->setHidden(true); + overlayText = m_currentClip->markerComment(GenTime(pos, m_monitorManager->timecode().fps())); + if (!overlayText.isEmpty()) { + m_overlay->setOverlayText(overlayText, false); + return; + } + } } + if (m_overlay->isVisible() && overlayText.isEmpty()) m_overlay->setOverlayText(QString(), false); + else m_overlay->setOverlayText(overlayText); } void Monitor::slotStart() { - activateMonitor(); + slotActivateMonitor(); render->play(0); render->seekToFrame(0); } void Monitor::slotEnd() { - activateMonitor(); + slotActivateMonitor(); render->play(0); render->seekToFrame(render->getLength()); } void Monitor::slotZoneStart() { - activateMonitor(); + slotActivateMonitor(); render->play(0); render->seekToFrame(m_ruler->zone().x()); } void Monitor::slotZoneEnd() { - activateMonitor(); + slotActivateMonitor(); render->play(0); render->seekToFrame(m_ruler->zone().y()); } void Monitor::slotRewind(double speed) { - activateMonitor(); + slotActivateMonitor(); if (speed == 0) { double currentspeed = render->playSpeed(); if (currentspeed >= 0) render->play(-2); @@ -663,7 +673,7 @@ void Monitor::slotRewind(double speed) void Monitor::slotForward(double speed) { - activateMonitor(); + slotActivateMonitor(); if (speed == 0) { double currentspeed = render->playSpeed(); if (currentspeed <= 1) render->play(2); @@ -675,21 +685,21 @@ void Monitor::slotForward(double speed) void Monitor::slotRewindOneFrame(int diff) { - activateMonitor(); + slotActivateMonitor(); render->play(0); render->seekToFrameDiff(-diff); } void Monitor::slotForwardOneFrame(int diff) { - activateMonitor(); + slotActivateMonitor(); render->play(0); render->seekToFrameDiff(diff); } void Monitor::seekCursor(int pos) { - activateMonitor(); + //slotActivateMonitor(); if (m_ruler->slotNewValue(pos)) { checkOverlay(); m_timePos->setValue(pos); @@ -702,9 +712,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); } @@ -720,29 +727,28 @@ void Monitor::adjustRulerSize(int length) void Monitor::stop() { - m_isActive = false; - disconnect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); if (render) render->stop(); } void Monitor::start() { - m_isActive = true; - if (render) render->start(); - connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); + if (!isVisible() || !isActive()) return; + if (render) render->doRefresh();// start(); } void Monitor::refreshMonitor(bool visible) { - if (visible && render && !m_isActive) { - activateMonitor(); - render->doRefresh(); //askForRefresh(); + if (visible && render) { + if (!slotActivateMonitor()) { + // the monitor was already active, simply refreshClipThumbnail + render->doRefresh(); + } } } void Monitor::refreshMonitor() { - if (m_isActive) { + if (isActive()) { render->doRefresh(); } } @@ -750,30 +756,33 @@ void Monitor::refreshMonitor() void Monitor::pause() { if (render == NULL) return; - activateMonitor(); + slotActivateMonitor(); render->pause(); //m_playAction->setChecked(true); m_playAction->setIcon(m_playIcon); } +void Monitor::unpause() +{ +} + void Monitor::slotPlay() { if (render == NULL) return; - activateMonitor(); - if (render->playSpeed() == 0) { - //m_playAction->setChecked(true); + slotActivateMonitor(); + 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); } - render->switchPlay(); } void Monitor::slotPlayZone() { if (render == NULL) return; - activateMonitor(); + slotActivateMonitor(); QPoint p = m_ruler->zone(); render->playZone(GenTime(p.x(), m_monitorManager->timecode().fps()), GenTime(p.y(), m_monitorManager->timecode().fps())); //m_playAction->setChecked(true); @@ -783,7 +792,7 @@ void Monitor::slotPlayZone() void Monitor::slotLoopZone() { if (render == NULL) return; - activateMonitor(); + slotActivateMonitor(); QPoint p = m_ruler->zone(); render->loopZone(GenTime(p.x(), m_monitorManager->timecode().fps()), GenTime(p.y(), m_monitorManager->timecode().fps())); //m_playAction->setChecked(true); @@ -794,40 +803,56 @@ void Monitor::slotLoopClip() { if (render == NULL || m_selectedClip == NULL) return; - activateMonitor(); + slotActivateMonitor(); 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) +void Monitor::updateClipProducer(Mlt::Producer *prod) +{ + if (render == NULL) return; + render->setProducer(prod, render->seekFramePosition()); +} + +void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpdate, 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) { + + if (clip != m_currentClip || forceUpdate) { m_currentClip = clip; + if (m_currentClip) slotActivateMonitor(); 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(GenTime(position, m_monitorManager->timecode().fps())); + } else { + if (m_currentClip) { + slotActivateMonitor(); + if (position == -1) position = render->seekFramePosition(); + render->seek(position); + } + } if (!zone.isNull()) { m_ruler->setZone(zone.x(), zone.y()); - render->seek(GenTime(zone.x(), m_monitorManager->timecode().fps())); + render->seek(zone.x()); } } void Monitor::slotOpenFile(const QString &file) { if (render == NULL) return; - activateMonitor(); + slotActivateMonitor(); QDomDocument doc; QDomElement mlt = doc.createElement("mlt"); doc.appendChild(mlt); @@ -841,16 +866,19 @@ 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; - render->resetProfile(profile); + if (!render->hasProfile(profile)) { + slotActivateMonitor(); + render->resetProfile(profile); + } if (m_effectWidget) m_effectWidget->resetProfile(render); } @@ -883,22 +911,40 @@ void Monitor::slotSwitchMonitorInfo(bool show) KdenliveSettings::setDisplayMonitorInfo(show); if (show) { if (m_overlay) return; - if (m_monitorRefresh == NULL) { + if (videoSurface == NULL) { // Using OpenGL display -#if defined(Q_WS_MAC) || defined(USE_OPEN_GL) - m_overlay = new Overlay(m_glWidget); +#ifdef USE_OPENGL + if (m_glWidget->layout()) delete m_glWidget->layout(); + m_overlay = new Overlay(); + connect(m_overlay, SIGNAL(editMarker()), this, SLOT(slotEditMarker())); + QVBoxLayout *layout = new QVBoxLayout; + layout->addStretch(10); + layout->addWidget(m_overlay); + m_glWidget->setLayout(layout); #endif } else { - m_overlay = new Overlay(m_monitorRefresh); + if (videoSurface->layout()) delete videoSurface->layout(); + m_overlay = new Overlay(); + connect(m_overlay, SIGNAL(editMarker()), this, SLOT(slotEditMarker())); + QVBoxLayout *layout = new QVBoxLayout; + layout->addStretch(10); + layout->addWidget(m_overlay); + videoSurface->setLayout(layout); m_overlay->raise(); m_overlay->setHidden(true); } + checkOverlay(); } else { delete m_overlay; m_overlay = NULL; } } +void Monitor::slotEditMarker() +{ + if (m_editMarker) m_editMarker->trigger(); +} + void Monitor::updateTimecodeFormat() { m_timePos->slotUpdateTimeCodeFormat(); @@ -941,23 +987,46 @@ void Monitor::slotSetSelectedClip(Transition* item) } -void Monitor::slotEffectScene(bool show) +void Monitor::slotShowEffectScene(bool show, bool manuallyTriggered) { - if (m_name == "project") { - if (m_monitorRefresh) { - m_monitorRefresh->setVisible(!show); - } else { -#if defined(Q_WS_MAC) || defined(USE_OPEN_GL) - m_glWidget->setVisible(!show); -#endif - } - m_effectWidget->setVisible(show); - m_effectWidget->getVisibilityAction()->setChecked(show); - emit requestFrameForAnalysis(show); + 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(false); + // Preview is handeled internally through the Render::showFrame method + render->disablePreview(true); +#ifdef USE_OPENGL + } else { + m_glWidget->setVisible(false); +#endif + } + m_effectWidget->setVisible(true); m_effectWidget->getScene()->slotZoomFit(); - render->doRefresh(); + 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 + } else { + m_glWidget->setVisible(true); +#endif + } } + if (!manuallyTriggered) + m_effectWidget->showVisibilityButton(show); + setUpdatesEnabled(true); + videoBox->setEnabled(show); + //render->doRefresh(); } } @@ -993,161 +1062,73 @@ void Monitor::slotShowVolume() m_volumePopup->show(); } -MonitorRefresh::MonitorRefresh(QWidget* parent) : - QWidget(parent) - , m_renderer(NULL) +AbstractRender *Monitor::abstractRender() { - // MonitorRefresh is used as container for the SDL display (it's window id is passed to SDL) - setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_OpaquePaintEvent); - //setAttribute(Qt::WA_NoSystemBackground); + return render; } -void MonitorRefresh::setRenderer(Render* render) +void Monitor::reloadProducer(const QString &id) { - m_renderer = render; + if (!m_currentClip) return; + if (m_currentClip->getId() == id) + slotSetClipProducer(m_currentClip, m_currentClip->zone(), true); } -void MonitorRefresh::paintEvent(QPaintEvent *event) +void Monitor::setPalette ( const QPalette & p) { - Q_UNUSED(event); - if (m_renderer) m_renderer->doRefresh(); + QWidget::setPalette(p); + if (m_ruler) m_ruler->updatePalette(); + } Overlay::Overlay(QWidget* parent) : QLabel(parent) { - setAttribute(Qt::WA_TransparentForMouseEvents); - //setAttribute(Qt::WA_OpaquePaintEvent); - //setAttribute(Qt::WA_NoSystemBackground); + //setAttribute(Qt::WA_TransparentForMouseEvents); setAutoFillBackground(true); setBackgroundRole(QPalette::Base); -} - -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(); -} - -VideoContainer::VideoContainer(Monitor* parent) : - QFrame() - , m_monitor(parent) -{ - setFrameShape(QFrame::NoFrame); - setFocusPolicy(Qt::ClickFocus); - setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); -} - -// virtual -void VideoContainer::mousePressEvent(QMouseEvent * event) -{ - if (m_monitor->underMouse()) event->setAccepted(false); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + setCursor(Qt::PointingHandCursor); } // virtual -void VideoContainer::mouseReleaseEvent(QMouseEvent * event) +void Overlay::mouseReleaseEvent ( QMouseEvent * event ) { - if (m_monitor->underMouse()) event->setAccepted(false); - else { - if (m_monitor->isActive()) { - m_monitor->slotPlay(); - event->accept(); - } - } + event->ignore(); } // virtual -void VideoContainer::mouseMoveEvent(QMouseEvent *event) +void Overlay::mousePressEvent( QMouseEvent * event ) { - if (m_monitor->underMouse()) event->setAccepted(false); + event->ignore(); } // virtual -void VideoContainer::keyPressEvent(QKeyEvent *event) +void Overlay::mouseDoubleClickEvent ( QMouseEvent * event ) { - // Exit fullscreen with Esc key - if (event->key() == Qt::Key_Escape && isFullScreen()) { - switchFullScreen(); - event->setAccepted(true); - } else event->setAccepted(false); + emit editMarker(); + event->ignore(); } -// virtual -void VideoContainer::wheelEvent(QWheelEvent * event) -{ - if (m_monitor->underMouse()) event->setAccepted(false); - else { - m_monitor->slotMouseSeek(event->delta(), event->modifiers() == Qt::ControlModifier); - event->accept(); - } -} - -void VideoContainer::mouseDoubleClickEvent(QMouseEvent * event) -{ - Q_UNUSED(event); - - if (!KdenliveSettings::openglmonitors()) - switchFullScreen(); -} - -void VideoContainer::switchFullScreen() +void Overlay::setOverlayText(const QString &text, bool isZone) { - // TODO: disable screensaver? - Qt::WindowFlags flags = windowFlags(); - if (!isFullScreen()) { - // Check if we ahave a multiple monitor setup - setUpdatesEnabled(false); -#if QT_VERSION >= 0x040600 - int monitors = QApplication::desktop()->screenCount(); -#else - int monitors = QApplication::desktop()->numScreens(); -#endif - if (monitors > 1) { - QRect screenres; - // Move monitor widget to the second screen (one screen for Kdenlive, the other one for the Monitor widget - int currentScreen = QApplication::desktop()->screenNumber(this); - if (currentScreen < monitors - 1) - screenres = QApplication::desktop()->screenGeometry(currentScreen + 1); - else - screenres = QApplication::desktop()->screenGeometry(currentScreen - 1); - move(QPoint(screenres.x(), screenres.y())); - resize(screenres.width(), screenres.height()); - } - - m_baseFlags = flags & (Qt::Window | Qt::SubWindow); - flags |= Qt::Window; - flags ^= Qt::SubWindow; - setWindowFlags(flags); -#ifdef Q_WS_X11 - // This works around a bug with Compiz - // as the window must be visible before we can set the state - show(); - raise(); - setWindowState(windowState() | Qt::WindowFullScreen); // set -#else - setWindowState(windowState() | Qt::WindowFullScreen); // set - setUpdatesEnabled(true); - show(); -#endif - } else { - setUpdatesEnabled(false); - flags ^= (Qt::Window | Qt::SubWindow); //clear the flags... - flags |= m_baseFlags; //then we reset the flags (window and subwindow) - setWindowFlags(flags); - setWindowState(windowState() ^ Qt::WindowFullScreen); // reset - setUpdatesEnabled(true); - show(); + if (text.isEmpty()) { + QPalette p; + p.setColor(QPalette::Base, KdenliveSettings::window_background()); + setPalette(p); + setText(QString()); + repaint(); + setHidden(true); + return; } - m_monitor->pause(); + setHidden(true); + QPalette p; + p.setColor(QPalette::Text, Qt::white); + if (isZone) p.setColor(QPalette::Base, QColor(200, 0, 0)); + else p.setColor(QPalette::Base, QColor(0, 0, 200)); + setPalette(p); + setText(' ' + text + ' '); + setHidden(false); }