[vlmc-devel] ImportController: Revert codes of a ClipRenderer

Yikai Lu git at videolan.org
Mon Jul 4 15:34:02 CEST 2016


vlmc | branch: medialibrary | Yikai Lu <luyikei.qmltu at gmail.com> | Wed Jun 15 23:49:06 2016 +0900| [8f34feef41272f4f06ac38d03fffe0f4f3df959d] | committer: Yikai Lu

ImportController: Revert codes of a ClipRenderer

> https://code.videolan.org/videolan/vlmc/commit/8f34feef41272f4f06ac38d03fffe0f4f3df959d
---

 src/Gui/import/ImportController.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Gui/import/ImportController.cpp b/src/Gui/import/ImportController.cpp
index cd1a6ce..bc5c0fe 100644
--- a/src/Gui/import/ImportController.cpp
+++ b/src/Gui/import/ImportController.cpp
@@ -138,7 +138,7 @@ ImportController::clipSelection( Clip* clip )
         if ( m_currentUuid == uuid )
             return ;
         m_ui->metadataContainer->setWatchedClip( clip );
-        //TODO m_clipRenderer->stop();
+        m_clipRenderer->stop();
         m_currentUuid = uuid;
     //    m_tag->clipSelected( clip );
     }
@@ -214,11 +214,11 @@ ImportController::treeViewDoubleClicked( const QModelIndex& index )
 void
 ImportController::reject()
 {
-    //TODO m_clipRenderer->stop();
+    m_clipRenderer->stop();
     m_mediaListView->clear();
     m_temporaryMedias->clear();
     collapseAllButCurrentPath();
-    //TODO m_clipRenderer->setClip( nullptr );
+    m_clipRenderer->setClip( nullptr );
     done( Rejected );
 }
 
@@ -228,7 +228,7 @@ ImportController::accept()
     bool    invalidMedias = false;
 
     m_mediaListView->clear();
-    //TODO m_clipRenderer->stop();
+    m_clipRenderer->stop();
     collapseAllButCurrentPath();
     foreach ( Clip* clip, m_temporaryMedias->clips().values() )
     {
@@ -239,7 +239,7 @@ ImportController::accept()
     if ( invalidMedias == true )
         handleInvalidMedias();
     m_temporaryMedias->removeAll();
-    //TODO m_clipRenderer->setClip( nullptr );
+    m_clipRenderer->setClip( nullptr );
     done( Accepted );
 }
 



More information about the Vlmc-devel mailing list