Fix compile warning

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 39603b7a542f83854402037e0f58feeb50cc4af2..cafe772bba346c8d1f3b17dacf677e9d8b0fccca 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -43,16 +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_dragStarted(false),
-        m_overlay(NULL)
+        m_ruler(new SmallRuler()),
+        m_overlay(NULL),
+        m_isActive(false),
+        m_scale(1),
+        m_length(0),
+        m_position(-1),
+        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,7 +132,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
     connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));
 
     //render->createVideoXWindow(m_ui.video_frame->winId(), -1);
-    m_length = 0;
 
     if (name != "clip") {
         connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
@@ -456,11 +457,8 @@ void Monitor::slotSeek(int pos)
     activateMonitor();
     if (render == NULL) return;
     m_position = pos;
-    checkOverlay();
     render->seekToFrame(pos);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    m_timePos->clearFocus();
 }
 
 void Monitor::checkOverlay()
@@ -485,7 +483,6 @@ void Monitor::slotStart()
     m_position = 0;
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotEnd()
@@ -495,7 +492,6 @@ void Monitor::slotEnd()
     m_position = render->getLength();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotZoneStart()
@@ -505,7 +501,6 @@ void Monitor::slotZoneStart()
     m_position = m_ruler->zone().x();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotZoneEnd()
@@ -515,7 +510,6 @@ void Monitor::slotZoneEnd()
     m_position = m_ruler->zone().y();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotRewind(double speed)
@@ -555,8 +549,6 @@ void Monitor::slotRewindOneFrame(int diff)
     m_position = qMax(position, 0);
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
 }
 
 void Monitor::slotForwardOneFrame(int diff)
@@ -568,8 +560,6 @@ void Monitor::slotForwardOneFrame(int diff)
     m_position = qMin(m_position, m_length);
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
 }
 
 void Monitor::seekCursor(int pos)
@@ -586,7 +576,7 @@ void Monitor::rendererStopped(int pos)
     //int rulerPos = (int)(pos * m_scale);
     m_ruler->slotNewValue(pos);
     m_position = pos;
-    //checkOverlay();
+    checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_playAction->setChecked(false);
     m_playAction->setIcon(m_playIcon);
@@ -763,7 +753,8 @@ MonitorRefresh::MonitorRefresh(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)