X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=bc3cd477fef30aeeda426a94079541251311f61d;hb=a059577142fd9fd62df939f53dfade469ba93de1;hp=28a67f7711a4440f97e97c6f2821e8ec02920dc1;hpb=5ee798aed90c5a3a50024e6b5bd26753e03ec7cc;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 28a67f77..bc3cd477 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -43,20 +43,22 @@ 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_position(-1), + m_dragStarted(false) { - ui.setupUi(this); - m_scale = 1; - m_ruler = new SmallRuler(); + m_ui.setupUi(this); QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_ruler); - ui.ruler_frame->setLayout(layout); + m_ui.ruler_frame->setLayout(layout); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setMinimumHeight(200); QToolBar *toolbar = new QToolBar(name, this); @@ -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,12 +91,16 @@ 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); + 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); @@ -105,15 +113,15 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); layout2->addWidget(toolbar); - ui.button_frame->setLayout(layout2); + m_ui.button_frame->setLayout(layout2); const int toolHeight = toolbar->height(); - ui.button_frame->setMinimumHeight(toolHeight); + m_ui.button_frame->setMinimumHeight(toolHeight); //m_ruler->setPixelPerMark(3); - QVBoxLayout *rendererBox = new QVBoxLayout(ui.video_frame); + QVBoxLayout *rendererBox = new QVBoxLayout(m_ui.video_frame); rendererBox->setContentsMargins(0, 0, 0, 0); - m_monitorRefresh = new MonitorRefresh(ui.video_frame); + 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); @@ -123,11 +131,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int))); - 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(ui.video_frame->winId(), -1); - m_length = 0; + //render->createVideoXWindow(m_ui.video_frame->winId(), -1); if (name != "clip") { connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int))); @@ -137,14 +141,14 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SLOT(setClipZone(QPoint))); } m_monitorRefresh->show(); - kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId(); + kDebug() << "/////// BUILDING MONITOR, ID: " << m_ui.video_frame->winId(); } Monitor::~Monitor() { delete m_ruler; delete m_timePos; - if (m_overlay) delete m_overlay; + delete m_overlay; delete m_monitorRefresh; } @@ -182,7 +186,14 @@ 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); } @@ -199,10 +210,10 @@ void Monitor::slotSetSizeOneToOne() height = height * 0.8; } kDebug() << "// MONITOR; set SIZE: " << width << ", " << height; - ui.video_frame->setFixedSize(width, height); + m_ui.video_frame->setFixedSize(width, height); updateGeometry(); adjustSize(); - //ui.video_frame->setMinimumSize(0, 0); + //m_ui.video_frame->setMinimumSize(0, 0); emit adjustMonitorSize(); } @@ -219,16 +230,16 @@ void Monitor::slotSetSizeOneToTwo() height = height * 0.8; } kDebug() << "// MONITOR; set SIZE: " << width << ", " << height; - ui.video_frame->setFixedSize(width, height); + m_ui.video_frame->setFixedSize(width, height); updateGeometry(); adjustSize(); - //ui.video_frame->setMinimumSize(0, 0); + //m_ui.video_frame->setMinimumSize(0, 0); emit adjustMonitorSize(); } void Monitor::resetSize() { - ui.video_frame->setMinimumSize(0, 0); + m_ui.video_frame->setMinimumSize(0, 0); } DocClipBase *Monitor::activeClip() @@ -307,7 +318,7 @@ void Monitor::slotSetZoneEnd() void Monitor::mousePressEvent(QMouseEvent * event) { if (event->button() != Qt::RightButton) { - if (ui.video_frame->underMouse()) { + if (m_ui.video_frame->underMouse()) { m_dragStarted = true; m_DragStartPosition = event->pos(); } @@ -318,7 +329,7 @@ void Monitor::mousePressEvent(QMouseEvent * event) void Monitor::mouseReleaseEvent(QMouseEvent * event) { if (m_dragStarted) { - if (ui.video_frame->underMouse()) { + if (m_ui.video_frame->underMouse()) { slotPlay(); } else QWidget::mouseReleaseEvent(event); m_dragStarted = false; @@ -421,7 +432,7 @@ 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; + if (QFile::exists(outputFile) && KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return; frame.save(outputFile); } } @@ -436,6 +447,12 @@ void Monitor::activateMonitor() if (!m_isActive) m_monitorManager->switchMonitors(); //m_monitorManager->activateMonitor(m_name); } +void Monitor::setTimePos(const QString &pos) +{ + m_timePos->setText(pos); + slotSeek(); +} + void Monitor::slotSeek() { const int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps()); @@ -447,10 +464,8 @@ 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)); } void Monitor::checkOverlay() @@ -475,7 +490,6 @@ void Monitor::slotStart() m_position = 0; render->seekToFrame(m_position); emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); } void Monitor::slotEnd() @@ -485,7 +499,6 @@ void Monitor::slotEnd() m_position = render->getLength(); render->seekToFrame(m_position); emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); } void Monitor::slotZoneStart() @@ -495,7 +508,6 @@ void Monitor::slotZoneStart() m_position = m_ruler->zone().x(); render->seekToFrame(m_position); emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); } void Monitor::slotZoneEnd() @@ -505,7 +517,6 @@ void Monitor::slotZoneEnd() m_position = m_ruler->zone().y(); render->seekToFrame(m_position); emit renderPosition(m_position); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); } void Monitor::slotRewind(double speed) @@ -537,12 +548,14 @@ void Monitor::slotRewindOneFrame(int diff) activateMonitor(); render->play(0); if (m_position < 1) return; - m_position -= diff; - m_position = qMax(m_position, 0); + /* + * 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(); } void Monitor::slotForwardOneFrame(int diff) @@ -554,8 +567,6 @@ void Monitor::slotForwardOneFrame(int 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(); } void Monitor::seekCursor(int pos) @@ -569,10 +580,16 @@ void Monitor::seekCursor(int 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(); + checkOverlay(); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); m_playAction->setChecked(false); m_playAction->setIcon(m_playIcon); @@ -580,7 +597,7 @@ void Monitor::rendererStopped(int pos) void Monitor::initMonitor() { - kDebug() << "/////// INITING MONITOR, ID: " << ui.video_frame->winId(); + kDebug() << "/////// INITING MONITOR, ID: " << m_ui.video_frame->winId(); } // virtual @@ -687,10 +704,10 @@ void Monitor::slotOpenFile(const QString &file) if (render == NULL) return; activateMonitor(); QDomDocument doc; - QDomElement westley = doc.createElement("westley"); - doc.appendChild(westley); + QDomElement mlt = doc.createElement("mlt"); + doc.appendChild(mlt); QDomElement prod = doc.createElement("producer"); - westley.appendChild(prod); + mlt.appendChild(prod); prod.setAttribute("mlt_service", "avformat"); prod.setAttribute("resource", file); render->setSceneList(doc, 0); @@ -730,6 +747,11 @@ 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); @@ -738,18 +760,20 @@ void Monitor::slotSwitchMonitorInfo(bool show) m_overlay = new Overlay(m_monitorRefresh); m_overlay->raise(); m_overlay->setHidden(true); - } else if (m_overlay) { + } else { delete m_overlay; m_overlay = NULL; } } + 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)