Skip to content
Snippets Groups Projects
Commit c210e337 authored by luyikei's avatar luyikei Committed by Hugo Beauzée-Luyssen
Browse files

Don't use Workspace to save media


Signed-off-by: default avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
parent 2359da21
No related branches found
No related tags found
No related merge requests found
......@@ -40,9 +40,8 @@
#include <QHash>
#include <QUuid>
Library::Library( Workspace *workspace )
Library::Library()
: m_cleanState( true )
, m_workspace( workspace )
{
}
......@@ -64,8 +63,7 @@ Library::load(const QDomDocument& doc )
{
QString mrl = media.attribute( "mrl" );
mrl = m_workspace->toAbsolutePath( mrl );
Media* m = addMedia( mrl );
Media* m = addMedia( QFileInfo( mrl ) );
if ( m == nullptr )
vlmcWarning() << "Failed to load media" << mrl << "when loading project.";
else
......@@ -97,7 +95,7 @@ Library::save( QXmlStreamWriter& project )
Q_ASSERT( (*it)->isRootClip() == true );
const Media* m = (*it)->getMedia();
project.writeStartElement( "media" );
project.writeAttribute( "mrl", m_workspace->toWorkspacePath( m ) );
project.writeAttribute( "mrl", m->fileInfo()->absoluteFilePath() );
project.writeEndElement();
++it;
}
......
......@@ -53,7 +53,7 @@ class Library : public MediaContainer, public ILoadSave
Q_DISABLE_COPY( Library );
public:
Library(Workspace* workspace);
Library();
virtual ~Library(){}
virtual void addMedia( Media* media );
virtual Media *addMedia( const QFileInfo &fileInfo );
......
......@@ -52,7 +52,7 @@ Core::Core()
m_workflow = new MainWorkflow;
m_workflowRenderer = new WorkflowRenderer( Backend::getBackend(), m_workflow );
m_undoStack = new QUndoStack;
m_library = new Library( m_workspace );
m_library = new Library;
m_currentProject = new Project( m_settings );
connect( m_undoStack, &QUndoStack::cleanChanged, m_currentProject, &Project::cleanChanged );
......
......@@ -173,16 +173,3 @@ Workspace::isInWorkspace(const Media *media)
{
return isInWorkspace( *(media->fileInfo() ) );
}
QString
Workspace::toAbsolutePath( const QString& path )
{
QString res = path;
return res.replace( Workspace::workspacePrefix, m_workspaceDir );
}
QString
Workspace::toWorkspacePath(const Media *media)
{
return media->fileInfo()->absoluteFilePath().replace( m_workspaceDir, Workspace::workspacePrefix );
}
......@@ -46,8 +46,6 @@ class Workspace : public QObject, public ErrorHandler
~Workspace();
bool isInWorkspace( const QString &path );
bool isInWorkspace( const Media *media );
QString toAbsolutePath( const QString &path );
QString toWorkspacePath( const Media* media );
bool copyToWorkspace( Media* media );
private:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment