X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=88259bf8690f062b87b020f6ee94ad69c9b72076;hb=b7afae4d27a5b5659775725e17e20eaa0c93a240;hp=a4db4461b66d1aea53b33f2a739e6b505e1be176;hpb=9600c5a0f5444b9cb4855bbab784afedb27b3e02;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index a4db4461..88259bf8 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -38,21 +38,23 @@ #include #include #include +#include Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : QWidget(parent), render(NULL), - m_monitorManager(manager), m_name(name), - m_isActive(false), + m_monitorManager(manager), m_currentClip(NULL), - m_dragStarted(false), - m_overlay(NULL) + m_ruler(new SmallRuler()), + m_overlay(NULL), + m_isActive(false), + m_scale(1), + m_length(0), + m_dragStarted(false) { m_ui.setupUi(this); - m_scale = 1; - m_ruler = new SmallRuler(); QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_ruler); @@ -66,8 +68,10 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : m_playIcon = KIcon("media-playback-start"); m_pauseIcon = KIcon("media-playback-pause"); - toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart())); - toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd())); + if (name != "chapter") { + toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart())); + toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd())); + } else m_ruler->setZone(-3, -2); toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind())); toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); @@ -87,19 +91,34 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : playButton->setDefaultAction(m_playAction); - QToolButton *configButton = new QToolButton(toolbar); - m_configMenu = new QMenu(i18n("Misc..."), this); - configButton->setIcon(KIcon("system-run")); - configButton->setMenu(m_configMenu); - configButton->setPopupMode(QToolButton::QToolButton::InstantPopup); - toolbar->addWidget(configButton); + if (name != "chapter") { + QToolButton *configButton = new QToolButton(toolbar); + m_configMenu = new QMenu(i18n("Misc..."), this); + configButton->setIcon(KIcon("system-run")); + 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())); + } QWidget *spacer = new QWidget(this); spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); toolbar->addWidget(spacer); m_timePos = new KRestrictedLine(this); m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); - m_timePos->setInputMask("99:99:99:99"); + m_frametimecode = KdenliveSettings::frametimecode(); + 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())); @@ -113,21 +132,29 @@ 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))); connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int))); + connect(render, SIGNAL(blockMonitors()), this, SIGNAL(blockMonitors())); - 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(m_ui.video_frame->winId(), -1); - m_length = 0; if (name != "clip") { connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int))); @@ -136,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(); } @@ -146,6 +175,7 @@ Monitor::~Monitor() delete m_timePos; delete m_overlay; delete m_monitorRefresh; + delete render; } QString Monitor::name() const @@ -170,9 +200,11 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe 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); @@ -182,10 +214,23 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe showTips->setCheckable(true); connect(showTips, SIGNAL(toggled(bool)), this, SLOT(slotSwitchMonitorInfo(bool))); showTips->setChecked(KdenliveSettings::displayMonitorInfo()); + + QAction *dropFrames = m_contextMenu->addAction(KIcon(), i18n("Real time (drop frames)")); + 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) +{ + int pos = action->data().toInt(); + slotSeek(pos); +} + void Monitor::slotSetSizeOneToOne() { QRect r = QApplication::desktop()->screenGeometry(); @@ -236,6 +281,26 @@ DocClipBase *Monitor::activeClip() return m_currentClip; } +void Monitor::updateMarkers(DocClipBase *source) +{ + if (source == m_currentClip) { + 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(render->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())); @@ -248,7 +313,7 @@ void Monitor::slotSeekToNextSnap() GenTime Monitor::position() { - return GenTime(m_position, m_monitorManager->timecode().fps()); + return render->seekPosition(); } GenTime Monitor::getSnapForPos(bool previous) @@ -266,7 +331,7 @@ GenTime Monitor::getSnapForPos(bool previous) snaps.append(m_currentClip->duration()); qSort(snaps); - const GenTime pos(m_position, m_monitorManager->timecode().fps()); + const GenTime pos = render->seekPosition(); for (int i = 0; i < snaps.size(); ++i) { if (previous && snaps.at(i) >= pos) { if (i == 0) i = 1; @@ -289,7 +354,7 @@ void Monitor::slotZoneMoved(int start, int end) void Monitor::slotSetZoneStart() { - m_ruler->setZone(m_position, -1); + m_ruler->setZone(render->seekFramePosition(), -1); emit zoneUpdated(m_ruler->zone()); checkOverlay(); setClipZone(m_ruler->zone()); @@ -297,7 +362,7 @@ void Monitor::slotSetZoneStart() void Monitor::slotSetZoneEnd() { - m_ruler->setZone(-1, m_position); + m_ruler->setZone(-1, render->seekFramePosition()); emit zoneUpdated(m_ruler->zone()); checkOverlay(); setClipZone(m_ruler->zone()); @@ -399,10 +464,10 @@ 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); + if (event->delta() > 0) delta = 0 - delta; + slotSeek(render->seekFramePosition() - delta); } else { - if (event->delta() <= 0) slotForwardOneFrame(); + if (event->delta() >= 0) slotForwardOneFrame(); else slotRewindOneFrame(); } } @@ -412,17 +477,23 @@ void Monitor::slotSetThumbFrame() if (m_currentClip == NULL) { return; } - m_currentClip->setClipThumbFrame((uint) m_position); + m_currentClip->setClipThumbFrame((uint) render->seekFramePosition()); emit refreshClipThumbnail(m_currentClip->getId()); } void Monitor::slotExtractCurrentFrame() { - QPixmap frame = render->extractFrame(m_position); - 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); + fs->setConfirmOverwrite(true); + fs->setKeepLocation(true); + fs->exec(); + QString path = fs->selectedFile(); + delete fs; + if (!path.isEmpty()) { + frame.save(path); } } @@ -438,13 +509,19 @@ void Monitor::activateMonitor() void Monitor::setTimePos(const QString &pos) { - m_timePos->setText(pos); + if (m_frametimecode) { + int frames = m_monitorManager->timecode().getFrameCount(pos); + m_timePos->setText(QString::number(frames)); + } else m_timePos->setText(pos); slotSeek(); } void Monitor::slotSeek() { - const int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps()); + 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); } @@ -452,22 +529,20 @@ void Monitor::slotSeek(int pos) { activateMonitor(); if (render == NULL) return; - m_position = pos; - checkOverlay(); render->seekToFrame(pos); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + emit renderPosition(render->seekFramePosition()); } void Monitor::checkOverlay() { if (m_overlay == NULL) return; + int pos = render->seekFramePosition(); 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")); + if (pos == zone.x()) m_overlay->setOverlayText(i18n("In Point")); + else if (pos == zone.y()) m_overlay->setOverlayText(i18n("Out Point")); else { if (m_currentClip) { - QString markerComment = m_currentClip->markerComment(GenTime(m_position, m_monitorManager->timecode().fps())); + 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); @@ -478,40 +553,32 @@ void Monitor::slotStart() { activateMonitor(); render->play(0); - m_position = 0; - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + render->seekToFrame(0); + emit renderPosition(0); } void Monitor::slotEnd() { activateMonitor(); render->play(0); - m_position = render->getLength(); - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + render->seekToFrame(render->getLength()); + emit renderPosition(render->seekFramePosition()); } void Monitor::slotZoneStart() { activateMonitor(); render->play(0); - m_position = m_ruler->zone().x(); - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + render->seekToFrame(m_ruler->zone().x()); + emit renderPosition(render->seekFramePosition()); } void Monitor::slotZoneEnd() { activateMonitor(); render->play(0); - m_position = m_ruler->zone().y(); - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + render->seekToFrame(m_ruler->zone().y()); + emit renderPosition(render->seekFramePosition()); } void Monitor::slotRewind(double speed) @@ -542,48 +609,40 @@ void Monitor::slotRewindOneFrame(int diff) { activateMonitor(); render->play(0); - if (m_position < 1) return; - /* - * freebsd needs this hack to upgrade m_position value: - * http://www.kdenlive.org/mantis/view.php?id=491 - */ - int position = m_position - diff; - m_position = qMax(position, 0); - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); - checkOverlay(); + render->seekToFrameDiff(-diff); + emit renderPosition(render->seekFramePosition()); } void Monitor::slotForwardOneFrame(int diff) { activateMonitor(); render->play(0); - if (m_position >= m_length) return; - m_position += diff; - m_position = qMin(m_position, m_length); - render->seekToFrame(m_position); - emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); - checkOverlay(); + render->seekToFrameDiff(diff); + emit renderPosition(render->seekFramePosition()); } void Monitor::seekCursor(int pos) { activateMonitor(); checkOverlay(); - m_position = pos; - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + if (m_frametimecode) m_timePos->setText(QString::number(pos)); + else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); m_ruler->slotNewValue(pos); } void Monitor::rendererStopped(int pos) { - //int rulerPos = (int)(pos * m_scale); + if (m_currentClip != NULL && m_playAction->isChecked()) { + // Clip monitor + if (pos >= m_length - 1) { + slotStart(); + return; + } + } m_ruler->slotNewValue(pos); - m_position = pos; - //checkOverlay(); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + checkOverlay(); + if (m_frametimecode) m_timePos->setText(QString::number(pos)); + else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); m_playAction->setChecked(false); m_playAction->setIcon(m_playIcon); } @@ -687,8 +746,11 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position) } if (clip != m_currentClip) { m_currentClip = clip; - render->setProducer(clip->producer(), position); - m_position = position; + 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())); } @@ -740,26 +802,53 @@ void Monitor::setClipZone(QPoint pos) m_currentClip->setZone(pos); } +void Monitor::slotSwitchDropFrames(bool show) +{ + render->setDropFrames(show); +} + 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; } } +void Monitor::updateTimecodeFormat() +{ + m_frametimecode = KdenliveSettings::frametimecode(); + if (m_frametimecode) { + int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); + 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)); + } +} + + MonitorRefresh::MonitorRefresh(QWidget* parent) : \ QWidget(parent), m_renderer(NULL) { setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); + setAttribute(Qt::WA_OpaquePaintEvent); + //setAttribute(Qt::WA_NoSystemBackground); } void MonitorRefresh::setRenderer(Render* render)