X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=ffa5d9efc833fb3b17cb397cf84669dc46b5b2ec;hb=ffbd98f8303b09f3fd4f7cf2c74c20080c7fd115;hp=9bb76d83afaaeaeec2593b7ba928e897d2813c6f;hpb=2b1c40908368fff4b20912551c266e45c89f6607;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 9bb76d83..ffa5d9ef 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), @@ -130,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()); @@ -144,15 +146,13 @@ 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 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())); //render->createVideoXWindow(m_ui.video_frame->winId(), -1); @@ -194,8 +194,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); @@ -283,7 +285,7 @@ DocClipBase *Monitor::activeClip() void Monitor::updateMarkers(DocClipBase *source) { - if (source == m_currentClip) { + if (source == m_currentClip && source != NULL) { m_markerMenu->clear(); QList markers = m_currentClip->commentedSnapMarkers(); if (!markers.isEmpty()) { @@ -384,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; } @@ -415,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); @@ -484,10 +486,12 @@ void Monitor::slotSetThumbFrame() void Monitor::slotExtractCurrentFrame() { QImage frame = render->extractFrame(render->seekFramePosition()); - KFileDialog *fs = new KFileDialog(KUrl(), "image/png",this); + 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(); @@ -504,7 +508,9 @@ 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) @@ -554,7 +560,7 @@ void Monitor::slotStart() activateMonitor(); render->play(0); render->seekToFrame(0); - emit renderPosition(0); + //emit renderPosition(0); } void Monitor::slotEnd() @@ -562,7 +568,7 @@ void Monitor::slotEnd() activateMonitor(); render->play(0); render->seekToFrame(render->getLength()); - emit renderPosition(render->seekFramePosition()); + //emit renderPosition(render->seekFramePosition()); } void Monitor::slotZoneStart() @@ -624,10 +630,11 @@ void Monitor::slotForwardOneFrame(int diff) void Monitor::seekCursor(int pos) { activateMonitor(); - checkOverlay(); - if (m_frametimecode) m_timePos->setText(QString::number(pos)); - else 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) @@ -639,11 +646,14 @@ void Monitor::rendererStopped(int pos) return; } } - m_ruler->slotNewValue(pos); - checkOverlay(); - if (m_frametimecode) m_timePos->setText(QString::number(pos)); - else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(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)); + } + 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); } @@ -673,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) @@ -735,23 +745,27 @@ void Monitor::slotLoopZone() 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); + updateMarkers(clip); if (render->setProducer(clip->producer(), position) == -1) { // MLT CONSUMER is broken - emit blockMonitors(); + 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) @@ -777,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) @@ -841,6 +855,16 @@ void Monitor::updateTimecodeFormat() } } +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),