Refactored pausing code.

Next/previous frame is only usable when paused.
Added .o, .so, and include/ dir to .gitignore

.gitignore

@@ -4,11 +4,14 @@
 /qtc-gdbmacros
 /ts/*.qm
 Makefile*
+/include
 
 *.pro.user
 moc_*.cpp
 ui_*.h
 .*.swp
 *~
+*.o
+*.so*
 qrc_ressources.cpp
 

src/gui/ClipPreviewWidget.cpp

@@ -51,6 +51,7 @@ void        ClipPreviewWidget::startPreview( Media* media )
     m_mediaPlayer->play();
     m_clipLoaded = true;
     m_videoStopped = false;
+    m_paused = false;
 }
 
 void        ClipPreviewWidget::setPosition( float newPos )
@@ -66,6 +67,7 @@ void        ClipPreviewWidget::stop()
     {
         m_videoStopped = true;
         m_mediaPlayer->stop();
+        m_paused = false;
     }
 }
 
@@ -76,15 +78,21 @@ void        ClipPreviewWidget::togglePlayPause( bool forcePause )
     if ( m_videoStopped == true )
         m_videoStopped = false;
 
-    if ( m_mediaPlayer->isPlaying() )
+    if ( m_paused == false )
+    {
         m_mediaPlayer->pause();
+        m_paused = true;
+    }
     else if ( forcePause == false )
+    {
         m_mediaPlayer->play();
+        m_paused = false;
+    }
 }
 
 void        ClipPreviewWidget::nextFrame()
 {
-    if ( m_videoStopped == false )
+    if ( m_videoStopped == false && m_paused == true )
     {
         qint64   interval =  static_cast<qint64>( (1.0f / m_mediaPlayer->getFps()) * 1000.0f );
         m_mediaPlayer->setTime( m_mediaPlayer->getTime() + interval );
@@ -93,7 +101,7 @@ void        ClipPreviewWidget::nextFrame()
 
 void        ClipPreviewWidget::previousFrame()
 {
-    if ( m_videoStopped == false )
+    if ( m_videoStopped == false && m_paused == true )
     {
         qint64   interval =  static_cast<qint64>( (1.0f / m_mediaPlayer->getFps()) * 1000.0f );
         m_mediaPlayer->setTime( m_mediaPlayer->getTime() - interval );

src/gui/GenericPreviewWidget.h

@@ -35,7 +35,7 @@ class   GenericPreviewWidget : public QObject
     Q_DISABLE_COPY( GenericPreviewWidget );
 
 public:
-    explicit GenericPreviewWidget( QWidget* renderWidget )
+    explicit GenericPreviewWidget( QWidget* renderWidget ) : m_paused( false )
     {
         m_mediaPlayer = new LibVLCpp::MediaPlayer();
         m_mediaPlayer->setDrawable( renderWidget->winId() );
@@ -51,9 +51,19 @@ public:
     virtual void                    nextFrame() = 0;
     virtual void                    previousFrame() = 0;
     virtual void                    stop() = 0;
+    bool                            isPaused() const
+    {
+        return m_paused;
+    }
 
 protected:
     LibVLCpp::MediaPlayer*          m_mediaPlayer;
+    /**
+     *  \brief  This flag allows us to know if the render is paused
+     *          or not, without using libvlc, especially for the render preview.
+     *  If the video is stopped, then this flag will be equal to false
+     */
+    bool                            m_paused;
 
 public slots:
     virtual void                    __positionChanged() = 0;

src/gui/PreviewWidget.cpp

@@ -236,12 +236,12 @@ void    PreviewWidget::changedTab( int tabId )
 
 void        PreviewWidget::on_pushButtonNextFrame_clicked()
 {
-    if ( m_previewStopped == true )
+    if ( m_previewStopped == false )
         m_currentPreviewRenderer->nextFrame();
 }
 
 void        PreviewWidget::on_pushButtonPreviousFrame_clicked()
 {
-    if ( m_previewStopped == true )
+    if ( m_previewStopped == false )
         m_currentPreviewRenderer->previousFrame();
 }

src/gui/RenderPreviewWidget.cpp

@@ -87,6 +87,7 @@ void        RenderPreviewWidget::stopPreview()
     //This might be called multiple times, but this is due to Qt message loop
     m_mediaPlayer->stop();
     m_isRendering = false;
+    m_paused = false;
 }
 
 void        RenderPreviewWidget::startPreview( Media* )
@@ -94,6 +95,7 @@ void        RenderPreviewWidget::startPreview( Media* )
     m_mainWorkflow->startRender();
     m_mediaPlayer->play();
     m_isRendering = true;
+    m_paused = false;
 }
 
 void        RenderPreviewWidget::setPosition( float newPos )
@@ -131,14 +133,20 @@ void        RenderPreviewWidget::togglePlayPause( bool forcePause )
         startPreview( NULL );
     else if ( m_isRendering == true )
     {
-        if ( m_mediaPlayer->isPlaying() == false && forcePause == false )
+        if ( m_paused == true && forcePause == false )
+        {
             m_mediaPlayer->play();
+            m_paused = false;
+        }
         else
         {
             //VLC will toggle play if we call pause while already paused...
             //So be careful about pausing two times :
-            if ( m_mediaPlayer->isPlaying() == true )
+            if ( m_paused == false )
+            {
                 m_mediaPlayer->pause();
+                m_paused = true;
+            }
         }
     }
 }