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);
+ } 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()));
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_frametimecode = KdenliveSettings::frametimecode();
- if (m_frametimecode) {
- m_timePos->setInputMask(QString());
- m_timePos->setValidator(new QIntValidator(this));
- } else m_timePos->setInputMask("99:99:99:99");
+ m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this);
toolbar->addWidget(m_timePos);
-
connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
layout2->addWidget(toolbar);
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);
return GenTime();
}
-
-
void Monitor::slotZoneMoved(int start, int end)
{
m_ruler->setZone(start, end);
}
}
-
// virtual
void Monitor::mouseMoveEvent(QMouseEvent *event)
{
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) {
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)
{
- if (m_frametimecode) {
- int frames = m_monitorManager->timecode().getFrameCount(pos);
- m_timePos->setText(QString::number(frames));
- } else m_timePos->setText(pos);
+ m_timePos->setValue(pos);
slotSeek();
}
void Monitor::slotSeek()
{
- 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);
+ slotSeek(m_timePos->value());
}
void Monitor::slotSeek(int pos)
if (m_overlay == NULL) return;
int pos = render->seekFramePosition();
QPoint zone = m_ruler->zone();
- if (pos == zone.x()) m_overlay->setOverlayText(i18n("In Point"));
- else if (pos == 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(pos, m_monitorManager->timecode().fps()));
- if (markerComment.isEmpty()) m_overlay->setHidden(true);
- else m_overlay->setOverlayText(markerComment, false);
+ if (markerComment.isEmpty())
+ m_overlay->setHidden(true);
+ else
+ m_overlay->setOverlayText(markerComment, false);
} else m_overlay->setHidden(true);
}
}
activateMonitor();
render->play(0);
render->seekToFrame(0);
- emit renderPosition(0);
+ //emit renderPosition(0);
}
void Monitor::slotEnd()
activateMonitor();
render->play(0);
render->seekToFrame(render->getLength());
- emit renderPosition(render->seekFramePosition());
+ //emit renderPosition(render->seekFramePosition());
}
void Monitor::slotZoneStart()
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();
+ m_timePos->setValue(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();
+ m_timePos->setValue(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);
}
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();
}
void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position)
{
if (render == NULL) return;
- activateMonitor();
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()) {
//render->setSceneList(doc, 0);
}
-
void Monitor::resetProfile(const QString profile)
{
+ m_timePos->updateTimeCode(m_monitorManager->timecode());
if (render == NULL) return;
render->resetProfile(profile);
}
return render->sceneList();
}
-
void Monitor::setClipZone(QPoint pos)
{
if (m_currentClip == NULL) return;
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));
- }
+ m_timePos->slotUpdateTimeCodeFormat();
}
+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),
if (m_renderer) m_renderer->doRefresh();
}
-
Overlay::Overlay(QWidget* parent) :
QLabel(parent)
{
setAttribute(Qt::WA_TransparentForMouseEvents);
- setAttribute(Qt::WA_OpaquePaintEvent);
+ //setAttribute(Qt::WA_OpaquePaintEvent);
//setAttribute(Qt::WA_NoSystemBackground);
- setAutoFillBackground(false);
+ setAutoFillBackground(true);
+ setBackgroundRole(QPalette::Base);
}
-void Overlay::paintEvent(QPaintEvent * /*event*/)
-{
- QPainter painter(this);
- QColor col;
- painter.setPen(Qt::white);
- if (m_isZone) col = QColor(200, 0, 0);
- else col = QColor(0, 0, 200);
- painter.fillRect(rect(), col);
- painter.drawText(rect(), Qt::AlignCenter, text());
-}
-
-
-
void Overlay::setOverlayText(const QString &text, bool isZone)
{
setHidden(true);
m_isZone = isZone;
+ QPalette p;
+ p.setColor(QPalette::Text, Qt::white);
+ if (m_isZone) p.setColor(QPalette::Base, QColor(200, 0, 0));
+ else p.setColor(QPalette::Base, QColor(0, 0, 200));
+ setPalette(p);
setText(' ' + text + ' ');
setHidden(false);
update();
projects / kdenlive / blobdiff