X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=4de7d7dfc9120f136b9ea3f52a41d839b0f72666;hb=1930a8bde87b38dd699e1cf8ce7761df85d9e0e1;hp=267728778cd71687e88370ec6e50c4b43bd85b73;hpb=04b9d547a562f35c58ee034ebfe09ec4ea414c48;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 26772877..4de7d7df 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -24,12 +24,14 @@ #include #include #include +#include #include #include #include +#include +#include -#include "gentime.h" #include "monitor.h" #include "renderer.h" #include "monitormanager.h" @@ -61,16 +63,16 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); QToolButton *playButton = new QToolButton(toolbar); - QMenu *playMenu = new QMenu(i18n("Play..."), this); - playButton->setMenu(playMenu); - playButton->setPopupMode(QToolButton::MenuButtonPopup); - toolbar->addWidget(playButton); - - m_playAction = playMenu->addAction(m_playIcon, i18n("Play")); + m_playMenu = new QMenu(i18n("Play..."), this); + m_playAction = m_playMenu->addAction(m_playIcon, i18n("Play")); m_playAction->setCheckable(true); connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); - playMenu->addAction(m_playIcon, i18n("Play Section"), this, SLOT(slotPlayZone())); - playMenu->addAction(m_playIcon, i18n("Loop Section"), this, SLOT(slotLoopZone())); + m_playMenu->addAction(m_playIcon, i18n("Play Section"), this, SLOT(slotPlayZone())); + m_playMenu->addAction(m_playIcon, i18n("Loop Section"), this, SLOT(slotLoopZone())); + + playButton->setMenu(m_playMenu); + playButton->setPopupMode(QToolButton::MenuButtonPopup); + toolbar->addWidget(playButton); toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame())); toolbar->addAction(KIcon("media-seek-forward"), i18n("Forward"), this, SLOT(slotForward())); @@ -78,9 +80,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) playButton->setDefaultAction(m_playAction); QToolButton *configButton = new QToolButton(toolbar); - QMenu *configMenu = new QMenu(i18n("Misc..."), this); + m_configMenu = new QMenu(i18n("Misc..."), this); configButton->setIcon(KIcon("system-run")); - configButton->setMenu(configMenu); + configButton->setMenu(m_configMenu); configButton->setPopupMode(QToolButton::QToolButton::InstantPopup); toolbar->addWidget(configButton); @@ -92,6 +94,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) m_timePos->setInputMask("99:99:99:99"); toolbar->addWidget(m_timePos); + connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); + layout2->addWidget(toolbar); ui.button_frame->setLayout(layout2); const int toolHeight = toolbar->height(); @@ -99,7 +103,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) //m_ruler->setPixelPerMark(3); - QVBoxLayout *rendererBox = new QVBoxLayout(ui.video_frame); rendererBox->setContentsMargins(0, 0, 0, 0); m_monitorRefresh = new MonitorRefresh(ui.video_frame); @@ -107,13 +110,10 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this); m_monitorRefresh->setRenderer(render); - m_contextMenu = new QMenu(this); - m_contextMenu->addMenu(playMenu); - QMenu *goMenu = new QMenu(i18n("Go to..."), this); - goMenu->addAction(i18n("Start"), this, SLOT(slotStart())); - goMenu->addAction(i18n("End"), this, SLOT(slotEnd())); - goMenu->addAction(i18n("Zone start"), this, SLOT(slotZoneStart())); - goMenu->addAction(i18n("Zone end"), this, SLOT(slotZoneEnd())); + m_overlay = new Overlay(m_monitorRefresh); + m_overlay->raise(); + m_overlay->setHidden(true); + connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int))); connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SIGNAL(zoneUpdated(QPoint))); @@ -121,40 +121,54 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int))); - configMenu->addSeparator(); - configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne())); - configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo())); + m_configMenu->addSeparator(); + m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne())); + m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo())); //render->createVideoXWindow(ui.video_frame->winId(), -1); m_length = 0; - m_contextMenu->addMenu(goMenu); - m_contextMenu->addAction(zoneStart); - m_contextMenu->addAction(zoneEnd); - //TODO: add save zone to timeline monitor when fixed - if (name == "clip") m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); - - QAction *extractFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame())); - configMenu->addAction(extractFrame); - if (name != "clip") { connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int))); connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int))); - QAction *splitView = m_contextMenu->addAction(KIcon("document-new"), i18n("Split view"), render, SLOT(slotSplitView(bool))); - splitView->setCheckable(true); - configMenu->addAction(splitView); - } else { - QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"), this, SLOT(slotSetThumbFrame())); - configMenu->addAction(setThumbFrame); } - m_monitorRefresh->show(); kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId(); } +Monitor::~Monitor() { + delete m_ruler; + delete m_timePos; + delete m_overlay; + delete m_monitorRefresh; +} + QString Monitor::name() const { return m_name; } +void Monitor::setupMenu(QMenu *goMenu, QMenu *markerMenu) { + m_contextMenu = new QMenu(this); + m_contextMenu->addMenu(m_playMenu); + m_contextMenu->addMenu(goMenu); + if (markerMenu) m_contextMenu->addMenu(markerMenu); + + //TODO: add save zone to timeline monitor when fixed + if (m_name == "clip") m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); + + QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame())); + m_contextMenu->addAction(extractFrame); + + if (m_name != "clip") { + QAction *splitView = m_contextMenu->addAction(KIcon("document-new"), i18n("Split view"), render, SLOT(slotSplitView(bool))); + splitView->setCheckable(true); + m_configMenu->addAction(splitView); + } else { + QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"), this, SLOT(slotSetThumbFrame())); + m_configMenu->addAction(setThumbFrame); + } + +} + void Monitor::slotSetSizeOneToOne() { QRect r = QApplication::desktop()->screenGeometry(); const int maxWidth = r.width() - 20; @@ -197,18 +211,65 @@ void Monitor::resetSize() { ui.video_frame->setMinimumSize(0, 0); } +DocClipBase *Monitor::activeClip() { + return m_currentClip; +} + +void Monitor::slotSeekToPreviousSnap() { + if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps())); +} + +void Monitor::slotSeekToNextSnap() { + if (m_currentClip) slotSeek(getSnapForPos(false).frames(m_monitorManager->timecode().fps())); +} + +GenTime Monitor::position() { + return GenTime(m_position, m_monitorManager->timecode().fps()); +} + +GenTime Monitor::getSnapForPos(bool previous) { + QList snaps; + QList < GenTime > markers = m_currentClip->snapMarkers(); + for (int i = 0; i < markers.size(); ++i) { + GenTime t = markers.at(i); + snaps.append(t); + } + QPoint zone = m_ruler->zone(); + snaps.append(GenTime(zone.x(), m_monitorManager->timecode().fps())); + snaps.append(GenTime(zone.y(), m_monitorManager->timecode().fps())); + snaps.append(GenTime()); + snaps.append(m_currentClip->duration()); + qSort(snaps); + + const GenTime pos(m_position, m_monitorManager->timecode().fps()); + for (int i = 0; i < snaps.size(); ++i) { + if (previous && snaps.at(i) >= pos) { + if (i == 0) i = 1; + return snaps.at(i - 1); + } else if (!previous && snaps.at(i) > pos) { + return snaps.at(i); + } + } + return GenTime(); +} + + + void Monitor::slotZoneMoved(int start, int end) { m_ruler->setZone(start, end); + checkOverlay(); } void Monitor::slotSetZoneStart() { m_ruler->setZone(m_position, -1); emit zoneUpdated(m_ruler->zone()); + checkOverlay(); } void Monitor::slotSetZoneEnd() { m_ruler->setZone(-1, m_position); emit zoneUpdated(m_ruler->zone()); + checkOverlay(); } // virtual @@ -234,7 +295,7 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) { // virtual void Monitor::mouseMoveEvent(QMouseEvent *event) { - kDebug() << "// DRAG STARTED, MOUSE MOVED: "; + // kDebug() << "// DRAG STARTED, MOUSE MOVED: "; if (!m_dragStarted || m_currentClip == NULL) return; if ((event->pos() - m_DragStartPosition).manhattanLength() @@ -291,13 +352,21 @@ QStringList Monitor::mimeTypes() const { // 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) { int delta = m_monitorManager->timecode().fps(); if (event->delta() < 0) delta = 0 - delta; - slotSeek(m_position + delta); + slotSeek(m_position - delta); } else { - if (event->delta() > 0) slotForwardOneFrame(); + if (event->delta() <= 0) slotForwardOneFrame(); else slotRewindOneFrame(); } } @@ -313,7 +382,10 @@ void Monitor::slotSetThumbFrame() { void Monitor::slotExtractCurrentFrame() { QPixmap frame = render->extractFrame(m_position); QString outputFile = KFileDialog::getSaveFileName(KUrl(), "image/png"); - if (!outputFile.isEmpty()) frame.save(outputFile); + if (!outputFile.isEmpty()) { + if (QFile::exists(outputFile) && KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return; + frame.save(outputFile); + } } bool Monitor::isActive() const { @@ -321,20 +393,39 @@ bool Monitor::isActive() const { } void Monitor::activateMonitor() { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + if (!m_isActive) m_monitorManager->switchMonitors(); //m_monitorManager->activateMonitor(m_name); +} + +void Monitor::slotSeek() { + const int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps()); + slotSeek(frames); } void Monitor::slotSeek(int pos) { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); if (render == NULL) return; - render->seekToFrame(pos); m_position = pos; + checkOverlay(); + render->seekToFrame(pos); emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); } +void Monitor::checkOverlay() { + QPoint zone = m_ruler->zone(); + if (m_position == zone.x()) m_overlay->setOverlayText(i18n("In Point")); + else if (m_position == zone.y()) m_overlay->setOverlayText(i18n("Out Point")); + else { + if (m_currentClip) { + QString markerComment = m_currentClip->markerComment(GenTime(m_position, m_monitorManager->timecode().fps())); + if (markerComment.isEmpty()) m_overlay->setHidden(true); + else m_overlay->setOverlayText(markerComment, false); + } else m_overlay->setHidden(true); + } +} + void Monitor::slotStart() { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); render->play(0); m_position = 0; render->seekToFrame(m_position); @@ -343,7 +434,7 @@ void Monitor::slotStart() { } void Monitor::slotEnd() { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); render->play(0); m_position = render->getLength(); render->seekToFrame(m_position); @@ -352,7 +443,7 @@ void Monitor::slotEnd() { } void Monitor::slotZoneStart() { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); render->play(0); m_position = m_ruler->zone().x(); render->seekToFrame(m_position); @@ -361,7 +452,7 @@ void Monitor::slotZoneStart() { } void Monitor::slotZoneEnd() { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); render->play(0); m_position = m_ruler->zone().y(); render->seekToFrame(m_position); @@ -370,7 +461,7 @@ void Monitor::slotZoneEnd() { } void Monitor::slotRewind(double speed) { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); if (speed == 0) { double currentspeed = render->playSpeed(); if (currentspeed >= 0) render->play(-2); @@ -381,7 +472,7 @@ void Monitor::slotRewind(double speed) { } void Monitor::slotForward(double speed) { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); if (speed == 0) { double currentspeed = render->playSpeed(); if (currentspeed <= 1) render->play(2); @@ -391,29 +482,34 @@ void Monitor::slotForward(double speed) { m_playAction->setIcon(m_pauseIcon); } -void Monitor::slotRewindOneFrame() { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); +void Monitor::slotRewindOneFrame(int diff) { + activateMonitor(); render->play(0); if (m_position < 1) return; - m_position--; + m_position -= diff; + m_position = qMax(m_position, 0); + checkOverlay(); render->seekToFrame(m_position); emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); } -void Monitor::slotForwardOneFrame() { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); +void Monitor::slotForwardOneFrame(int diff) { + activateMonitor(); render->play(0); if (m_position >= m_length) return; - m_position++; + m_position += diff; + m_position = qMin(m_position, m_length); + checkOverlay(); render->seekToFrame(m_position); emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); } void Monitor::seekCursor(int pos) { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); m_position = pos; + //checkOverlay(); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); m_ruler->slotNewValue(pos); } @@ -458,14 +554,14 @@ void Monitor::start() { void Monitor::refreshMonitor(bool visible) { if (visible && render) { - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); render->doRefresh(); //askForRefresh(); } } void Monitor::pause() { if (render == NULL) return; - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); render->pause(); //m_playAction->setChecked(true); //m_playAction->setIcon(m_pauseIcon); @@ -473,7 +569,7 @@ void Monitor::pause() { void Monitor::slotPlay() { if (render == NULL) return; - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); render->switchPlay(); m_playAction->setChecked(true); m_playAction->setIcon(m_pauseIcon); @@ -481,7 +577,7 @@ void Monitor::slotPlay() { void Monitor::slotPlayZone() { if (render == NULL) return; - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); QPoint p = m_ruler->zone(); render->playZone(GenTime(p.x(), render->fps()), GenTime(p.y(), render->fps())); m_playAction->setChecked(true); @@ -490,7 +586,7 @@ void Monitor::slotPlayZone() { void Monitor::slotLoopZone() { if (render == NULL) return; - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); QPoint p = m_ruler->zone(); render->loopZone(GenTime(p.x(), render->fps()), GenTime(p.y(), render->fps())); m_playAction->setChecked(true); @@ -499,7 +595,7 @@ void Monitor::slotLoopZone() { void Monitor::slotSetXml(DocClipBase *clip, const int position) { if (render == NULL) return; - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); if (!clip) return; if (clip != m_currentClip && clip->producer() != NULL) { m_currentClip = clip; @@ -513,7 +609,7 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position) { void Monitor::slotOpenFile(const QString &file) { if (render == NULL) return; - if (!m_isActive) m_monitorManager->activateMonitor(m_name); + activateMonitor(); QDomDocument doc; QDomElement westley = doc.createElement("westley"); doc.appendChild(westley); @@ -542,6 +638,13 @@ void Monitor::saveSceneList(QString path, QDomElement info) { render->saveSceneList(path, info); } +QDomDocument Monitor::sceneList() { + if (render == NULL) return QDomDocument(); + QDomDocument doc; + doc.setContent(render->sceneList()); + return doc; +} + MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) { setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); @@ -555,4 +658,34 @@ void MonitorRefresh::paintEvent(QPaintEvent * event) { if (m_renderer) m_renderer->doRefresh(); } + +Overlay::Overlay(QWidget* parent): QLabel(parent) { + setAttribute(Qt::WA_TransparentForMouseEvents); + //setAttribute(Qt::WA_OpaquePaintEvent); // + //setAttribute(Qt::WA_NoSystemBackground); + setAutoFillBackground(false); +} + +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; + setText(' ' + text + ' '); + setHidden(false); + update(); +} + + + #include "monitor.moc"