Don't crash when wrong sdl driver was selected by user (needs MLT patch):

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 80d48df03ba82e32ff22f0173e96a24f681381c6..d54900f34bdb721eb57f548cf80cefe962357c56 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -43,18 +43,18 @@
 Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
         QWidget(parent),
         render(NULL),
-        m_monitorManager(manager),
         m_name(name),
-        m_isActive(false),
+        m_monitorManager(manager),
         m_currentClip(NULL),
+        m_ruler(new SmallRuler()),
+        m_overlay(NULL),
+        m_isActive(false),
+        m_scale(1),
         m_length(0),
         m_position(-1),
-        m_dragStarted(false),
-        m_overlay(NULL)
+        m_dragStarted(false)
 {
     m_ui.setupUi(this);
-    m_scale = 1;
-    m_ruler = new SmallRuler();
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_ruler);
@@ -130,6 +130,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
     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);
 
@@ -186,7 +187,14 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe
     showTips->setCheckable(true);
     connect(showTips, SIGNAL(toggled(bool)), this, SLOT(slotSwitchMonitorInfo(bool)));
     showTips->setChecked(KdenliveSettings::displayMonitorInfo());
+
+    QAction *dropFrames = m_contextMenu->addAction(KIcon(), i18n("Real time (drop frames)"));
+    dropFrames->setCheckable(true);
+    dropFrames->setChecked(true);
+    connect(dropFrames, SIGNAL(toggled(bool)), this, SLOT(slotSwitchDropFrames(bool)));
+
     m_configMenu->addAction(showTips);
+    m_configMenu->addAction(dropFrames);
 
 }
 
@@ -573,7 +581,13 @@ void Monitor::seekCursor(int pos)
 
 void Monitor::rendererStopped(int pos)
 {
-    //int rulerPos = (int)(pos * m_scale);
+    if (m_currentClip != NULL && m_playAction->isChecked()) {
+        // Clip monitor
+        if (pos >= m_length - 1) {
+            slotStart();
+            return;
+        }
+    }
     m_ruler->slotNewValue(pos);
     m_position = pos;
     checkOverlay();
@@ -681,7 +695,10 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position)
     }
     if (clip != m_currentClip) {
         m_currentClip = clip;
-        render->setProducer(clip->producer(), position);
+        if (render->setProducer(clip->producer(), position) == -1) {
+            // MLT CONSUMER is broken
+            emit blockMonitors();
+        }
         m_position = position;
     } else if (position != -1) render->seek(GenTime(position, render->fps()));
 }
@@ -734,6 +751,11 @@ void Monitor::setClipZone(QPoint pos)
     m_currentClip->setZone(pos);
 }
 
+void Monitor::slotSwitchDropFrames(bool show)
+{
+    render->setDropFrames(show);
+}
+
 void Monitor::slotSwitchMonitorInfo(bool show)
 {
     KdenliveSettings::setDisplayMonitorInfo(show);
@@ -748,12 +770,14 @@ void Monitor::slotSwitchMonitorInfo(bool show)
     }
 }
 
+
 MonitorRefresh::MonitorRefresh(QWidget* parent) : \
         QWidget(parent),
         m_renderer(NULL)
 {
     setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground);
+    setAttribute(Qt::WA_OpaquePaintEvent);
+    //setAttribute(Qt::WA_NoSystemBackground);
 }
 
 void MonitorRefresh::setRenderer(Render* render)