From f1d7b1527a8bce91313583e8083cd6044f79f14e Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 4 Jun 2012 17:44:53 +0200 Subject: [PATCH] fixed video path --- src/adaptors/UBCFFSubsetAdaptor.cpp | 5 ----- src/adaptors/UBSvgSubsetAdaptor.cpp | 2 ++ src/board/UBBoardController.cpp | 5 ----- src/core/UBPersistenceManager.cpp | 4 ++-- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index 30ffff82..04b00120 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -853,13 +853,8 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgVideo(const QDomElement &ele QUuid uuid = QUuid::createUuid(); -#ifdef Q_WS_X11 - concreteUrl = QUrl::fromLocalFile(mCurrentScene->document()->persistencePath() + "/" + UBPersistenceManager::persistenceManager() - ->addVideoFileToDocument(mCurrentScene->document(), concreteUrl.toLocalFile(), uuid)); -#else concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() ->addVideoFileToDocument(mCurrentScene->document(), concreteUrl.toLocalFile(), uuid)); -#endif UBGraphicsVideoItem *videoItem = mCurrentScene->addVideo(concreteUrl, false); QTransform transform; diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index d955a9dd..92306281 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1833,6 +1833,8 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::videoItemToLinkedVideo(UBGraphicsVid } QString videoFileHref = videoItem->mediaFileUrl().toString(); + if(videoFileHref.startsWith("file://")) + videoFileHref = videoFileHref.replace("file://" + mDocumentPath + "/",""); mXmlWriter.writeAttribute(nsXLink, "href", videoFileHref); mXmlWriter.writeEndElement(); } diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 4253c177..3bdc4183 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1753,13 +1753,8 @@ UBGraphicsVideoItem* UBBoardController::addVideo(const QUrl& pSourceUrl, bool st QUuid uuid = QUuid::createUuid(); QUrl concreteUrl = pSourceUrl; -#ifdef Q_WS_X11 - concreteUrl = QUrl::fromLocalFile(mActiveDocument->persistencePath() + "/" + UBPersistenceManager::persistenceManager() - ->addVideoFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); -#else concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() ->addVideoFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); -#endif UBGraphicsVideoItem* vi = mActiveScene->addVideo(concreteUrl, startPlay, pos); mActiveDocument->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime())); diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index ce49c163..a664a5a5 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -840,7 +840,7 @@ QString UBPersistenceManager::addVideoFileToDocument(UBDocumentProxy* pDocumentP } - return fileName; + return destPath; } @@ -872,7 +872,7 @@ QString UBPersistenceManager::addVideoFileToDocument(UBDocumentProxy* pDocumentP } } - return fileName; + return destPath; }