X-Git-Url: https://git.sesse.net/?p=kdenlive;a=blobdiff_plain;f=src%2Fmonitor.cpp;h=29a7a3d8463116cc0e280f3567667fa2332c7f49;hp=db3989406dee5d12be592f60ce96b2c36fd14ce3;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hpb=43d27d5a89c1081ff69b79a5949fc87e873781d6 diff --git a/src/monitor.cpp b/src/monitor.cpp index db398940..29a7a3d8 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -23,14 +23,17 @@ #include "docclipbase.h" #include "abstractclipitem.h" #include "monitorscene.h" -#include "monitoreditwidget.h" +#include "widgets/monitoreditwidget.h" +#include "widgets/videosurface.h" +#include "widgets/videoglwidget.h" #include "kdenlivesettings.h" #include -#include +#include #include #include #include +#include #include #include @@ -41,53 +44,52 @@ #include #include #include +#include -Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) : - AbstractMonitor(parent), - render(NULL), - m_name(name), - m_monitorManager(manager), - m_currentClip(NULL), - m_ruler(new SmallRuler(m_monitorManager)), - m_overlay(NULL), - m_scale(1), - m_length(0), - m_dragStarted(false), - m_monitorRefresh(NULL), - m_effectWidget(NULL), - m_selectedClip(NULL), - m_loopClipTransition(true), - m_editMarker(NULL) +#define SEEK_INACTIVE (-1) + + +Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QGLWidget *glContext, 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_loopClipAction(NULL) + , m_contextMenu(NULL) + , m_effectWidget(NULL) + , m_selectedClip(NULL) + , m_loopClipTransition(true) + , m_parentGLContext(glContext) + , m_glWidget(NULL) + , 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 int s = style()->pixelMetric(QStyle::PM_SmallIconSize); - // 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 { - m_ruler->setZone(-3, -2); } m_toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind())); @@ -108,7 +110,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")); @@ -116,11 +118,11 @@ 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); - 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())); @@ -148,40 +150,26 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget 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 - createOpenGlWidget(m_videoBox, profile); - monitorCreated = true; - //m_glWidget->setFixedSize(width, height); -#elif defined(USE_OPENGL) - if (KdenliveSettings::openglmonitors()) { - monitorCreated = createOpenGlWidget(m_videoBox, profile); - } -#endif + createOpenGlWidget(videoBox, profile); 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); - } -#ifdef USE_OPENGL - else if (m_glWidget) { - lay->addWidget(m_glWidget); - m_videoBox->setLayout(lay); - } -#endif + lay->addWidget(m_glWidget); + videoBox->setLayout(lay); + // Monitor ruler + m_ruler = new SmallRuler(this, 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))); - 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))); @@ -189,12 +177,11 @@ 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 (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(); } @@ -203,8 +190,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget 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())); - m_toolbar->setMaximumHeight(s * 1.5); + connect(m_timePos, SIGNAL(timeCodeEditingFinished()), this, SLOT(slotSeek())); + m_toolbar->setMaximumHeight(m_timePos->height()); layout->addWidget(m_toolbar); } @@ -215,35 +202,29 @@ Monitor::~Monitor() delete m_overlay; if (m_effectWidget) delete m_effectWidget; - delete m_monitorRefresh; delete render; } QWidget *Monitor::container() { - return m_videoBox; -} - -const QString Monitor::name() const -{ - return m_name; + return videoBox; } -#ifdef USE_OPENGL -bool Monitor::createOpenGlWidget(QWidget *parent, const QString profile) +void Monitor::createOpenGlWidget(QWidget *parent, const QString &profile) { - render = new Render(m_name, 0, profile, this); - m_glWidget = new VideoGLWidget(parent); + m_glWidget = new VideoGLWidget(parent, m_parentGLContext); + render = new Render(id(), 0, profile, this, m_glWidget); if (m_glWidget == NULL) { // Creation failed, we are in trouble... - return false; + QMessageBox::critical(this, i18n("Missing OpenGL support"), + i18n("You need working OpenGL support to run Kdenlive. Exiting.")); + qApp->quit(); } m_glWidget->setImageAspectRatio(render->dar()); m_glWidget->setBackgroundColor(KdenliveSettings::window_background()); connect(render, SIGNAL(showImageSignal(QImage)), m_glWidget, SLOT(showImage(QImage))); - return true; + connect(render, SIGNAL(showImageSignal(GLuint)), m_glWidget, SLOT(showImage(GLuint))); } -#endif void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu, QAction *loopClip) { @@ -254,7 +235,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; @@ -270,14 +251,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); @@ -295,10 +278,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) @@ -320,7 +302,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); @@ -340,7 +322,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); @@ -349,7 +331,17 @@ void Monitor::slotSetSizeOneToTwo() void Monitor::resetSize() { - m_videoBox->setMinimumSize(0, 0); + 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() @@ -364,19 +356,24 @@ 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(); 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()); } } +void Monitor::setMarkers(const QList &markers) +{ + m_ruler->setMarkers(markers); +} + void Monitor::slotSeekToPreviousSnap() { if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps())); @@ -422,67 +419,67 @@ GenTime Monitor::getSnapForPos(bool previous) void Monitor::slotZoneMoved(int start, int end) { m_ruler->setZone(start, end); - checkOverlay(); setClipZone(m_ruler->zone()); + checkOverlay(); } void Monitor::slotSetZoneStart() { - m_ruler->setZone(m_ruler->position(), -1); + m_ruler->setZoneStart(); emit zoneUpdated(m_ruler->zone()); - checkOverlay(); setClipZone(m_ruler->zone()); + checkOverlay(); } void Monitor::slotSetZoneEnd() { - m_ruler->setZone(-1, m_ruler->position()); + m_ruler->setZoneEnd(); emit zoneUpdated(m_ruler->zone()); - checkOverlay(); setClipZone(m_ruler->zone()); + checkOverlay(); } // virtual void Monitor::mousePressEvent(QMouseEvent * event) { + if (render) render->setActiveMonitor(); if (event->button() != Qt::RightButton) { - if (m_videoBox->underMouse() && (!m_overlay || !m_overlay->underMouse())) { + if (videoBox->geometry().contains(event->pos()) && (!m_overlay || !m_overlay->underMouse())) { m_dragStarted = true; m_DragStartPosition = event->pos(); } - } else if (!m_effectWidget || !m_effectWidget->isVisible()) { + } else if (m_contextMenu && (!m_effectWidget || !m_effectWidget->isVisible())) { m_contextMenu->popup(event->globalPos()); } } void Monitor::resizeEvent(QResizeEvent *event) { - Q_UNUSED(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); - m_dragStarted = false; + else slotActivateMonitor(); + } //else event->ignore(); //QWidget::mouseReleaseEvent(event); } + m_dragStarted = false; + event->accept(); } // virtual void Monitor::mouseMoveEvent(QMouseEvent *event) { - // kDebug() << "// DRAG STARTED, MOUSE MOVED: "; if (!m_dragStarted || m_currentClip == NULL) return; if ((event->pos() - m_DragStartPosition).manhattanLength() @@ -502,13 +499,13 @@ 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; - //dropAction = drag->start(Qt::CopyAction | Qt::MoveAction); + /*Qt::DropAction dropAction = drag->exec(Qt::CopyAction | Qt::MoveAction); + Qt::DropAction dropAction; + dropAction = drag->start(Qt::CopyAction | Qt::MoveAction);*/ //Qt::DropAction dropAction = drag->exec(); @@ -516,6 +513,7 @@ void Monitor::mouseMoveEvent(QMouseEvent *event) //event->accept(); } + /*void Monitor::dragMoveEvent(QDragMoveEvent * event) { event->setDropAction(Qt::IgnoreAction); event->setDropAction(Qt::MoveAction); @@ -549,7 +547,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(); @@ -565,6 +565,12 @@ void Monitor::slotSetThumbFrame() 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; @@ -574,27 +580,18 @@ 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(); - delete fs; - if (!path.isEmpty()) { - frame.save(path); + if (fs->exec()) { + QString path = fs->selectedFile(); + if (!path.isEmpty()) { + frame.save(path); + } } -} - -bool Monitor::isActive() const -{ - return m_monitorManager->isActive(m_name); -} - -bool Monitor::activateMonitor() -{ - return m_monitorManager->activateMonitor(m_name); + delete fs; } void Monitor::setTimePos(const QString &pos) @@ -611,65 +608,81 @@ void Monitor::slotSeek() void Monitor::slotSeek(int pos) { if (render == NULL) return; - activateMonitor(); + slotActivateMonitor(); render->seekToFrame(pos); + m_ruler->update(); } void Monitor::checkOverlay() { if (m_overlay == NULL) return; - int pos = m_ruler->position(); + QString overlayText; + int pos = m_timePos->getValue();//render->seekFramePosition(); 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); - 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); @@ -677,11 +690,23 @@ 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); - 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); @@ -689,32 +714,33 @@ void Monitor::slotForward(double speed) void Monitor::slotRewindOneFrame(int diff) { - activateMonitor(); + slotActivateMonitor(); render->play(0); render->seekToFrameDiff(-diff); + m_ruler->update(); } void Monitor::slotForwardOneFrame(int diff) { - activateMonitor(); + slotActivateMonitor(); render->play(0); render->seekToFrameDiff(diff); + m_ruler->update(); } void Monitor::seekCursor(int pos) { - //activateMonitor(); if (m_ruler->slotNewValue(pos)) { - checkOverlay(); m_timePos->setValue(pos); + checkOverlay(); } } void Monitor::rendererStopped(int pos) { if (m_ruler->slotNewValue(pos)) { - checkOverlay(); m_timePos->setValue(pos); + checkOverlay(); } m_playAction->setIcon(m_playIcon); } @@ -731,21 +757,20 @@ void Monitor::adjustRulerSize(int length) void Monitor::stop() { - disconnect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); if (render) render->stop(); } void Monitor::start() { - if (!isVisible()) return; - if (render) render->start(); - connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); + if (!isVisible() || !isActive()) return; + if (m_glWidget) m_glWidget->activateMonitor(); + if (render) render->startConsumer(); } void Monitor::refreshMonitor(bool visible) { if (visible && render) { - if (!activateMonitor()) { + if (!slotActivateMonitor()) { // the monitor was already active, simply refreshClipThumbnail render->doRefresh(); } @@ -762,29 +787,35 @@ 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.0) { + slotActivateMonitor(); + if (render->isPlaying()) { + m_playAction->setIcon(m_playIcon); + render->switchPlay(false); + } + else { m_playAction->setIcon(m_pauseIcon); render->switchPlay(true); - } else { - m_playAction->setIcon(m_playIcon); - render->switchPlay(false); } + m_ruler->refreshRuler(); } 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); @@ -794,7 +825,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); @@ -805,7 +836,7 @@ 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); @@ -814,35 +845,41 @@ 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, int position) +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->lastSeekPosition = render->seekFramePosition(); m_currentClip = NULL; m_length = -1; render->setProducer(NULL, -1); return; } - - if (clip != m_currentClip) { + + if (clip != m_currentClip || forceUpdate) { + if (m_currentClip) m_currentClip->lastSeekPosition = render->seekFramePosition(); m_currentClip = clip; - if (m_currentClip) activateMonitor(); + if (position == -1) position = clip->lastSeekPosition; updateMarkers(clip); 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 start(); } else { if (m_currentClip) { - activateMonitor(); + 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()) { @@ -854,15 +891,8 @@ void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, int position) void Monitor::slotOpenFile(const QString &file) { if (render == NULL) return; - activateMonitor(); - QDomDocument doc; - QDomElement mlt = doc.createElement("mlt"); - doc.appendChild(mlt); - QDomElement prod = doc.createElement("producer"); - mlt.appendChild(prod); - prod.setAttribute("mlt_service", "avformat"); - prod.setAttribute("resource", file); - render->setSceneList(doc, 0); + slotActivateMonitor(); + render->loadUrl(file); } void Monitor::slotSaveZone() @@ -873,19 +903,31 @@ void Monitor::slotSaveZone() //render->setSceneList(doc, 0); } +void Monitor::setCustomProfile(const QString &profile, const Timecode &tc) +{ + m_timePos->updateTimeCode(tc); + if (render == NULL) return; + if (!render->hasProfile(profile)) { + slotActivateMonitor(); + render->resetProfile(profile); + if (m_glWidget) m_glWidget->setImageAspectRatio(render->dar()); + } +} + void Monitor::resetProfile(const QString &profile) { m_timePos->updateTimeCode(m_monitorManager->timecode()); if (render == NULL) return; if (!render->hasProfile(profile)) { - activateMonitor(); + slotActivateMonitor(); render->resetProfile(profile); + if (m_glWidget) m_glWidget->setImageAspectRatio(render->dar()); } if (m_effectWidget) 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); @@ -897,7 +939,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); @@ -913,28 +955,13 @@ void Monitor::slotSwitchMonitorInfo(bool show) KdenliveSettings::setDisplayMonitorInfo(show); if (show) { if (m_overlay) return; - if (m_monitorRefresh == NULL) { - // Using OpenGL display -#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 { - if (m_monitorRefresh->layout()) delete m_monitorRefresh->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_monitorRefresh->setLayout(layout); - m_overlay->raise(); - m_overlay->setHidden(true); - } + 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); checkOverlay(); } else { delete m_overlay; @@ -965,10 +992,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); } } @@ -989,23 +1016,29 @@ 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 { -#ifdef USE_OPENGL - 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) { + m_glWidget->setVisible(false); + m_effectWidget->setVisible(true); m_effectWidget->getScene()->slotZoomFit(); + emit requestFrameForAnalysis(true); + } else { + m_effectWidget->setVisible(false); + emit requestFrameForAnalysis(false); + m_glWidget->setVisible(true); } - render->doRefresh(); + if (!manuallyTriggered) + m_effectWidget->showVisibilityButton(show); + setUpdatesEnabled(true); + videoBox->setEnabled(show); + //render->doRefresh(); } } @@ -1046,22 +1079,29 @@ AbstractRender *Monitor::abstractRender() return render; } -MonitorRefresh::MonitorRefresh(QWidget* parent) : - QWidget(parent) - , m_renderer(NULL) +void Monitor::reloadProducer(const QString &id) { - // 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); - setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); - //setAttribute(Qt::WA_NoSystemBackground); + if (!m_currentClip) return; + if (m_currentClip->getId() == id) + slotSetClipProducer(m_currentClip, m_currentClip->zone(), true); } -void MonitorRefresh::setRenderer(Render* render) +QString Monitor::getMarkerThumb(GenTime pos) { - m_renderer = render; + 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); + if (m_ruler) m_ruler->updatePalette(); + +} Overlay::Overlay(QWidget* parent) : QLabel(parent) @@ -1071,151 +1111,47 @@ Overlay::Overlay(QWidget* parent) : setBackgroundRole(QPalette::Base); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); setCursor(Qt::PointingHandCursor); + } // virtual void Overlay::mouseReleaseEvent ( QMouseEvent * event ) { - event->accept(); + event->ignore(); } // virtual void Overlay::mousePressEvent( QMouseEvent * event ) { - event->accept(); + event->ignore(); } // virtual void Overlay::mouseDoubleClickEvent ( QMouseEvent * event ) { emit editMarker(); - event->accept(); + event->ignore(); } void Overlay::setOverlayText(const QString &text, bool isZone) { + if (text.isEmpty()) { + /*QPalette p; + p.setColor(QPalette::Base, KdenliveSettings::window_background()); + setPalette(p); + setText(QString()); + repaint();*/ + setHidden(true); + return; + } setHidden(true); - m_isZone = isZone; QPalette p; p.setColor(QPalette::Text, Qt::white); - if (m_isZone) p.setColor(QPalette::Base, QColor(200, 0, 0)); + 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); - 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); -} - -// virtual -void VideoContainer::mouseReleaseEvent(QMouseEvent * event) -{ - if (m_monitor->underMouse()) event->setAccepted(false); - else { - if (m_monitor->isActive()) { - m_monitor->slotPlay(); - event->accept(); - } - } -} - -// virtual -void VideoContainer::mouseMoveEvent(QMouseEvent *event) -{ - if (m_monitor->underMouse()) event->setAccepted(false); -} - -// virtual -void VideoContainer::keyPressEvent(QKeyEvent *event) -{ - // Exit fullscreen with Esc key - if (event->key() == Qt::Key_Escape && isFullScreen()) { - switchFullScreen(); - event->setAccepted(true); - } else event->setAccepted(false); -} - -// 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() -{ - // 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(); - } - m_monitor->pause(); }