Commit 23eda6eb authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Media: Removed useless uuid parameter in constructor.

Fixed other warnings
parent 2af9a679
......@@ -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;
}
......
......@@ -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
......
......@@ -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 )
{
......
......@@ -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 ),
......
......@@ -76,7 +76,7 @@ public:
File,
Stream
};
Media( const QString& filePath, const QString& uuid = QString() );
Media( const QString& filePath );
virtual ~Media();
/**
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment