X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=2142f76e312ad551392273bc2659f0aeee1b1b1e;hb=2b2005ab05cb19f7838a2ee7a13e51a970f0e2ed;hp=ea0478e0731913124e64790c123ed4ff4491b0f4;hpb=4f2ff860ac2157cbc10dec34eafac61a41ffc0ce;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index ea0478e0..2142f76e 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -38,6 +38,7 @@ #include #include #include +#include Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : @@ -97,6 +98,13 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : configButton->setMenu(m_configMenu); configButton->setPopupMode(QToolButton::QToolButton::InstantPopup); toolbar->addWidget(configButton); + + if (name == "clip") { + 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 *))); + } m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne())); m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo())); } @@ -107,8 +115,10 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : m_timePos = new KRestrictedLine(this); m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); m_frametimecode = KdenliveSettings::frametimecode(); - if (m_frametimecode) m_timePos->setInputMask("999999999"); - else m_timePos->setInputMask("99:99:99:99"); + if (m_frametimecode) { + m_timePos->setInputMask(QString()); + m_timePos->setValidator(new QIntValidator(this)); + } else m_timePos->setInputMask("99:99:99:99"); toolbar->addWidget(m_timePos); connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); @@ -122,10 +132,21 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : QVBoxLayout *rendererBox = new QVBoxLayout(m_ui.video_frame); rendererBox->setContentsMargins(0, 0, 0, 0); +#ifdef Q_WS_MAC + m_glWidget = new VideoGLWidget(m_ui.video_frame); + rendererBox->addWidget(m_glWidget); + render = new Render(m_name, (int) m_ui.video_frame->winId(), -1, this); + m_glWidget->setImageAspectRatio(render->dar()); + m_glWidget->setBackgroundColor(KdenliveSettings::window_background()); + m_glWidget->resize(m_ui.video_frame->size()); + connect(render, SIGNAL(showImageSignal(QImage)), m_glWidget, SLOT(showImage(QImage))); + m_monitorRefresh = 0; +#else m_monitorRefresh = new MonitorRefresh(m_ui.video_frame); rendererBox->addWidget(m_monitorRefresh); render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this); m_monitorRefresh->setRenderer(render); +#endif connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int))); connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int))); @@ -142,7 +163,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : } else { connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SLOT(setClipZone(QPoint))); } +#ifndef Q_WS_MAC m_monitorRefresh->show(); +#endif kDebug() << "/////// BUILDING MONITOR, ID: " << m_ui.video_frame->winId(); } @@ -171,15 +194,19 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe m_playMenu->addAction(loopZone); //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())); - + if (m_name == "clip") { + m_contextMenu->addMenu(m_markerMenu); + 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") { +#ifndef Q_WS_MAC QAction *splitView = m_contextMenu->addAction(KIcon("view-split-left-right"), i18n("Split view"), render, SLOT(slotSplitView(bool))); splitView->setCheckable(true); m_configMenu->addAction(splitView); +#endif } else { QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"), this, SLOT(slotSetThumbFrame())); m_configMenu->addAction(setThumbFrame); @@ -200,6 +227,12 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe } +void Monitor::slotGoToMarker(QAction *action) +{ + int pos = action->data().toInt(); + slotSeek(pos); +} + void Monitor::slotSetSizeOneToOne() { QRect r = QApplication::desktop()->screenGeometry(); @@ -250,6 +283,26 @@ DocClipBase *Monitor::activeClip() return m_currentClip; } +void Monitor::updateMarkers(DocClipBase *source) +{ + if (source == m_currentClip && source != NULL) { + m_markerMenu->clear(); + QList markers = m_currentClip->commentedSnapMarkers(); + if (!markers.isEmpty()) { + QList marks; + 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_markerMenu->setEnabled(!m_markerMenu->isEmpty()); + } +} + void Monitor::slotSeekToPreviousSnap() { if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps())); @@ -413,10 +466,10 @@ void Monitor::wheelEvent(QWheelEvent * event) { if (event->modifiers() == Qt::ControlModifier) { int delta = m_monitorManager->timecode().fps(); - if (event->delta() < 0) delta = 0 - delta; + if (event->delta() > 0) delta = 0 - delta; slotSeek(render->seekFramePosition() - delta); } else { - if (event->delta() <= 0) slotForwardOneFrame(); + if (event->delta() >= 0) slotForwardOneFrame(); else slotRewindOneFrame(); } } @@ -432,11 +485,19 @@ void Monitor::slotSetThumbFrame() void Monitor::slotExtractCurrentFrame() { - QPixmap frame = render->extractFrame(render->seekFramePosition()); - QString outputFile = KFileDialog::getSaveFileName(KUrl(), "image/png"); - 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); + QImage 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(); + delete fs; + if (!path.isEmpty()) { + frame.save(path); } } @@ -464,6 +525,7 @@ void Monitor::slotSeek() int frames; if (m_frametimecode) frames = m_timePos->text().toInt(); else frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); + //kDebug() << "// / / SEEK TO: " << frames; slotSeek(frames); } @@ -662,7 +724,7 @@ void Monitor::slotPlayZone() if (render == NULL) return; activateMonitor(); QPoint p = m_ruler->zone(); - render->playZone(GenTime(p.x(), render->fps()), GenTime(p.y(), render->fps())); + render->playZone(GenTime(p.x(), m_monitorManager->timecode().fps()), GenTime(p.y(), m_monitorManager->timecode().fps())); m_playAction->setChecked(true); m_playAction->setIcon(m_pauseIcon); } @@ -672,7 +734,7 @@ void Monitor::slotLoopZone() if (render == NULL) return; activateMonitor(); QPoint p = m_ruler->zone(); - render->loopZone(GenTime(p.x(), render->fps()), GenTime(p.y(), render->fps())); + render->loopZone(GenTime(p.x(), m_monitorManager->timecode().fps()), GenTime(p.y(), m_monitorManager->timecode().fps())); m_playAction->setChecked(true); m_playAction->setIcon(m_pauseIcon); } @@ -688,11 +750,12 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position) } if (clip != m_currentClip) { m_currentClip = clip; + updateMarkers(clip); if (render->setProducer(clip->producer(), position) == -1) { // MLT CONSUMER is broken emit blockMonitors(); } - } else if (position != -1) render->seek(GenTime(position, render->fps())); + } else if (position != -1) render->seek(GenTime(position, m_monitorManager->timecode().fps())); } void Monitor::slotOpenFile(const QString &file) @@ -753,9 +816,13 @@ void Monitor::slotSwitchMonitorInfo(bool show) KdenliveSettings::setDisplayMonitorInfo(show); if (show) { if (m_overlay) return; +#ifndef Q_WS_MAC m_overlay = new Overlay(m_monitorRefresh); m_overlay->raise(); m_overlay->setHidden(true); +#else + m_overlay = new Overlay(m_glWidget); +#endif } else { delete m_overlay; m_overlay = NULL; @@ -767,10 +834,12 @@ void Monitor::updateTimecodeFormat() m_frametimecode = KdenliveSettings::frametimecode(); if (m_frametimecode) { int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); - m_timePos->setInputMask("999999999"); + m_timePos->setValidator(new QIntValidator(this)); + m_timePos->setInputMask(QString()); m_timePos->setText(QString::number(frames)); } else { int pos = m_timePos->text().toInt(); + m_timePos->setValidator(0); m_timePos->setInputMask("99:99:99:99"); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); }