[vlmc-devel] Media: Remove duplicated getter

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Feb 24 14:46:07 2014 +0200| [82225c51b8bb4e591edb766848cbed5443ebe6e8] | committer: Hugo Beauzée-Luyssen

Media: Remove duplicated getter

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

 src/Gui/library/MediaCellView.cpp       |    2 +-
 src/Gui/media/ClipMetadataDisplayer.cpp |    2 +-
 src/Media/Media.cpp                     |    7 -------
 src/Media/Media.h                       |    3 ---
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/Gui/library/MediaCellView.cpp b/src/Gui/library/MediaCellView.cpp
index 04aa1f3..01b7916 100644
--- a/src/Gui/library/MediaCellView.cpp
+++ b/src/Gui/library/MediaCellView.cpp
@@ -63,7 +63,7 @@ MediaCellView::MediaCellView( Clip* clip, QWidget *parent ) :
         m_ui->clipCountLabel->hide();
         m_ui->arrow->hide();
     }
-    if ( clip->getMedia()->isMetadataComputed() == false )
+    if ( clip->getMedia()->source()->isParsed() == false )
     {
         m_ui->thumbnail->setEnabled( false );
         connect( MetaDataManager::getInstance(), SIGNAL( startingComputing( const Media* )),
diff --git a/src/Gui/media/ClipMetadataDisplayer.cpp b/src/Gui/media/ClipMetadataDisplayer.cpp
index 9fddd1e..f42d180 100644
--- a/src/Gui/media/ClipMetadataDisplayer.cpp
+++ b/src/Gui/media/ClipMetadataDisplayer.cpp
@@ -97,7 +97,7 @@ ClipMetadataDisplayer::setWatchedClip( const Clip *clip )
     m_watchedClip = clip;
     m_watchedMedia = clip->getMedia();
     connect( m_watchedClip, SIGNAL( unloaded( Clip* ) ), this, SLOT( clipDestroyed( Clip* ) ) );
-    if ( m_watchedMedia->isMetadataComputed() == true )
+    if ( m_watchedMedia->source()->isParsed() == true )
         metadataUpdated();
     else
     {
diff --git a/src/Media/Media.cpp b/src/Media/Media.cpp
index 391a300..a79fdca 100644
--- a/src/Media/Media.cpp
+++ b/src/Media/Media.cpp
@@ -58,7 +58,6 @@ Media::Media(const QString &path )
     : m_fileInfo( NULL )
     , m_nbFrames( 0 )
     , m_baseClip( NULL )
-    , m_metadataComputed( false )
     , m_inWorkspace( false )
     , m_snapshotImage( NULL )
 {
@@ -149,12 +148,6 @@ Media::source() const
     return m_source;
 }
 
-bool
-Media::isMetadataComputed() const
-{
-    return m_metadataComputed;
-}
-
 void
 Media::save( QXmlStreamWriter& project )
 {
diff --git a/src/Media/Media.h b/src/Media/Media.h
index 71e3f41..251be0c 100644
--- a/src/Media/Media.h
+++ b/src/Media/Media.h
@@ -104,8 +104,6 @@ public:
     const Clip*                 baseClip() const { return m_baseClip; }
     void                        setBaseClip( Clip* clip );
 
-    bool                        isMetadataComputed() const;
-
     void                        save( QXmlStreamWriter& project );
 
     bool                        isInWorkspace() const;
@@ -127,7 +125,6 @@ protected:
     InputType                   m_inputType;
     QString                     m_fileName;
     Clip*                       m_baseClip;
-    bool                        m_metadataComputed;
     bool                        m_inWorkspace;
     QString                     m_workspacePath;