Disable (until fixed) show frame on mouse move with razor tool. Fixes crash on clip...

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 519e9c00071f623d3edd3be332617900d9821c1b..83572f93dc0cf17009b0b038eb3cf4e94bedf269 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -43,7 +43,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(m_ruler);
     ui.ruler_frame->setLayout(layout);
-
+    setMinimumHeight(200);
     QToolBar *toolbar = new QToolBar(name, this);
     QVBoxLayout *layout2 = new QVBoxLayout;
 
@@ -89,11 +89,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     QVBoxLayout *rendererBox = new QVBoxLayout(ui.video_frame);
     m_monitorRefresh = new MonitorRefresh(ui.video_frame);
     rendererBox->addWidget(m_monitorRefresh);
-    m_monitorRefresh->setAttribute(Qt::WA_PaintOnScreen);
     render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this);
     m_monitorRefresh->setRenderer(render);
 
-
     m_contextMenu = new QMenu(this);
     m_contextMenu->addMenu(playMenu);
     QAction *extractFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Extract frame"));
@@ -106,6 +104,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     if (name != "clip") {
         connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
         connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int)));
+        QAction *splitView = m_contextMenu->addAction(KIcon("document-new"), i18n("Split view"));
+        splitView->setCheckable(true);
+        connect(splitView, SIGNAL(toggled(bool)), render, SLOT(slotSplitView(bool)));
     } else {
         QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"));
         connect(setThumbFrame, SIGNAL(triggered()), this, SLOT(slotSetThumbFrame()));
@@ -115,7 +116,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     m_ruler->setLength(width);
     m_ruler->setMaximum(width);
     m_length = 0;
-
+    m_monitorRefresh->show();
     kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId();
 }
 
@@ -168,6 +169,24 @@ void Monitor::slotSeek(int pos) {
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
+void Monitor::slotStart() {
+    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    render->play(0);
+    m_position = 0;
+    render->seekToFrame(m_position);
+    emit renderPosition(m_position);
+    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+}
+
+void Monitor::slotEnd() {
+    if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+    render->play(0);
+    m_position = render->getLength();
+    render->seekToFrame(m_position);
+    emit renderPosition(m_position);
+    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
+}
+
 void Monitor::slotRewind(double speed) {
     if (!m_isActive) m_monitorManager->activateMonitor(m_name);
     if (speed == 0) {
@@ -233,12 +252,12 @@ void Monitor::initMonitor() {
 }
 
 // virtual
-void Monitor::resizeEvent(QResizeEvent * event) {
+/*void Monitor::resizeEvent(QResizeEvent * event) {
     QWidget::resizeEvent(event);
     adjustRulerSize(-1);
     if (render && m_isActive) render->doRefresh();
     //
-}
+}*/
 
 void Monitor::adjustRulerSize(int length) {
     int width = m_ruler->width();
@@ -255,17 +274,19 @@ void Monitor::adjustRulerSize(int length) {
 void Monitor::stop() {
     m_isActive = false;
     if (render) render->stop();
+    //kDebug()<<"/// MONITOR RENDER STOP";
 }
 
 void Monitor::start() {
     m_isActive = true;
     if (render) render->start();
+    //kDebug()<<"/// MONITOR RENDER START";
 }
 
 void Monitor::refreshMonitor(bool visible) {
     if (visible && render) {
         if (!m_isActive) m_monitorManager->activateMonitor(m_name);
-        render->askForRefresh();
+        render->doRefresh(); //askForRefresh();
     }
 }
 
@@ -281,18 +302,14 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position) {
     if (render == NULL) return;
     if (!m_isActive) m_monitorManager->activateMonitor(m_name);
     if (!clip) return;
-    if (clip != m_currentClip) {
+    if (clip != m_currentClip || m_currentClip->producer() == NULL) {
         m_currentClip = clip;
-        QDomDocument doc;
-        QDomElement westley = doc.createElement("westley");
-        doc.appendChild(westley);
-        westley.appendChild(doc.importNode(m_currentClip->toXML(), true));
-        render->setSceneList(doc, 0);
-        m_ruler->slotNewValue(0);
-        m_timePos->setText("00:00:00:00");
-        m_position = 0;
-    }
-    if (position != -1) render->seek(GenTime(position, render->fps()));
+        render->setProducer(clip->producer(), position);
+        //m_ruler->slotNewValue(0);
+        //adjustRulerSize(clip->producer()->get_playtime());
+        //m_timePos->setText("00:00:00:00");
+        m_position = position;
+    } else if (position != -1) render->seek(GenTime(position, render->fps()));
 }
 
 void Monitor::slotOpenFile(const QString &file) {
@@ -308,9 +325,9 @@ void Monitor::slotOpenFile(const QString &file) {
     render->setSceneList(doc, 0);
 }
 
-void Monitor::resetProfile(QString prof) {
+void Monitor::resetProfile() {
     if (render == NULL) return;
-    render->resetProfile(prof);
+    render->resetProfile();
 }
 
 void Monitor::saveSceneList(QString path, QDomElement info) {
@@ -319,7 +336,8 @@ void Monitor::saveSceneList(QString path, QDomElement info) {
 }
 
 MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) {
-
+    setAttribute(Qt::WA_PaintOnScreen);
+    setAttribute(Qt::WA_OpaquePaintEvent); //Qt::WA_NoSystemBackground);
 }
 
 void MonitorRefresh::setRenderer(Render* render) {
@@ -327,7 +345,7 @@ void MonitorRefresh::setRenderer(Render* render) {
 }
 
 void MonitorRefresh::paintEvent(QPaintEvent * event) {
-    if (m_renderer != NULL) m_renderer->doRefresh();
+    if (m_renderer) m_renderer->doRefresh();
 }
 
 #include "monitor.moc"