From aef7e56e015f130cb605727659b6ae9fc92c373b Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 4 Jun 2012 17:32:33 +0200 Subject: [PATCH] fixed audio path issue --- src/adaptors/UBCFFSubsetAdaptor.cpp | 5 ----- src/adaptors/UBSvgSubsetAdaptor.cpp | 2 ++ src/board/UBBoardController.cpp | 6 ------ src/core/UBPersistenceManager.cpp | 5 +++-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index 774fd8ea..30ffff82 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -815,13 +815,8 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgAudio(const QDomElement &ele QUuid uuid = QUuid::createUuid(); -#ifdef Q_WS_X11 - concreteUrl = QUrl::fromLocalFile(mCurrentScene->document()->persistencePath() + "/" + UBPersistenceManager::persistenceManager() - ->addAudioFileToDocument(mCurrentScene->document(), concreteUrl.toLocalFile(), uuid)); -#else concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() ->addAudioFileToDocument(mCurrentScene->document(), concreteUrl.toLocalFile(), uuid)); -#endif UBGraphicsAudioItem *audioItem = mCurrentScene->addAudio(concreteUrl, false); QTransform transform; diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index f8a98903..d955a9dd 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1806,6 +1806,8 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::audioItemToLinkedAudio(UBGraphicsAud } QString audioFileHref = audioItem->mediaFileUrl().toString(); + if(audioFileHref.startsWith("file://")) + audioFileHref = audioFileHref.replace("file://" + mDocumentPath + "/",""); mXmlWriter.writeAttribute(nsXLink, "href", audioFileHref); mXmlWriter.writeEndElement(); } diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index a14330c1..4253c177 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -934,7 +934,6 @@ void UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QString QUrl url = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() ->addAudioFileToDocument(mActiveDocument, sourceUrl, pData, uuid)); - audioItem = mActiveScene->addAudio(url, false, pPos); audioItem->setSourceUrl(sourceUrl); @@ -1779,13 +1778,8 @@ UBGraphicsAudioItem* UBBoardController::addAudio(const QUrl& pSourceUrl, bool st QUuid uuid = QUuid::createUuid(); QUrl concreteUrl = pSourceUrl; -#ifdef Q_WS_X11 - concreteUrl = QUrl::fromLocalFile(mActiveDocument->persistencePath() + "/" + UBPersistenceManager::persistenceManager() - ->addAudioFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); -#else concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() ->addAudioFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); -#endif UBGraphicsAudioItem* vi = mActiveScene->addAudio(concreteUrl, startPlay, pos); mActiveDocument->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime())); diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 23b5e3c3..ce49c163 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -900,7 +900,7 @@ QString UBPersistenceManager::addAudioFileToDocument(UBDocumentProxy* pDocumentP } - return fileName; + return destPath; } @@ -932,7 +932,8 @@ QString UBPersistenceManager::addAudioFileToDocument(UBDocumentProxy* pDocumentP } } - return fileName; + //return fileName; + return destPath; }