[vlmc-devel] commit: Media: Removed useless uuid parameter in constructor. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Fri May 14 15:53:43 2010 +0200| [23eda6ebaae07c9e2d304f6f0a586ad5f596832a] | committer: Hugo Beauzée-Luyssen 

Media: Removed useless uuid parameter in constructor.

Fixed other warnings

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

 src/Library/MediaContainer.cpp |    4 ++--
 src/Library/MediaContainer.h   |    2 +-
 src/Media/Clip.cpp             |    2 +-
 src/Media/Media.cpp            |    2 +-
 src/Media/Media.h              |    2 +-
 src/Workflow/ClipWorkflow.cpp  |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Library/MediaContainer.cpp b/src/Library/MediaContainer.cpp
index dc708d2..ca16db0 100644
--- a/src/Library/MediaContainer.cpp
+++ b/src/Library/MediaContainer.cpp
@@ -77,7 +77,7 @@ MediaContainer::addMedia( Media *media )
 }
 
 Media*
-MediaContainer::addMedia( const QFileInfo& fileInfo, const QString& uuid )
+MediaContainer::addMedia( const QFileInfo& fileInfo )
 {
     if ( QFile::exists( fileInfo.absoluteFilePath() ) == false )
         return NULL;
@@ -86,7 +86,7 @@ MediaContainer::addMedia( const QFileInfo& fileInfo, const QString& uuid )
         if ( it->getMedia()->fileInfo()->filePath() == fileInfo.filePath() )
             return NULL;
     }
-    Media* media = new Media( fileInfo.filePath(), uuid );
+    Media* media = new Media( fileInfo.filePath() );
     MetaDataManager::getInstance()->computeMediaMetadata( media );
     return media;
 }
diff --git a/src/Library/MediaContainer.h b/src/Library/MediaContainer.h
index 367a6af..fe638e2 100644
--- a/src/Library/MediaContainer.h
+++ b/src/Library/MediaContainer.h
@@ -75,7 +75,7 @@ public:
      *  \sa     media( const QUuid& uuid)
      *  \sa     clip( const QUuid& uuid )
      */
-    Media*      addMedia( const QFileInfo& fileInfo, const QString& uuid = QString() );
+    Media*      addMedia( const QFileInfo& fileInfo );
     /**
      *  \brief  Check if a file has already been loaded into library.
      *  \param  fileInfo    The file infos
diff --git a/src/Media/Clip.cpp b/src/Media/Clip.cpp
index 44280a3..9026c24 100644
--- a/src/Media/Clip.cpp
+++ b/src/Media/Clip.cpp
@@ -55,9 +55,9 @@ Clip::Clip( Media *media, qint64 begin /*= 0*/, qint64 end /*= -1*/, const QStri
 
 Clip::Clip( Clip *parent, qint64 begin /*= -1*/, qint64 end /*= -1*/,
             const QString &uuid /*= QString()*/ ) :
+        m_media( parent->getMedia() ),
         m_begin( begin ),
         m_end( end ),
-        m_media( parent->getMedia() ),
         m_rootClip( parent->rootClip() ),
         m_parent( parent )
 {
diff --git a/src/Media/Media.cpp b/src/Media/Media.cpp
index 82d45c6..1bb6c00 100644
--- a/src/Media/Media.cpp
+++ b/src/Media/Media.cpp
@@ -41,7 +41,7 @@ const QString   Media::ImageExtensions = "*.gif *.png *.jpg *.jpeg";
 const QString   Media::AudioExtensions = "*.mp3 *.oga *.flac *.aac *.wav";
 const QString   Media::streamPrefix = "stream://";
 
-Media::Media( const QString& filePath, const QString& uuid /*= QString()*/ )
+Media::Media( const QString& filePath )
     : m_vlcMedia( NULL ),
     m_fileInfo( NULL ),
     m_lengthMS( 0 ),
diff --git a/src/Media/Media.h b/src/Media/Media.h
index 32e3656..bbc814d 100644
--- a/src/Media/Media.h
+++ b/src/Media/Media.h
@@ -76,7 +76,7 @@ public:
         File,
         Stream
     };
-    Media( const QString& filePath, const QString& uuid = QString() );
+    Media( const QString& filePath );
     virtual ~Media();
 
     /**
diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp
index 1f7eed9..58e574e 100644
--- a/src/Workflow/ClipWorkflow.cpp
+++ b/src/Workflow/ClipWorkflow.cpp
@@ -37,8 +37,8 @@
 
 ClipWorkflow::ClipWorkflow( ClipHelper* ch ) :
                 m_mediaPlayer(NULL),
-                m_state( ClipWorkflow::Stopped ),
-                m_clipHelper( ch )
+                m_clipHelper( ch ),
+                m_state( ClipWorkflow::Stopped )
 {
     m_stateLock = new QReadWriteLock;
     m_initWaitCond = new WaitCondition;