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

Library: Handle the workspace when loading a project.

parent a566982f
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#include "Library.h" #include "Library.h"
#include "Media.h" #include "Media.h"
#include "MetaDataManager.h" #include "MetaDataManager.h"
#include "SettingsManager.h"
#include "Workspace.h"
#include <QtDebug> #include <QtDebug>
#include <QDomElement> #include <QDomElement>
...@@ -54,7 +56,14 @@ Library::loadProject( const QDomElement& doc ) ...@@ -54,7 +56,14 @@ Library::loadProject( const QDomElement& doc )
if ( media.hasAttribute( "mrl" ) == true ) if ( media.hasAttribute( "mrl" ) == true )
{ {
QString mrl = media.attribute( "mrl" ); QString mrl = media.attribute( "mrl" );
Media* m = addMedia( mrl );
//If in workspace: compute the path in workspace
if ( mrl.startsWith( Workspace::workspacePrefix ) == true )
{
QString projectPath = VLMC_PROJECT_GET_STRING( "general/ProjectDir" );
mrl = projectPath + '/' + mrl.mid( Workspace::workspacePrefix.length() );
}
Media* m = addMedia( mrl );
connect( m, SIGNAL( metaDataComputed( const Media* ) ), connect( m, SIGNAL( metaDataComputed( const Media* ) ),
this, SLOT( mediaLoaded( const Media* ) ), Qt::QueuedConnection ); this, SLOT( mediaLoaded( const Media* ) ), Qt::QueuedConnection );
m_medias[mrl] = m; m_medias[mrl] = m;
......
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