[vlmc-devel] Clip: Re-enable saving, assuming that media is already in workspace.

Hugo Beauzée-Luyssen git at videolan.org
Wed Apr 2 18:55:43 CEST 2014


vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Apr  2 00:49:50 2014 +0300| [c1f446b86ca0c2d1d5c1f605087b82a8f2acd89c] | committer: Hugo Beauzée-Luyssen

Clip: Re-enable saving, assuming that media is already in workspace.

(Hint: this is a broken assumption for now)

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

 src/Media/Clip.cpp |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Media/Clip.cpp b/src/Media/Clip.cpp
index d7036f9..2c4a491 100644
--- a/src/Media/Clip.cpp
+++ b/src/Media/Clip.cpp
@@ -222,12 +222,7 @@ Clip::save( QXmlStreamWriter &project )
     project.writeStartElement( "clip" );
     if ( isRootClip() == true )
     {
-        // This need to go away. That's not the Clip's job, and we don't want to refer the workspace from all clips
-        Q_ASSERT(false);
-//        if ( m_media->isInWorkspace() == true )
-//            project.writeAttribute( "media", Workspace::toWorkspaceDir( m_media ) );
-//        else
-//            project.writeAttribute( "media", m_media->fileInfo()->absoluteFilePath() );
+        project.writeAttribute( "media", m_media->fileInfo()->fileName() );
     }
     else
     {



More information about the Vlmc-devel mailing list