X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=ffa5d9efc833fb3b17cb397cf84669dc46b5b2ec;hb=ffbd98f8303b09f3fd4f7cf2c74c20080c7fd115;hp=b443ac95999b7fd2504c7bbdc2d5a33ab894c8bc;hpb=1230e3912b72b4fed3cf9dc6ec2453ba5813a95d;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index b443ac95..ffa5d9ef 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -38,23 +38,23 @@ #include #include #include +#include -Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : +Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) : QWidget(parent), render(NULL), - m_monitorManager(manager), m_name(name), - m_isActive(false), + m_monitorManager(manager), m_currentClip(NULL), + m_ruler(new SmallRuler(m_monitorManager)), + m_overlay(NULL), + m_isActive(false), + m_scale(1), m_length(0), - m_position(-1), - m_dragStarted(false), - m_overlay(NULL) + 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); @@ -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())); } @@ -107,7 +114,11 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : 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())); @@ -119,16 +130,28 @@ 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, profile, 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); + render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, profile, 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))); //render->createVideoXWindow(m_ui.video_frame->winId(), -1); @@ -140,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(); } @@ -150,6 +175,7 @@ Monitor::~Monitor() delete m_timePos; delete m_overlay; delete m_monitorRefresh; + delete render; } QString Monitor::name() const @@ -168,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); @@ -186,10 +216,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(); @@ -240,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())); @@ -252,7 +315,7 @@ void Monitor::slotSeekToNextSnap() GenTime Monitor::position() { - return GenTime(m_position, m_monitorManager->timecode().fps()); + return render->seekPosition(); } GenTime Monitor::getSnapForPos(bool previous) @@ -270,7 +333,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; @@ -293,7 +356,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()); @@ -301,7 +364,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()); @@ -323,7 +386,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; } @@ -354,7 +418,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); @@ -403,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; - 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(); } } @@ -416,17 +479,25 @@ 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); +#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); } } @@ -437,18 +508,26 @@ bool Monitor::isActive() const void Monitor::activateMonitor() { - if (!m_isActive) m_monitorManager->switchMonitors(); //m_monitorManager->activateMonitor(m_name); + if (!m_isActive) { + m_monitorManager->slotSwitchMonitors(); + } } 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); } @@ -456,20 +535,20 @@ void Monitor::slotSeek(int pos) { activateMonitor(); if (render == NULL) return; - m_position = pos; render->seekToFrame(pos); - emit renderPosition(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); @@ -480,36 +559,32 @@ void Monitor::slotStart() { activateMonitor(); render->play(0); - m_position = 0; - render->seekToFrame(m_position); - emit renderPosition(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); + 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); + 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); + render->seekToFrame(m_ruler->zone().y()); + emit renderPosition(render->seekFramePosition()); } void Monitor::slotRewind(double speed) @@ -540,45 +615,45 @@ 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) + 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); + 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)); - m_ruler->slotNewValue(pos); + if (m_ruler->slotNewValue(pos)) { + checkOverlay(); + if (m_frametimecode) m_timePos->setText(QString::number(pos)); + else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + } } void Monitor::rendererStopped(int pos) { - //int rulerPos = (int)(pos * m_scale); - m_ruler->slotNewValue(pos); - m_position = pos; - checkOverlay(); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + if (m_currentClip != NULL && m_playAction->isChecked()) { + // Clip monitor + if (pos >= m_length - 1) { + slotStart(); + return; + } + } + if (m_ruler->slotNewValue(pos)) { + checkOverlay(); + if (m_frametimecode) m_timePos->setText(QString::number(pos)); + else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + } + disconnect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); m_playAction->setChecked(false); + connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); m_playAction->setIcon(m_playIcon); } @@ -608,15 +683,15 @@ void Monitor::adjustRulerSize(int length) void Monitor::stop() { m_isActive = false; + disconnect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); if (render) render->stop(); - //kDebug()<<"/// MONITOR RENDER STOP"; } void Monitor::start() { m_isActive = true; if (render) render->start(); - //kDebug()<<"/// MONITOR RENDER START"; + connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); } void Monitor::refreshMonitor(bool visible) @@ -655,7 +730,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); } @@ -665,25 +740,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; - render->setProducer(clip->producer(), position); - m_position = position; - } else if (position != -1) render->seek(GenTime(position, render->fps())); + updateMarkers(clip); + if (render->setProducer(clip->producer(), position) == -1) { + // MLT CONSUMER is broken + kdWarning() << "ERROR, Cannot start monitor"; + } + } 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) @@ -709,10 +791,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) @@ -734,26 +816,63 @@ 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)); + } +} + +QStringList Monitor::getZoneInfo() const +{ + QStringList result; + if (m_currentClip == NULL) return result; + result << m_currentClip->getId(); + QPoint zone = m_ruler->zone(); + result << QString::number(zone.x()) << QString::number(zone.y()); + return result; +} + + 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)