X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=1a17c5f1ae29703e122d1f37cfec6e4a1d3aea94;hb=880efc8572a7df65453dfb5736de6455fe129a86;hp=73d3448f28faf1e3d83b50e78ebe7a2318e17379;hpb=a13bf0457c65427e08d5a206481f3d05bc0e5272;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 73d3448f..1a17c5f1 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -41,13 +41,13 @@ #include -Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : +Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) : QWidget(parent), render(NULL), m_name(name), m_monitorManager(manager), m_currentClip(NULL), - m_ruler(new SmallRuler()), + m_ruler(new SmallRuler(m_monitorManager)), m_overlay(NULL), m_isActive(false), m_scale(1), @@ -98,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())); } @@ -123,12 +130,14 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : //m_ruler->setPixelPerMark(3); + if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + 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); + render = new Render(m_name, (int) m_ui.video_frame->winId(), -1, profile, this); m_glWidget->setImageAspectRatio(render->dar()); m_glWidget->setBackgroundColor(KdenliveSettings::window_background()); m_glWidget->resize(m_ui.video_frame->size()); @@ -137,7 +146,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : #else m_monitorRefresh = new MonitorRefresh(m_ui.video_frame); rendererBox->addWidget(m_monitorRefresh); - render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this); + render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, profile, this); m_monitorRefresh->setRenderer(render); #endif @@ -187,8 +196,10 @@ 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); @@ -218,6 +229,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(); @@ -268,6 +285,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())); @@ -351,7 +388,8 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) { if (m_dragStarted) { if (m_ui.video_frame->underMouse()) { - slotPlay(); + if (isActive()) slotPlay(); + else activateMonitor(); } else QWidget::mouseReleaseEvent(event); m_dragStarted = false; } @@ -382,7 +420,6 @@ void Monitor::mouseMoveEvent(QMouseEvent *event) mimeData->setData("kdenlive/clip", data); drag->setMimeData(mimeData); QPixmap pix = m_currentClip->thumbnail(); - kDebug() << "/ / / /CLIP DRAGGED PIXMAP: " << pix.width() << "x" << pix.height(); drag->setPixmap(pix); drag->setHotSpot(QPoint(0, 50)); drag->start(Qt::MoveAction); @@ -450,11 +487,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); } } @@ -681,7 +726,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); } @@ -691,27 +736,32 @@ 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); } -void Monitor::slotSetXml(DocClipBase *clip, const int position) +void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position) { if (render == NULL) return; activateMonitor(); - if (!clip && m_currentClip != NULL) { + if (clip == NULL && m_currentClip != NULL) { m_currentClip = NULL; render->setProducer(NULL, -1); return; } 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())); + if (!zone.isNull()) { + m_ruler->setZone(zone.x(), zone.y()); + render->seek(GenTime(zone.x(), m_monitorManager->timecode().fps())); + } } void Monitor::slotOpenFile(const QString &file) @@ -737,10 +787,10 @@ void Monitor::slotSaveZone() } -void Monitor::resetProfile() +void Monitor::resetProfile(const QString profile) { if (render == NULL) return; - render->resetProfile(); + render->resetProfile(profile); } void Monitor::saveSceneList(QString path, QDomElement info)