X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=a550944f0b6821b09e345ca44762fdb0622a6156;hb=b8421eb0562ff039790def1b31a4fc6c66676380;hp=2142f76e312ad551392273bc2659f0aeee1b1b1e;hpb=2b2005ab05cb19f7838a2ee7a13e51a970f0e2ed;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 2142f76e..a550944f 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), @@ -115,10 +115,14 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : m_timePos = new KRestrictedLine(this); m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); m_frametimecode = KdenliveSettings::frametimecode(); + m_timePos->setInputMask(""); if (m_frametimecode) { - m_timePos->setInputMask(QString()); - m_timePos->setValidator(new QIntValidator(this)); - } else m_timePos->setInputMask("99:99:99:99"); + QIntValidator *valid = new QIntValidator(this); + valid->setBottom(0); + m_timePos->setValidator(valid); + } else + m_timePos->setValidator(m_monitorManager->timecode().validator()); + toolbar->addWidget(m_timePos); connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); @@ -130,12 +134,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 +150,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); @@ -345,8 +349,6 @@ GenTime Monitor::getSnapForPos(bool previous) return GenTime(); } - - void Monitor::slotZoneMoved(int start, int end) { m_ruler->setZone(start, end); @@ -386,13 +388,13 @@ 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; } } - // virtual void Monitor::mouseMoveEvent(QMouseEvent *event) { @@ -417,7 +419,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); @@ -452,16 +453,7 @@ QStringList Monitor::mimeTypes() const return qstrList; } - // virtual -/** Move to other position on mousewheel - * - * Moves towards end of clip/timeline on mousewheel down/back, - * opposite for mousewheel up/forward. - * - * Ctrl+wheel moves single frame, without Ctrl moves a second. - * - * See also http://www.kdenlive.org/mantis/view.php?id=265 */ void Monitor::wheelEvent(QWheelEvent * event) { if (event->modifiers() == Qt::ControlModifier) { @@ -508,7 +500,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(m_name == "clip"); + } } void Monitor::setTimePos(const QString &pos) @@ -558,7 +552,7 @@ void Monitor::slotStart() activateMonitor(); render->play(0); render->seekToFrame(0); - emit renderPosition(0); + //emit renderPosition(0); } void Monitor::slotEnd() @@ -566,7 +560,7 @@ void Monitor::slotEnd() activateMonitor(); render->play(0); render->seekToFrame(render->getLength()); - emit renderPosition(render->seekFramePosition()); + //emit renderPosition(render->seekFramePosition()); } void Monitor::slotZoneStart() @@ -628,26 +622,23 @@ 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) { - 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)); } - 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); } @@ -677,20 +668,20 @@ 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) { - if (visible && render) { + if (visible && render && !m_isActive) { activateMonitor(); render->doRefresh(); //askForRefresh(); } @@ -739,23 +730,28 @@ 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; + m_length = -1; render->setProducer(NULL, -1); return; } + if (m_currentClip != NULL) activateMonitor(); if (clip != m_currentClip) { m_currentClip = clip; updateMarkers(clip); if (render->setProducer(clip->producer(), position) == -1) { // MLT CONSUMER is broken - emit blockMonitors(); + kDebug(QtWarningMsg) << "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) @@ -780,11 +776,10 @@ void Monitor::slotSaveZone() //render->setSceneList(doc, 0); } - -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) @@ -799,7 +794,6 @@ const QString Monitor::sceneList() return render->sceneList(); } - void Monitor::setClipZone(QPoint pos) { if (m_currentClip == NULL) return; @@ -832,19 +826,29 @@ void Monitor::slotSwitchMonitorInfo(bool show) void Monitor::updateTimecodeFormat() { m_frametimecode = KdenliveSettings::frametimecode(); + m_timePos->setInputMask(""); if (m_frametimecode) { int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); - m_timePos->setValidator(new QIntValidator(this)); - m_timePos->setInputMask(QString()); + QIntValidator *valid = new QIntValidator(this); + valid->setBottom(0); + m_timePos->setValidator(valid); 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->setValidator(m_monitorManager->timecode().validator()); 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), @@ -865,7 +869,6 @@ void MonitorRefresh::paintEvent(QPaintEvent * /*event*/) if (m_renderer) m_renderer->doRefresh(); } - Overlay::Overlay(QWidget* parent) : QLabel(parent) { @@ -886,8 +889,6 @@ void Overlay::paintEvent(QPaintEvent * /*event*/) painter.drawText(rect(), Qt::AlignCenter, text()); } - - void Overlay::setOverlayText(const QString &text, bool isZone) { setHidden(true);