Commit 62c5aa51 authored by Christophe Courtaut's avatar Christophe Courtaut

Renamed GetClip to GetMedia into Media Library

parent 8feca097
......@@ -33,7 +33,7 @@ Library::Library()
{
}
Media* Library::getClip( const QUuid& uuid )
Media* Library::getMedia( const QUuid& uuid )
{
QMutexLocker locker( &m_mutex );
QHash<QUuid, Media*>::iterator it = m_medias.find( uuid );
......@@ -42,7 +42,7 @@ Media* Library::getClip( const QUuid& uuid )
return *it;
}
Media* Library::getClip( const QString& path )
Media* Library::getMedia( const QString& path )
{
QMutexLocker locker( &m_mutex );
QHash<QUuid, Media*>::iterator it;
......
......@@ -54,8 +54,8 @@ public:
Video,
Image
};
Media* getClip( const QUuid& uuid );
Media* getClip( const QString& path );
Media* getMedia( const QUuid& uuid );
Media* getMedia( const QString& path );
private:
Library();
......
......@@ -86,10 +86,10 @@ void PreviewWidget::dropEvent( QDropEvent* event )
{
Library* lib = Library::getInstance();
lib->newMediaLoadingAsked( event->mimeData()->urls()[0].path() );
media = lib->getClip( event->mimeData()->urls()[0].path() );
media = lib->getMedia( event->mimeData()->urls()[0].path() );
}
else
media = Library::getInstance()->getClip( QUuid( ( const QString& )event->mimeData()->data( "vlmc/uuid" ) ) );
media = Library::getInstance()->getMedia( QUuid( ( const QString& )event->mimeData()->data( "vlmc/uuid" ) ) );
media->flushParameters();
m_mediaPlayer->setMedia( media->getVLCMedia() );
......
......@@ -66,7 +66,7 @@ void TracksView::dragEnterEvent( QDragEnterEvent* event )
void TracksView::dropEvent( QDropEvent* event )
{
QUuid uuid = QUuid( (const QString& )event->mimeData()->data( "vlmc/uuid" ) );
Media* media = Library::getInstance()->getClip( uuid );
Media* media = Library::getInstance()->getMedia( uuid );
if ( !media )
return;
......
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