Screen grab fixes

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 155d0a71544c4c63e0b477eba75abb56ab385091..2ab55376a10542ae9fa2145d6df84cfc75935126 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -33,9 +33,10 @@
 #include "renderer.h"
 #include "monitormanager.h"
 #include "smallruler.h"
+#include "docclipbase.h"
 
 Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
-        : QWidget(parent), render(NULL), m_monitorManager(manager), m_name(name), m_isActive(false) {
+        : QWidget(parent), render(NULL), m_monitorManager(manager), m_name(name), m_isActive(false), m_currentClip(NULL) {
     ui.setupUi(this);
     m_scale = 1;
     m_ruler = new SmallRuler();
@@ -109,7 +110,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     m_contextMenu->addMenu(playMenu);
     QAction *extractFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Extract frame"));
     connect(extractFrame, SIGNAL(triggered()), this, SLOT(slotExtractCurrentFrame()));
-
+       connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int)));
     kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId();
 }
 
@@ -198,16 +199,16 @@ void Monitor::slotForwardOneFrame() {
 
 void Monitor::seekCursor(int pos) {
     if (!m_isActive) m_monitorManager->activateMonitor(m_name);
-    int rulerPos = (int)(pos * m_scale);
+    //int rulerPos = (int)(pos * m_scale);
     m_position = pos;
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     //kDebug() << "seek: " << pos << ", scale: " << m_scale;
-    m_ruler->slotNewValue(rulerPos);
+    m_ruler->slotNewValue(pos); //rulerPos);
 }
 
 void Monitor::rendererStopped(int pos) {
-    int rulerPos = (int)(pos * m_scale);
-    m_ruler->slotNewValue(rulerPos);
+    //int rulerPos = (int)(pos * m_scale);
+    m_ruler->slotNewValue(pos);
     m_position = pos;
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_playAction->setChecked(false);
@@ -263,18 +264,22 @@ void Monitor::slotPlay() {
     m_playAction->setIcon(m_pauseIcon);
 }
 
-void Monitor::slotSetXml(const QDomElement &e) {
+void Monitor::slotSetXml(DocClipBase *clip, const int position) {
     if (render == NULL) return;
     if (!m_isActive) m_monitorManager->activateMonitor(m_name);
-    if (e.isNull()) return;
-    QDomDocument doc;
-    QDomElement westley = doc.createElement("westley");
-    doc.appendChild(westley);
-    westley.appendChild(e);
-    render->setSceneList(doc, 0);
-    m_ruler->slotNewValue(0);
-    m_timePos->setText("00:00:00:00");
-    m_position = 0;
+    if (!clip) return;
+       if (clip != m_currentClip) {
+               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()));
 }
 
 void Monitor::slotOpenFile(const QString &file) {