#include "monitor.h"
-#include "renderer.h"
-#include "monitormanager.h"
#include "smallruler.h"
#include "docclipbase.h"
-#include "monitorscene.h"
#include "abstractclipitem.h"
+#include "monitorscene.h"
+#include "monitoreditwidget.h"
#include "kdenlivesettings.h"
#include <KDebug>
#include <QLabel>
#include <QIntValidator>
#include <QVBoxLayout>
-#include <QGraphicsView>
Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) :
- QWidget(parent),
+ AbstractMonitor(parent),
render(NULL),
m_name(name),
m_monitorManager(manager),
m_currentClip(NULL),
m_ruler(new SmallRuler(m_monitorManager)),
m_overlay(NULL),
- m_isActive(false),
m_scale(1),
m_length(0),
m_dragStarted(false),
m_monitorRefresh(NULL),
- m_effectScene(NULL),
- m_effectView(NULL),
+ m_effectWidget(NULL),
m_selectedClip(NULL),
- m_loopClipTransition(true)
+ m_loopClipTransition(true),
+ m_editMarker(NULL)
{
QVBoxLayout *layout = new QVBoxLayout;
m_volumePopup->show();
m_volumePopup->hide();
- QWidget *spacer = new QWidget(this);
- spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
- m_toolbar->addWidget(spacer);
- m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this);
- m_toolbar->addWidget(m_timePos);
- connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
- m_toolbar->setMaximumHeight(s * 1.5);
- layout->addWidget(m_toolbar);
-
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
setLayout(layout);
setMinimumHeight(200);
render = new Render(m_name, (int) m_monitorRefresh->winId(), profile, this);
m_monitorRefresh->setRenderer(render);
}
+#if defined (USE_OPEN_GL)
+ else if (m_glWidget) {
+ lay->addWidget(m_glWidget);
+ m_videoBox->setLayout(lay);
+ }
+#endif
connect(m_audioSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetVolume(int)));
connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int)));
connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int)));
connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));
- //render->createVideoXWindow(m_ui.video_frame->winId(), -1);
-
if (name != "clip") {
connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int)));
if (m_monitorRefresh) m_monitorRefresh->show();
if (name == "project") {
- m_effectScene = new MonitorScene(render);
- m_effectView = new QGraphicsView(m_effectScene, m_videoBox);
- lay->addWidget(m_effectView);
- m_effectView->setRenderHints(QFlags<QPainter::RenderHint>());
- m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0);
- m_effectView->setMouseTracking(true);
- m_effectScene->setUp();
- m_effectView->hide();
+ m_effectWidget = new MonitorEditWidget(render, m_videoBox);
+ m_toolbar->addAction(m_effectWidget->getVisibilityAction());
+ lay->addWidget(m_effectWidget);
+ m_effectWidget->hide();
}
+
+ QWidget *spacer = new QWidget(this);
+ spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+ m_toolbar->addWidget(spacer);
+ m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this);
+ m_toolbar->addWidget(m_timePos);
+ connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
+ m_toolbar->setMaximumHeight(s * 1.5);
+ layout->addWidget(m_toolbar);
}
Monitor::~Monitor()
delete m_ruler;
delete m_timePos;
delete m_overlay;
- if (m_name == "project") {
- delete m_effectView;
- delete m_effectScene;
- }
+ if (m_effectWidget)
+ delete m_effectWidget;
delete m_monitorRefresh;
delete render;
}
return m_videoBox;
}
-QString Monitor::name() const
+const QString Monitor::name() const
{
return m_name;
}
m_contextMenu->addMenu(m_playMenu);
if (goMenu)
m_contextMenu->addMenu(goMenu);
- if (markerMenu)
+ if (markerMenu) {
m_contextMenu->addMenu(markerMenu);
+ QList <QAction *>list = markerMenu->actions();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->data().toString() == "edit_marker") {
+ m_editMarker = list.at(i);
+ break;
+ }
+ }
+ }
m_playMenu->addAction(playZone);
m_playMenu->addAction(loopZone);
void Monitor::mousePressEvent(QMouseEvent * event)
{
if (event->button() != Qt::RightButton) {
- if (m_videoBox->underMouse()) {
+ if (m_videoBox->underMouse() && (!m_overlay || !m_overlay->underMouse())) {
m_dragStarted = true;
m_DragStartPosition = event->pos();
}
- } else m_contextMenu->popup(event->globalPos());
+ } else if (!m_effectWidget || !m_effectWidget->isVisible()) {
+ m_contextMenu->popup(event->globalPos());
+ }
}
void Monitor::slotSwitchFullScreen()
void Monitor::mouseReleaseEvent(QMouseEvent * event)
{
if (m_dragStarted) {
- if (m_videoBox->underMouse() && (!m_effectView || !m_effectView->isVisible())) {
+ if (m_videoBox->underMouse() && (!m_effectWidget || !m_effectWidget->isVisible())) {
if (isActive()) slotPlay();
else activateMonitor();
} else QWidget::mouseReleaseEvent(event);
return;
}
m_currentClip->setClipThumbFrame((uint) render->seekFramePosition());
- emit refreshClipThumbnail(m_currentClip->getId());
+ emit refreshClipThumbnail(m_currentClip->getId(), true);
}
void Monitor::slotExtractCurrentFrame()
{
- QImage frame = render->extractFrame(render->seekFramePosition());
+ QImage frame;
+ // check if we are using a proxy
+ if (m_currentClip && !m_currentClip->getProperty("proxy").isEmpty() && m_currentClip->getProperty("proxy") != "-") {
+ // using proxy, use original clip url to get frame
+ frame = render->extractFrame(render->seekFramePosition(), m_currentClip->fileURL().path());
+ }
+ else frame = render->extractFrame(render->seekFramePosition());
KFileDialog *fs = new KFileDialog(KUrl(), "image/png", this);
fs->setOperationMode(KFileDialog::Saving);
fs->setMode(KFile::File);
bool Monitor::isActive() const
{
- return m_isActive;
+ return m_monitorManager->isActive(m_name);
}
void Monitor::activateMonitor()
{
- if (!m_isActive) {
- m_monitorManager->slotSwitchMonitors(m_name == "clip");
- }
+ m_monitorManager->activateMonitor(m_name);
}
void Monitor::setTimePos(const QString &pos)
void Monitor::slotSeek(int pos)
{
- activateMonitor();
+ //activateMonitor();
if (render == NULL) return;
render->seekToFrame(pos);
}
void Monitor::seekCursor(int pos)
{
- activateMonitor();
+ //activateMonitor();
if (m_ruler->slotNewValue(pos)) {
checkOverlay();
m_timePos->setValue(pos);
void Monitor::stop()
{
- m_isActive = false;
disconnect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
if (render) render->stop();
}
void Monitor::start()
{
- m_isActive = true;
if (render) render->start();
connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
}
void Monitor::refreshMonitor(bool visible)
{
- if (visible && render && !m_isActive) {
+ if (visible && render) {
activateMonitor();
render->doRefresh(); //askForRefresh();
}
void Monitor::refreshMonitor()
{
- if (m_isActive) {
+ if (isActive()) {
render->doRefresh();
}
}
if (render->playSpeed() == 0) {
//m_playAction->setChecked(true);
m_playAction->setIcon(m_pauseIcon);
+ render->switchPlay(true);
} else {
//m_playAction->setChecked(false);
m_playAction->setIcon(m_playIcon);
+ render->switchPlay(false);
}
- render->switchPlay();
}
void Monitor::slotPlayZone()
// MLT CONSUMER is broken
kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
}
- } else if (position != -1) render->seek(GenTime(position, m_monitorManager->timecode().fps()));
+ } else if (position != -1) render->seek(position);
if (!zone.isNull()) {
m_ruler->setZone(zone.x(), zone.y());
- render->seek(GenTime(zone.x(), m_monitorManager->timecode().fps()));
+ render->seek(zone.x());
}
}
m_timePos->updateTimeCode(m_monitorManager->timecode());
if (render == NULL) return;
render->resetProfile(profile);
- if (m_effectScene) {
- m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0);
- m_effectScene->resetProfile();
- }
+ if (m_effectWidget)
+ m_effectWidget->resetProfile(render);
}
void Monitor::saveSceneList(QString path, QDomElement info)
if (m_monitorRefresh == NULL) {
// Using OpenGL display
#if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
- m_overlay = new Overlay(m_glWidget);
+ if (m_glWidget->layout()) delete m_glWidget->layout();
+ m_overlay = new Overlay();
+ connect(m_overlay, SIGNAL(editMarker()), this, SLOT(slotEditMarker()));
+ QVBoxLayout *layout = new QVBoxLayout;
+ layout->addStretch(10);
+ layout->addWidget(m_overlay);
+ m_glWidget->setLayout(layout);
#endif
} else {
- m_overlay = new Overlay(m_monitorRefresh);
+ if (m_monitorRefresh->layout()) delete m_monitorRefresh->layout();
+ m_overlay = new Overlay();
+ connect(m_overlay, SIGNAL(editMarker()), this, SLOT(slotEditMarker()));
+ QVBoxLayout *layout = new QVBoxLayout;
+ layout->addStretch(10);
+ layout->addWidget(m_overlay);
+ m_monitorRefresh->setLayout(layout);
m_overlay->raise();
m_overlay->setHidden(true);
}
+ checkOverlay();
} else {
delete m_overlay;
m_overlay = NULL;
}
}
+void Monitor::slotEditMarker()
+{
+ if (m_editMarker) m_editMarker->trigger();
+}
+
void Monitor::updateTimecodeFormat()
{
m_timePos->slotUpdateTimeCodeFormat();
m_glWidget->setVisible(!show);
#endif
}
- m_effectView->setVisible(show);
+ m_effectWidget->setVisible(show);
+ m_effectWidget->getVisibilityAction()->setChecked(show);
emit requestFrameForAnalysis(show);
if (show) {
+ m_effectWidget->getScene()->slotZoomFit();
render->doRefresh();
- m_effectScene->slotZoomFit();
}
}
}
-MonitorScene * Monitor::getEffectScene()
+MonitorEditWidget* Monitor::getEffectEdit()
{
- return m_effectScene;
+ return m_effectWidget;
}
bool Monitor::effectSceneDisplayed()
{
- return m_effectView->isVisible();
+ return m_effectWidget->isVisible();
}
void Monitor::slotSetVolume(int volume)
m_volumePopup->show();
}
+AbstractRender *Monitor::abstractRender()
+{
+ return render;
+}
+
MonitorRefresh::MonitorRefresh(QWidget* parent) :
QWidget(parent)
, m_renderer(NULL)
// MonitorRefresh is used as container for the SDL display (it's window id is passed to SDL)
setAttribute(Qt::WA_PaintOnScreen);
setAttribute(Qt::WA_OpaquePaintEvent);
+ setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
//setAttribute(Qt::WA_NoSystemBackground);
}
void MonitorRefresh::paintEvent(QPaintEvent *event)
{
- Q_UNUSED(event);
+ Q_UNUSED(event)
if (m_renderer) m_renderer->doRefresh();
}
Overlay::Overlay(QWidget* parent) :
QLabel(parent)
{
- setAttribute(Qt::WA_TransparentForMouseEvents);
- //setAttribute(Qt::WA_OpaquePaintEvent);
- //setAttribute(Qt::WA_NoSystemBackground);
+ //setAttribute(Qt::WA_TransparentForMouseEvents);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
+ setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+ setCursor(Qt::PointingHandCursor);
+}
+
+// virtual
+void Overlay::mouseReleaseEvent ( QMouseEvent * event )
+{
+ event->accept();
+}
+
+// virtual
+void Overlay::mousePressEvent( QMouseEvent * event )
+{
+ event->accept();
+}
+
+// virtual
+void Overlay::mouseDoubleClickEvent ( QMouseEvent * event )
+{
+ emit editMarker();
+ event->accept();
}
void Overlay::setOverlayText(const QString &text, bool isZone)
void VideoContainer::mouseDoubleClickEvent(QMouseEvent * event)
{
+ Q_UNUSED(event)
+
if (!KdenliveSettings::openglmonitors())
switchFullScreen();
}
projects / kdenlive / blobdiff