[vlmc-devel] Cosmetic & comments

Hugo Beauzée-Luyssen git at videolan.org
Sun Sep 23 20:46:42 CEST 2012


vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Sun Sep 23 20:17:40 2012 +0300| [ddb0913ba12164a2faae5f7cf23eef9a60da7561] | committer: Hugo Beauzée-Luyssen

Cosmetic & comments

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=ddb0913ba12164a2faae5f7cf23eef9a60da7561
---

 src/Gui/library/MediaListView.h |    1 +
 src/Library/MediaContainer.cpp  |    1 +
 src/Renderer/ClipRenderer.cpp   |    3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Gui/library/MediaListView.h b/src/Gui/library/MediaListView.h
index 0878dbd..3df3f2b 100644
--- a/src/Gui/library/MediaListView.h
+++ b/src/Gui/library/MediaListView.h
@@ -73,6 +73,7 @@ private slots:
 
 signals:
     void        clipSelected( Clip* );
+    /// Used when the user clicks the deletion arrow.
     void        clipRemoved( const QUuid& );
 };
 #endif // MEDIALISTVIEW_H
diff --git a/src/Library/MediaContainer.cpp b/src/Library/MediaContainer.cpp
index c1ddd55..62eb78a 100644
--- a/src/Library/MediaContainer.cpp
+++ b/src/Library/MediaContainer.cpp
@@ -160,6 +160,7 @@ MediaContainer::deleteClip( const QUuid &uuid )
         Clip* clip = it.value();
         m_clips.remove( uuid );
         emit clipRemoved( uuid );
+        // don't use delete as the clip may be used in the slot that'll handle clipRemoved signal.
         clip->deleteLater();
     }
 }
diff --git a/src/Renderer/ClipRenderer.cpp b/src/Renderer/ClipRenderer.cpp
index 2b60bfa..fe8224f 100644
--- a/src/Renderer/ClipRenderer.cpp
+++ b/src/Renderer/ClipRenderer.cpp
@@ -46,7 +46,7 @@ ClipRenderer::ClipRenderer() :
     connect( m_mediaPlayer,     SIGNAL( paused() ),             this,   SIGNAL( paused() ) );
     connect( m_mediaPlayer,     SIGNAL( playing() ),            this,   SIGNAL( playing() ) );
     connect( m_mediaPlayer,     SIGNAL( volumeChanged() ),      this,   SIGNAL( volumeChanged() ) );
-    connect( m_mediaPlayer,     SIGNAL( timeChanged( qint64 ) ),        this,   SLOT( __timeChanged( qint64 ) ) );
+    connect( m_mediaPlayer,     SIGNAL( timeChanged( qint64 ) ),this,   SLOT( __timeChanged( qint64 ) ) );
     connect( m_mediaPlayer,     SIGNAL( endReached() ),         this,   SLOT( __endReached() ) );
 }
 
@@ -60,7 +60,6 @@ ClipRenderer::~ClipRenderer()
 void
 ClipRenderer::setClip( Clip* clip )
 {
-
     if ( m_selectedClip != NULL && clip != NULL &&
          clip->uuid() != m_selectedClip->uuid() )
         clipUnloaded( m_selectedClip->uuid() );



More information about the Vlmc-devel mailing list