#include <QIntValidator>
-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),
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()));
}
if (m_frametimecode) {
m_timePos->setInputMask(QString());
m_timePos->setValidator(new QIntValidator(this));
- } else m_timePos->setInputMask("99:99:99:99");
+ } else m_timePos->setInputMask(m_monitorManager->timecode().inputMask());
+
toolbar->addWidget(m_timePos);
connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
//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());
#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);
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);
}
+void Monitor::slotGoToMarker(QAction *action)
+{
+ int pos = action->data().toInt();
+ slotSeek(pos);
+}
+
void Monitor::slotSetSizeOneToOne()
{
QRect r = QApplication::desktop()->screenGeometry();
return m_currentClip;
}
+void Monitor::updateMarkers(DocClipBase *source)
+{
+ if (source == m_currentClip && source != NULL) {
+ m_markerMenu->clear();
+ QList <CommentedTime> markers = m_currentClip->commentedSnapMarkers();
+ if (!markers.isEmpty()) {
+ QList <int> 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 <int>());
+ m_markerMenu->setEnabled(!m_markerMenu->isEmpty());
+ }
+}
+
void Monitor::slotSeekToPreviousSnap()
{
if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps()));
{
if (m_dragStarted) {
if (m_ui.video_frame->underMouse()) {
- slotPlay();
+ if (isActive()) slotPlay();
+ else activateMonitor();
} else QWidget::mouseReleaseEvent(event);
m_dragStarted = false;
}
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);
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();
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)
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();
+ 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);
}
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();
}
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);
}
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;
+ 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, render->fps()));
+ } 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)
}
-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)
} else {
int pos = m_timePos->text().toInt();
m_timePos->setValidator(0);
- m_timePos->setInputMask("99:99:99:99");
+ m_timePos->setInputMask(m_monitorManager->timecode().inputMask());
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),
projects / kdenlive / blobdiff